From d5968f56b382c50dfafc3b6feeccf5b81d176b9d Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Fri, 5 Feb 2021 20:34:11 -0500 Subject: 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) Change-Id: Ic65b04772b91dd989e41d6b6b93872978bc4e4e2 --- .../src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java | 4 ++-- .../src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java | 3 ++- .../test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'asdc-controller') 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 vfModulesMetadataList; + private List vfModulesMetadataList; private VnfResource catalogVnfResource; @@ -203,7 +203,7 @@ public class VfResourceStructure extends ResourceStructure { this.catalogService = catalogService; } - public List decodeVfModuleArtifact(byte[] arg0) { + public List decodeVfModuleArtifact(byte[] arg0) { try { return new ObjectMapper().readValue(arg0, new TypeReference>() {}); 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 moduleMetaDataList) { + public static String dumpVfModuleMetaDataList(List moduleMetaDataList) { if (moduleMetaDataList == null) { return null; } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java index 6fd853915e..3ac32d616f 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java @@ -115,7 +115,7 @@ public class ASDCNotificationLoggingTest { @Test public void dumpVfModuleMetaDataListTest() { INotificationData asdcNotification = iNotificationDataObject(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(new VfModuleMetaData()); String result = null; try { -- cgit 1.2.3-korg