diff options
| author |   Francis Toth <francis.toth@yoppworks.com> | 2020-06-26 19:53:26 -0400 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-07-05 07:56:41 +0000 |
| commit | df10d0be06468d55818fa734321c14827fef61bb (patch) | |
| tree | df383e3c85999c362a965a6851bd625622b2d91b /asdctool/src/main/java/org/openecomp | |
| parent | 0a6a27ea1abf4fe990ac0b3e204a16dd0aca84c3 (diff) | |
Clean CsarUtils::MainYamlWithDependencies
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I593dd7bb6a20445899a14da793e8c550e1e14e09
Issue-ID: SDC-2812
Diffstat (limited to 'asdctool/src/main/java/org/openecomp')
| -rw-r--r-- | asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java | 3 | ||||
| -rw-r--r-- | asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/internal/tool/CsarGenerator.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java index e21594db46..291605e4b1 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java @@ -1237,9 +1237,8 @@ public class ArtifactUuidFix { return Either.right(exportComponent.right().value()); } log.debug("Tosca yaml exported for component {} ", parent.getUniqueId()); - String payload = exportComponent.left().value().getMainYaml(); - toscaArtifact.setPayloadData(payload); + toscaArtifact.setPayload(exportComponent.left().value().getMainYaml()); byte[] decodedPayload = toscaArtifact.getPayloadData(); String uniqueId = UniqueIdBuilder.buildPropertyUniqueId(parent.getUniqueId(), diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/internal/tool/CsarGenerator.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/internal/tool/CsarGenerator.java index 8d74ea5abb..6c5ffb7be6 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/internal/tool/CsarGenerator.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/internal/tool/CsarGenerator.java @@ -38,6 +38,7 @@ import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder; import org.openecomp.sdc.be.resources.data.DAOArtifactData; import org.openecomp.sdc.be.tosca.CsarUtils; import org.openecomp.sdc.be.tosca.ToscaExportHandler; +import org.openecomp.sdc.be.tosca.ToscaRepresentation; import org.openecomp.sdc.common.api.ArtifactTypeEnum; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.GeneralUtility; @@ -152,7 +153,7 @@ public class CsarGenerator extends CommonInternalTool { return csarUtils.createCsar(component, true, true).either( l -> l, r -> null); } private byte[] generateToscaPayload(Component component){ - return toscaExportHandler.exportComponent(component).either(l -> l.getMainYaml().getBytes(), r -> null); + return toscaExportHandler.exportComponent(component).either(ToscaRepresentation::getMainYaml, r -> null); } private JanusGraphOperationStatus savePayload(org.openecomp.sdc.be.model.Component component, ArtifactDefinition csarArtifact, Supplier<byte[]> supplier) { |