Reformat catalog-model

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / tosca / converters / ToscaValueBaseConverter.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java
index 366acd3..b059897 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.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,63 +17,73 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.model.tosca.converters;
 
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import java.util.*;
-import java.util.Map.Entry;
-
 public class ToscaValueBaseConverter {
-    protected Gson gson = new Gson();
+
     private static final Logger log = Logger.getLogger(ToscaValueBaseConverter.class.getName());
+    protected Gson gson = new Gson();
 
-    protected Map<String, PropertyDefinition> getAllProperties(DataTypeDefinition dataTypeDefinition) {
+    /**
+     * checks is received Object empty or equals null or not It is relevant only if received Object is instance of String, Map or List class.
+     *
+     * @param convertedValue
+     * @return
+     */
+    public static boolean isEmptyObjectValue(Object convertedValue) {
+        if ((convertedValue == null) || (convertedValue instanceof String && ((String) convertedValue).isEmpty()) || (convertedValue instanceof Map
+            && ((Map) convertedValue).isEmpty()) || (convertedValue instanceof List && ((List) convertedValue).isEmpty())) {
+            return true;
+        }
+        return false;
+    }
 
+    protected Map<String, PropertyDefinition> getAllProperties(DataTypeDefinition dataTypeDefinition) {
         Map<String, PropertyDefinition> allParentsProps = new HashMap<>();
-
         while (dataTypeDefinition != null) {
-
             List<PropertyDefinition> currentParentsProps = dataTypeDefinition.getProperties();
             if (currentParentsProps != null) {
                 currentParentsProps.stream().forEach(p -> allParentsProps.put(p.getName(), p));
             }
-
             dataTypeDefinition = dataTypeDefinition.getDerivedFrom();
         }
-
         return allParentsProps;
     }
 
     public ToscaPropertyType isScalarType(DataTypeDefinition dataTypeDef) {
-
         ToscaPropertyType result = null;
-
         DataTypeDefinition dataType = dataTypeDef;
-
         while (dataType != null) {
-
             String name = dataType.getName();
             ToscaPropertyType typeIfScalar = ToscaPropertyType.getTypeIfScalar(name);
             if (typeIfScalar != null) {
                 result = typeIfScalar;
                 break;
             }
-
             dataType = dataType.getDerivedFrom();
         }
-
         return result;
     }
 
     public Object handleComplexJsonValue(JsonElement elementValue) {
         Object jsonValue = null;
-
         Map<String, Object> value = new HashMap<>();
         if (elementValue.isJsonObject()) {
             JsonObject jsonOb = elementValue.getAsJsonObject();
@@ -106,7 +116,6 @@ public class ToscaValueBaseConverter {
                 }
             }
         }
-
         return jsonValue;
     }
 
@@ -143,22 +152,4 @@ public class ToscaValueBaseConverter {
             throw new IllegalStateException();
         }
     }
-
-    /**
-     * checks is received Object empty or equals null or not It is relevant only
-     * if received Object is instance of String, Map or List class.
-     *
-     * @param convertedValue
-     * @return
-     */
-    public static boolean isEmptyObjectValue(Object convertedValue) {
-        if ((convertedValue == null)
-            || (convertedValue instanceof String && ((String) convertedValue).isEmpty())
-            || (convertedValue instanceof Map && ((Map) convertedValue).isEmpty())
-            || (convertedValue instanceof List && ((List) convertedValue).isEmpty()))
-        {
-            return true;
-        }
-        return false;
-    }
 }