From: vasraz Date: Wed, 15 Jun 2022 11:50:31 +0000 (+0100) Subject: Support metadata in Inputs during Service Import X-Git-Tag: 1.11.5~11 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7081d625ddd0aadcb64f5ba882339fabb612233d;p=sdc.git Support metadata in Inputs during Service Import Signed-off-by: Vasyl Razinkov Change-Id: Ie010076082af7c8ed5fd5fcda874ade2a7e37389 Issue-ID: SDC-4052 --- diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java index f53726743c..3a1c55a31f 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java @@ -403,6 +403,7 @@ public final class ImportUtils { setField(inputValue, TypeUtils.ToscaTagNamesEnum.LABEL, inputDef::setLabel); setFieldBoolean(inputValue, TypeUtils.ToscaTagNamesEnum.HIDDEN, hidden -> inputDef.setHidden(Boolean.parseBoolean(hidden))); setFieldBoolean(inputValue, TypeUtils.ToscaTagNamesEnum.IMMUTABLE, immutable -> inputDef.setImmutable(Boolean.parseBoolean(immutable))); + setFieldMap(inputValue, ToscaTagNamesEnum.METADATA, inputDef::setMetadata); setSchema(inputValue, inputDef); setPropertyConstraints(inputValue, inputDef); return inputDef; @@ -493,6 +494,14 @@ public final class ImportUtils { } } + private static void setFieldMap(final Map toscaJson, final ToscaTagNamesEnum tagName, + final Consumer> setter) { + final Either, ResultStatusEnum> toscaMapElement = findFirstToscaMapElement(toscaJson, tagName); + if (toscaMapElement.isLeft()) { + setter.accept(toscaMapElement.left().value()); + } + } + public static Either, ResultStatusEnum> getProperties(Map toscaJson) { Function elementGenByName = ImportUtils::createProperties; Function, PropertyDefinition> func = ImportUtils::createModuleProperty;