diff options
author | Benjamin, Max (mb388a) <mb388a@att.com> | 2021-02-05 20:34:11 -0500 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2021-02-16 15:45:44 -0500 |
commit | d5968f56b382c50dfafc3b6feeccf5b81d176b9d (patch) | |
tree | fb84f73c534afa746fb4eaefb247c0c096b8b7a3 /asdc-controller/src/main | |
parent | 666b56c9241c37b22f631fb88f4a40aedefa2eac (diff) |
update camunda and spring to latest versions
Updated camunda to 7.14 and updated spring boot camunda to 3.4
Started to clean up duplicate maven dependencies
Issue-ID: SO-3521
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ic65b04772b91dd989e41d6b6b93872978bc4e4e2
Diffstat (limited to 'asdc-controller/src/main')
-rw-r--r-- | asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java | 4 | ||||
-rw-r--r-- | asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java index 6497a99e5e..8fe01caa46 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java @@ -68,7 +68,7 @@ public class VfResourceStructure extends ResourceStructure { /** * The list of VfModulesMetadata defined for this resource. */ - private List<IVfModuleData> vfModulesMetadataList; + private List<VfModuleMetaData> vfModulesMetadataList; private VnfResource catalogVnfResource; @@ -203,7 +203,7 @@ public class VfResourceStructure extends ResourceStructure { this.catalogService = catalogService; } - public List<IVfModuleData> decodeVfModuleArtifact(byte[] arg0) { + public List<VfModuleMetaData> decodeVfModuleArtifact(byte[] arg0) { try { return new ObjectMapper().readValue(arg0, new TypeReference<List<VfModuleMetaData>>() {}); diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java index 6908fe4eda..fa17e727a5 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java @@ -35,6 +35,7 @@ import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.elements.Metadata; import org.onap.so.asdc.installer.IVfModuleData; import org.onap.so.asdc.installer.ToscaResourceStructure; +import org.onap.so.asdc.installer.VfModuleMetaData; import org.onap.so.asdc.installer.heat.ToscaResourceInstaller; public class ASDCNotificationLogging { @@ -850,7 +851,7 @@ public class ASDCNotificationLogging { return buffer.toString(); } - public static String dumpVfModuleMetaDataList(List<IVfModuleData> moduleMetaDataList) { + public static String dumpVfModuleMetaDataList(List<VfModuleMetaData> moduleMetaDataList) { if (moduleMetaDataList == null) { return null; } |