X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Ftosca%2FToscaExportHandler.java;h=09c93ed40820e778b3c4f5185ceeefede4ef9e11;hb=5d7ca5c1e86d7633a1954ae89334df18d264f82b;hp=163b67a44fe29c4e33f9a3980b126048a39950af;hpb=d37d9e6adead6a6568aafb2ac831237de32fbdca;p=sdc.git diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java index 163b67a44f..09c93ed408 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java @@ -277,44 +277,6 @@ public class ToscaExportHandler { return Either.left(toscaRepresentation); } - public Either exportComponentInterface(final Component component, final boolean isAssociatedComponent, - final boolean isSkipImports) { - final List>> imports = new ArrayList<>(getDefaultToscaImports(component.getModel(), isSkipImports)); - if (CollectionUtils.isEmpty(imports)) { - log.debug(FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION); - return Either.right(ToscaError.GENERAL_ERROR); - } - List> dependencies = new ArrayList<>(); - if (component.getDerivedFromGenericType() != null && !component.getDerivedFromGenericType() - .startsWith("org.openecomp.resource.abstract.nodes.")) { - final Either baseType = toscaOperationFacade - .getByToscaResourceNameAndVersion(component.getDerivedFromGenericType(), component.getDerivedFromGenericVersion(), - component.getModel()); - if (baseType.isLeft() && baseType.left().value() != null) { - addDependencies(imports, dependencies, baseType.left().value(), isSkipImports); - } else { - log.debug("Failed to fetch derived from type {}", component.getDerivedFromGenericType()); - } - } - - String toscaVersion = null; - if (component instanceof Resource) { - toscaVersion = ((Resource) component).getToscaVersion(); - } - ToscaTemplate toscaTemplate = new ToscaTemplate(toscaVersion != null ? toscaVersion : TOSCA_VERSION); - toscaTemplate.setImports(imports); - final Map nodeTypes = new HashMap<>(); - final Either toscaTemplateRes = convertInterfaceNodeType(new HashMap<>(), component, toscaTemplate, nodeTypes, - isAssociatedComponent); - if (toscaTemplateRes.isRight()) { - return Either.right(toscaTemplateRes.right().value()); - } - toscaTemplate = toscaTemplateRes.left().value(); - toscaTemplate.setDependencies(dependencies); - ToscaRepresentation toscaRepresentation = this.createToscaRepresentation(toscaTemplate); - return Either.left(toscaRepresentation); - } - private ToscaRepresentation createToscaRepresentation(ToscaTemplate toscaTemplate) { CustomRepresenter representer = new CustomRepresenter(); DumperOptions options = new DumperOptions(); @@ -342,15 +304,6 @@ public class ToscaExportHandler { return Either.left(fillImports.left().value().left); } - public Either getDependencies(Component component, boolean isSkipImports) { - ToscaTemplate toscaTemplate = new ToscaTemplate(null); - Either>, ToscaError> fillImports = fillImports(component, toscaTemplate, isSkipImports); - if (fillImports.isRight()) { - return Either.right(fillImports.right().value()); - } - return Either.left(fillImports.left().value().left); - } - public Either convertToToscaTemplate(final Component component, final boolean isSkipImports) { final List>> defaultToscaImportConfig = getDefaultToscaImports(component.getModel(), isSkipImports); if (CollectionUtils.isEmpty(defaultToscaImportConfig)) {