1 files changed, 21 insertions, 21 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
index 5119177477..59dd8d0f00 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
@@ -20,31 +20,31 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
 
+import java.lang.reflect.Field;
+import java.util.*;
 public class ToscaUtils {
 
-    public static boolean isComplexVfc(Component component) {
+    private ToscaUtils() {}
+
+    public static boolean isNotComplexVfc(Component component) {
         if (ComponentTypeEnum.RESOURCE == component.getComponentType()) {
             ResourceTypeEnum resourceType = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition()).getResourceType();
             if (ResourceTypeEnum.CVFC == resourceType) {
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
-    public static Map<String, Object> objectToMap(Object objectToConvert, Class<?> clazz) throws IllegalArgumentException, IllegalAccessException {
+    public static Map<String, Object> objectToMap(Object objectToConvert, Class<?> clazz) throws IllegalAccessException {
         Map<String, Object> map = new HashMap<>();
         List<Field> fields = new ArrayList<>();
 
@@ -57,30 +57,30 @@ public class ToscaUtils {
         return map;
     }
 
-    public static List<Field> getAllFields(List<Field> fields, Class<?> type) {
+    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
         fields.addAll(Arrays.asList(type.getDeclaredFields()));
-
         if (type.getSuperclass() != null) {
-            fields = getAllFields(fields, type.getSuperclass());
+            return getAllFields(fields, type.getSuperclass());
         }
         return fields;
     }
 
-    public static class SubstituitionEntry{
+    public static class SubstitutionEntry {
 
         private String fullName = "";
         private String sourceName = "";
         private String owner = "";
 
-        public SubstituitionEntry() {}
-
-        public SubstituitionEntry(String fullName, String sourceName, String owner) {
-            if(fullName != null)
+        SubstitutionEntry(String fullName, String sourceName, String owner) {
+            if(fullName != null) {
                 this.fullName = fullName;
-            if(sourceName != null)
+            }
+            if(sourceName != null) {
                 this.sourceName = sourceName;
-            if(owner != null)
+            }
+            if(owner != null) {
                 this.owner = owner;
+            }
         }
 
         public String getFullName() {