fix capabilities

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / tosca / CsarUtils.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
index fda1990..2f4a385 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
@@ -52,6 +52,7 @@ import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
@@ -275,7 +276,7 @@ public class CsarUtils {
                zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + fileName));
                zip.write(mainYaml);
                        //US798487 - Abstraction of complex types
-                       if (!ToscaUtils.isAtomicType(component)){
+                       if (!ModelConverter.isAtomicComponent(component)){
                                log.debug("Component {} is complex - generating abstract type for it..", component.getName());
                                writeComponentInterface(component, zip, fileName);
                        }
@@ -332,7 +333,7 @@ public class CsarUtils {
                                zip.write(content);
 
                                // add component interface to zip
-                               if (!ToscaUtils.isAtomicType(innerComponent)) {
+                               if (!ModelConverter.isAtomicComponent(innerComponent)) {
                                        writeComponentInterface(innerComponent, zip, icFileName);
                                }
                        }
@@ -453,7 +454,7 @@ public class CsarUtils {
                                        }
 
                                        //if not atomic - insert inner components as well
-                                       if(!ToscaUtils.isAtomicType(componentRI)) {
+                                       if(!ModelConverter.isAtomicComponent(componentRI)) {
                                                addInnerComponentsToCache(componentCache, componentRI);
                                        }
                                }