1 files changed, 16 insertions, 26 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtils.java
index 85370d2211..bd2187616c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtils.java
@@ -17,9 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.property;
 
+import static java.util.Objects.nonNull;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.List;
+import java.util.Map;
 import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
 import org.openecomp.sdc.be.model.PropertyConstraint;
 import org.openecomp.sdc.be.model.PropertyDefinition;
@@ -27,41 +31,28 @@ import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.tosca.constraints.ConstraintType;
 import org.openecomp.sdc.be.model.tosca.constraints.exception.PropertyConstraintException;
 
-import java.util.List;
-import java.util.Map;
-
-import static java.util.Objects.nonNull;
-import static java.util.stream.Collectors.toMap;
-
 /**
  * Provides specific functionality for property constraints
  */
 public class PropertyConstraintsUtils {
 
-    private PropertyConstraintsUtils(){}
+    private PropertyConstraintsUtils() {
+    }
 
     public static void validatePropertiesConstraints(Resource newResource, Resource oldResource) {
-        if(oldResource.getProperties() != null && newResource.getProperties() != null){
-            Map<String, PropertyDefinition> oldPropWithConstraints = oldResource.getProperties()
-                    .stream()
-                    .filter(p -> p.getConstraints() != null)
-                    .collect(toMap(PropertyDefinition::getName,p -> p));
-
-            newResource.getProperties()
-                    .stream()
-                    .filter(p -> p.getConstraints() != null && oldPropWithConstraints.containsKey(p.getName()))
-                    .forEach(p -> validatePropertyConstraints(p.getConstraints(), oldPropWithConstraints.get(p.getName()).getConstraints()));
+        if (oldResource.getProperties() != null && newResource.getProperties() != null) {
+            Map<String, PropertyDefinition> oldPropWithConstraints = oldResource.getProperties().stream().filter(p -> p.getConstraints() != null)
+                .collect(toMap(PropertyDefinition::getName, p -> p));
+            newResource.getProperties().stream().filter(p -> p.getConstraints() != null && oldPropWithConstraints.containsKey(p.getName()))
+                .forEach(p -> validatePropertyConstraints(p.getConstraints(), oldPropWithConstraints.get(p.getName()).getConstraints()));
         }
     }
 
     private static void validatePropertyConstraints(List<PropertyConstraint> newConstraints, List<PropertyConstraint> oldConstraints) {
-        Map <ConstraintType, PropertyConstraint> oldConstraintsByType = oldConstraints.stream()
-                .filter(c -> nonNull(c) && nonNull(c.getConstraintType()))
-                .collect(toMap(PropertyConstraint::getConstraintType, c -> c));
-
-        newConstraints.stream()
-                .filter(c -> nonNull(c) && oldConstraintsByType.containsKey(c.getConstraintType()))
-                .forEach(c -> validatePropertyConstraint(c, oldConstraintsByType.get(c.getConstraintType())));
+        Map<ConstraintType, PropertyConstraint> oldConstraintsByType = oldConstraints.stream()
+            .filter(c -> nonNull(c) && nonNull(c.getConstraintType())).collect(toMap(PropertyConstraint::getConstraintType, c -> c));
+        newConstraints.stream().filter(c -> nonNull(c) && oldConstraintsByType.containsKey(c.getConstraintType()))
+            .forEach(c -> validatePropertyConstraint(c, oldConstraintsByType.get(c.getConstraintType())));
     }
 
     private static void validatePropertyConstraint(PropertyConstraint newConstraint, PropertyConstraint currConstraint) {
@@ -71,5 +62,4 @@ public class PropertyConstraintsUtils {
             throw new ByActionStatusComponentException(e.getActionStatus(), e.getParams());
         }
     }
-
 }