1 files changed, 17 insertions, 19 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationEntityType.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationEntityType.java
index f124d0474e..2e3b8386ff 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationEntityType.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationEntityType.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.translator.services.heattotosca;
 
-import org.openecomp.sdc.heat.datatypes.model.Resource;
-import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
+import static org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil.isComputeResource;
+import static org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil.isPortResource;
+import static org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil.isVolumeResource;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import static org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil.*;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 
 /**
  * The enum Entity type.
@@ -32,12 +32,23 @@ import static org.openecomp.sdc.translator.services.heattotosca.ConsolidationDat
 public enum ConsolidationEntityType {
     COMPUTE, PORT, VOLUME, NESTED,
     //Simple nested VFC (nested file with one compute) or a complex VFC (nested ST with more than
+
     //one compute)
     VFC_NESTED, SUB_INTERFACE, OTHER;
-
+    private static final Set<ConsolidationEntityType> consolidationEntityTypes = initConsolidationEntities();
     private ConsolidationEntityType sourceEntityType;
     private ConsolidationEntityType targetEntityType;
 
+    private static Set<ConsolidationEntityType> initConsolidationEntities() {
+        return Collections.unmodifiableSet(EnumSet.allOf(ConsolidationEntityType.class).stream().filter(
+            consolidationEntityType -> consolidationEntityType != ConsolidationEntityType.OTHER
+                && consolidationEntityType != ConsolidationEntityType.VOLUME).collect(Collectors.toSet()));
+    }
+
+    public static Set<ConsolidationEntityType> getSupportedConsolidationEntities() {
+        return consolidationEntityTypes;
+    }
+
     public ConsolidationEntityType getSourceEntityType() {
         return sourceEntityType;
     }
@@ -46,7 +57,6 @@ public enum ConsolidationEntityType {
         return targetEntityType;
     }
 
-
     /**
      * Sets entity type.
      *
@@ -58,18 +68,6 @@ public enum ConsolidationEntityType {
         sourceEntityType = getEntityType(sourceResource, context);
     }
 
-    private static final Set<ConsolidationEntityType> consolidationEntityTypes = initConsolidationEntities();
-
-    private static Set<ConsolidationEntityType> initConsolidationEntities() {
-        return Collections.unmodifiableSet(EnumSet.allOf(ConsolidationEntityType.class).stream().filter(
-                consolidationEntityType -> consolidationEntityType != ConsolidationEntityType.OTHER
-                && consolidationEntityType != ConsolidationEntityType.VOLUME).collect(Collectors.toSet()));
-    }
-
-    public static Set<ConsolidationEntityType> getSupportedConsolidationEntities() {
-        return consolidationEntityTypes;
-    }
-
     private ConsolidationEntityType getEntityType(Resource resource, TranslationContext context) {
         ConsolidationEntityType consolidationEntityType = ConsolidationEntityType.OTHER;
         if (isComputeResource(resource)) {