1 files changed, 49 insertions, 66 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
index 1176a6ba8b..93bc29c958 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
@@ -19,85 +19,68 @@
  */
 package org.openecomp.core.utilities.deserializers;
 
-import java.lang.reflect.Type;
-import java.util.Objects;
-import java.util.Optional;
-import org.onap.sdc.tosca.datatypes.model.RequirementDefinition;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import java.lang.reflect.Type;
+import java.util.Objects;
+import java.util.Optional;
+import org.onap.sdc.tosca.datatypes.model.RequirementDefinition;
 
 public class RequirementDefinitionDeserializer implements JsonDeserializer<RequirementDefinition> {
 
-  static final String CAPABILITY = "capability";
-  static final String NODE = "node";
-  static final String RELATIONSHIP = "relationship";
-  private static final String OCCURRENCES = "occurrences";
-
-  @Override
-  public RequirementDefinition deserialize(JsonElement jsonElement, Type type,
-                                           JsonDeserializationContext jsonDeserializationContext) {
-
-    JsonObject jsonObject = jsonElement.getAsJsonObject();
-
-    RequirementDefinition requirementDefinition = new RequirementDefinition();
-    setRequirementValues(jsonObject, requirementDefinition);
-
-    Optional<Object[]> occurrences = handleOccurrences(jsonObject);
-    occurrences.ifPresent(requirementDefinition::setOccurrences);
-
-    return requirementDefinition;
-  }
-
-
-  private void setRequirementValues(JsonObject jsonObject,
-                                    RequirementDefinition requirementDefinition) {
-
-    JsonElement capabilityElement = jsonObject.get(CAPABILITY);
-    if (!Objects.isNull(capabilityElement)) {
-      requirementDefinition.setCapability(capabilityElement.getAsString());
-    }
-
-    JsonElement nodeElement = jsonObject.get(NODE);
-    if (!Objects.isNull(nodeElement)) {
-      requirementDefinition.setNode(nodeElement.getAsString());
-    }
-
-    JsonElement relationshipElement = jsonObject.get(RELATIONSHIP);
-    if (!Objects.isNull(relationshipElement)) {
-      requirementDefinition.setRelationship(relationshipElement.getAsString());
+    static final String CAPABILITY = "capability";
+    static final String NODE = "node";
+    static final String RELATIONSHIP = "relationship";
+    private static final String OCCURRENCES = "occurrences";
+
+    @Override
+    public RequirementDefinition deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
+        JsonObject jsonObject = jsonElement.getAsJsonObject();
+        RequirementDefinition requirementDefinition = new RequirementDefinition();
+        setRequirementValues(jsonObject, requirementDefinition);
+        Optional<Object[]> occurrences = handleOccurrences(jsonObject);
+        occurrences.ifPresent(requirementDefinition::setOccurrences);
+        return requirementDefinition;
     }
-  }
-
-  private Optional<Object[]> handleOccurrences(JsonObject jsonObject) {
 
-    JsonElement occurrencesElement = jsonObject.get(OCCURRENCES);
-
-    if(Objects.isNull(occurrencesElement)){
-      return Optional.empty();
+    private void setRequirementValues(JsonObject jsonObject, RequirementDefinition requirementDefinition) {
+        JsonElement capabilityElement = jsonObject.get(CAPABILITY);
+        if (!Objects.isNull(capabilityElement)) {
+            requirementDefinition.setCapability(capabilityElement.getAsString());
+        }
+        JsonElement nodeElement = jsonObject.get(NODE);
+        if (!Objects.isNull(nodeElement)) {
+            requirementDefinition.setNode(nodeElement.getAsString());
+        }
+        JsonElement relationshipElement = jsonObject.get(RELATIONSHIP);
+        if (!Objects.isNull(relationshipElement)) {
+            requirementDefinition.setRelationship(relationshipElement.getAsString());
+        }
     }
 
-    JsonArray occurrences = occurrencesElement.getAsJsonArray();
-    Object[] fixedOccurrences = new Object[occurrences.size()];
-
-    for (int i = 0; i < occurrences.size(); i++) {
-      JsonElement currElement = occurrences.get(i);
-
-      // values inside occurrences array can be either String or Integer
-      if (currElement.isJsonPrimitive()) {
-        JsonPrimitive jsonPrimitive = currElement.getAsJsonPrimitive();
-
-        if (jsonPrimitive.isNumber()) {
-          fixedOccurrences[i] = jsonPrimitive.getAsNumber().intValue();
-        } else {
-          fixedOccurrences[i] = jsonPrimitive.getAsString();
+    private Optional<Object[]> handleOccurrences(JsonObject jsonObject) {
+        JsonElement occurrencesElement = jsonObject.get(OCCURRENCES);
+        if (Objects.isNull(occurrencesElement)) {
+            return Optional.empty();
+        }
+        JsonArray occurrences = occurrencesElement.getAsJsonArray();
+        Object[] fixedOccurrences = new Object[occurrences.size()];
+        for (int i = 0; i < occurrences.size(); i++) {
+            JsonElement currElement = occurrences.get(i);
+            // values inside occurrences array can be either String or Integer
+            if (currElement.isJsonPrimitive()) {
+                JsonPrimitive jsonPrimitive = currElement.getAsJsonPrimitive();
+                if (jsonPrimitive.isNumber()) {
+                    fixedOccurrences[i] = jsonPrimitive.getAsNumber().intValue();
+                } else {
+                    fixedOccurrences[i] = jsonPrimitive.getAsString();
+                }
+            }
         }
-      }
+        return Optional.of(fixedOccurrences);
     }
-
-    return Optional.of(fixedOccurrences);
-  }
 }