1 files changed, 12 insertions, 24 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java
index 428d6d9d19..b4f6bbe7db 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.validation;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
 import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
 import org.openecomp.sdc.be.datatypes.elements.Annotation;
@@ -32,25 +34,17 @@ import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @Component
 public class AnnotationValidator {
 
-
+    private static final Logger log = Logger.getLogger(ResourceImportManager.class);
     private final PropertyValidator propertyValidator;
     private final ExceptionUtils exceptionUtils;
     private final ApplicationDataTypeCache dataTypeCache;
     private final ComponentsUtils componentsUtils;
 
-    private static final Logger log = Logger.getLogger(ResourceImportManager.class);
-
-
-    public AnnotationValidator(PropertyValidator propertyValidator
-                               , ExceptionUtils exceptionUtils, ApplicationDataTypeCache dataTypeCache
-                               ,ComponentsUtils componentsUtils) {
+    public AnnotationValidator(PropertyValidator propertyValidator, ExceptionUtils exceptionUtils, ApplicationDataTypeCache dataTypeCache,
+                               ComponentsUtils componentsUtils) {
         this.propertyValidator = propertyValidator;
         this.exceptionUtils = exceptionUtils;
         this.dataTypeCache = dataTypeCache;
@@ -59,9 +53,8 @@ public class AnnotationValidator {
 
     public List<Annotation> validateAnnotationsProperties(Annotation annotation, AnnotationTypeDefinition dbAnnotationTypeDefinition) {
         List<Annotation> validAnnotations = new ArrayList<>();
-        if (annotation != null && propertiesValidator(
-                annotation.getProperties(), dbAnnotationTypeDefinition.getProperties())) {
-                    validAnnotations.add(annotation);
+        if (annotation != null && propertiesValidator(annotation.getProperties(), dbAnnotationTypeDefinition.getProperties())) {
+            validAnnotations.add(annotation);
         }
         return validAnnotations;
     }
@@ -71,14 +64,9 @@ public class AnnotationValidator {
         if (properties == null || dbAnnotationTypeDefinitionProperties == null) {
             return false;
         }
-        properties.stream()
-                .forEach(property -> propertyDefinitionsList.add(new PropertyDefinition(property)));
-        Map<String, DataTypeDefinition> allDataTypes = dataTypeCache.getAll()
-                .left()
-                .on( error -> exceptionUtils
-                .rollBackAndThrow(error));
+        properties.stream().forEach(property -> propertyDefinitionsList.add(new PropertyDefinition(property)));
+        Map<String, DataTypeDefinition> allDataTypes = dataTypeCache.getAll().left().on(error -> exceptionUtils.rollBackAndThrow(error));
         propertyValidator.thinPropertiesValidator(propertyDefinitionsList, dbAnnotationTypeDefinitionProperties, allDataTypes);
         return true;
     }
-
 }