Reformat catalog-model

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

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java
index 9e3d371..1d0354f 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.model.tosca.converters;
 
 import com.google.gson.JsonArray;
@@ -37,22 +36,21 @@ import java.util.Set;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.tosca.datatypes.ToscaFunctions;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.tosca.datatypes.ToscaFunctions;
 
 public class ToscaMapValueConverter extends ToscaValueBaseConverter implements ToscaValueConverter {
-    private static ToscaMapValueConverter mapConverter = new ToscaMapValueConverter();
 
-    private JsonParser jsonParser = new JsonParser();
     private static final Logger log = Logger.getLogger(ToscaMapValueConverter.class.getName());
-
-    public static ToscaMapValueConverter getInstance() {
-        return mapConverter;
-    }
+    private static ToscaMapValueConverter mapConverter = new ToscaMapValueConverter();
+    private JsonParser jsonParser = new JsonParser();
 
     private ToscaMapValueConverter() {
+    }
 
+    public static ToscaMapValueConverter getInstance() {
+        return mapConverter;
     }
 
     @Override
@@ -68,7 +66,6 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
             if (innerToscaType != null) {
                 innerConverter = innerToscaType.getValueConverter();
             } else {
-
                 DataTypeDefinition dataTypeDefinition = dataTypes.get(innerType);
                 if (dataTypeDefinition != null) {
                     ToscaPropertyType toscaPropertyType = null;
@@ -78,7 +75,7 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
                         isScalar = false;
                         allPropertiesRecursive.addAll(dataTypeDefinition.getProperties());
                         DataTypeDefinition derivedFrom = dataTypeDefinition.getDerivedFrom();
-                        while ( !derivedFrom.getName().equals("tosca.datatypes.Root") ){
+                        while (!derivedFrom.getName().equals("tosca.datatypes.Root")) {
                             allPropertiesRecursive.addAll(derivedFrom.getProperties());
                             derivedFrom = derivedFrom.getDerivedFrom();
                         }
@@ -87,16 +84,13 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
                     log.debug("inner Tosca Type is null");
                     return value;
                 }
-
             }
             JsonElement jsonElement = null;
             try {
                 StringReader reader = new StringReader(value);
                 JsonReader jsonReader = new JsonReader(reader);
                 jsonReader.setLenient(true);
-
                 jsonElement = jsonParser.parse(jsonReader);
-
             } catch (JsonSyntaxException e) {
                 log.debug("convertToToscaValue failed to parse json value :", e);
                 return null;
@@ -107,7 +101,6 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
             }
             JsonObject asJsonObject = jsonElement.getAsJsonObject();
             Set<Entry<String, JsonElement>> entrySet = asJsonObject.entrySet();
-
             Map<String, Object> toscaMap = new HashMap<>();
             final boolean isScalarF = isScalar;
             final ToscaValueConverter innerConverterFinal = innerConverter;
@@ -123,8 +116,8 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
     }
 
     private void convertEntry(final String innerType, final Map<String, DataTypeDefinition> dataTypes,
-            final List<PropertyDefinition> allPropertiesRecursive, final Map<String, Object> toscaMap, final boolean isScalarF,
-            final ToscaValueConverter innerConverterFinal, final Entry<String, JsonElement> e) {
+                              final List<PropertyDefinition> allPropertiesRecursive, final Map<String, Object> toscaMap, final boolean isScalarF,
+                              final ToscaValueConverter innerConverterFinal, final Entry<String, JsonElement> e) {
         log.debug("try convert element ");
         boolean scalar = isScalarF;
         String propType = innerType;
@@ -146,12 +139,12 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
                 }
             }
         }
-        final Object convertedValue =
-                convertDataTypeToToscaObject(propType, dataTypes, innerConverterProp, scalar, e.getValue(), false);
+        final Object convertedValue = convertDataTypeToToscaObject(propType, dataTypes, innerConverterProp, scalar, e.getValue(), false);
         toscaMap.put(e.getKey(), convertedValue);
     }
 
-    public Object convertDataTypeToToscaObject(String innerType, Map<String, DataTypeDefinition> dataTypes, ToscaValueConverter innerConverter, final boolean isScalarF, JsonElement entryValue, boolean preserveEmptyValue) {
+    public Object convertDataTypeToToscaObject(String innerType, Map<String, DataTypeDefinition> dataTypes, ToscaValueConverter innerConverter,
+                                               final boolean isScalarF, JsonElement entryValue, boolean preserveEmptyValue) {
         Object convertedValue = null;
         if (isScalarF && entryValue.isJsonPrimitive()) {
             log.debug("try convert scalar value ");
@@ -161,15 +154,13 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
                 convertedValue = innerConverter.convertToToscaValue(entryValue.getAsString(), innerType, dataTypes);
             }
         } else {
-            if ( entryValue.isJsonPrimitive() ){
+            if (entryValue.isJsonPrimitive()) {
                 return handleComplexJsonValue(entryValue);
             }
-
             // ticket 228696523 created   / DE272734 / Bug 154492 Fix
-            if(entryValue instanceof JsonArray) {
+            if (entryValue instanceof JsonArray) {
                 ArrayList<Object> toscaObjectPresentationArray = new ArrayList<>();
                 JsonArray jsonArray = entryValue.getAsJsonArray();
-
                 for (JsonElement jsonElement : jsonArray) {
                     Object convertedDataTypeToToscaMap = convertDataTypeToToscaMap(innerType, dataTypes, isScalarF, jsonElement, preserveEmptyValue);
                     toscaObjectPresentationArray.add(convertedDataTypeToToscaMap);
@@ -182,21 +173,18 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
         return convertedValue;
     }
 
-    private Object convertDataTypeToToscaMap(String innerType, Map<String, DataTypeDefinition> dataTypes,
-            final boolean isScalarF, JsonElement entryValue, boolean preserveEmptyValue) {
+    private Object convertDataTypeToToscaMap(String innerType, Map<String, DataTypeDefinition> dataTypes, final boolean isScalarF,
+                                             JsonElement entryValue, boolean preserveEmptyValue) {
         Object convertedValue;
         if (entryValue.isJsonPrimitive()) {
             return json2JavaPrimitive(entryValue.getAsJsonPrimitive());
         }
         JsonObject asJsonObjectIn = entryValue.getAsJsonObject();
-
         DataTypePropertyConverter.getInstance().mergeDataTypeDefaultValuesWithPropertyValue(asJsonObjectIn, innerType, dataTypes);
         Map<String, Object> toscaObjectPresentation = new HashMap<>();
         Set<Entry<String, JsonElement>> entrySetIn = asJsonObjectIn.entrySet();
-
         for (Entry<String, JsonElement> entry : entrySetIn) {
             String propName = entry.getKey();
-
             JsonElement elementValue = entry.getValue();
             Object convValue;
             if (!isScalarF) {
@@ -238,7 +226,7 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
                     convValue = handleComplexJsonValue(elementValue);
                 }
             }
-            if(preserveEmptyValue || !isEmptyObjectValue(convValue) || isGetPolicyValue(propName)){
+            if (preserveEmptyValue || !isEmptyObjectValue(convValue) || isGetPolicyValue(propName)) {
                 toscaObjectPresentation.put(propName, convValue);
             }
         }