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 --- adapters/etsi-sol003-adapter/pom.xml | 2 +- adapters/mso-adapter-utils/pom.xml | 2 +- .../so/openstack/utils/MsoMulticloudUtils.java | 2 +- .../onap/so/openstack/utils/MsoHeatUtilsTest.java | 1 + .../utils/MsoHeatUtilsWithUpdateTest.java | 3 -- .../so/openstack/utils/MsoMulticloudUtilsTest.java | 6 ++-- adapters/mso-catalog-db-adapter/pom.xml | 2 +- .../java/db/migration/R__CloudConfigMigration.java | 33 +++++++++-------- adapters/mso-openstack-adapters/pom.xml | 42 ++++------------------ adapters/mso-requests-db-adapter/pom.xml | 18 ++-------- .../requestsdb/ArchiveInfraRequestsScheduler.java | 4 ++- adapters/mso-sdnc-adapter/pom.xml | 35 ++---------------- .../src/test/resources/application-test.properties | 13 +++++++ adapters/mso-vfc-adapter/pom.xml | 4 +++ adapters/so-appc-orchestrator/pom.xml | 23 +----------- 15 files changed, 59 insertions(+), 131 deletions(-) (limited to 'adapters') diff --git a/adapters/etsi-sol003-adapter/pom.xml b/adapters/etsi-sol003-adapter/pom.xml index ceaaab42d0..25bb903bbd 100644 --- a/adapters/etsi-sol003-adapter/pom.xml +++ b/adapters/etsi-sol003-adapter/pom.xml @@ -19,7 +19,7 @@ 2.7.2 1.3.5 1.0.1 - 1.5.21 + 1.6.2 3.14.0 2.7.5 1.13.0 diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index 6c9c23a59b..510871bb47 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -84,7 +84,7 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.3.0 test diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java index 1df5fe36ab..be42ff10bb 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java +++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java @@ -212,7 +212,7 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin { if (response.hasEntity()) { multicloudResponseBody = getCreateBody((java.io.InputStream) response.getEntity()); } - if (response.getStatus() == Response.Status.CREATED.getStatusCode() && response.hasEntity()) { + if (response.getStatus() == Response.Status.CREATED.getStatusCode() && multicloudResponseBody != null) { String canonicalName = stackName + "/"; if (multicloudResponseBody != null) { canonicalName = canonicalName + multicloudResponseBody.getWorkloadId(); diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java index f20f6f1448..5ee4987e38 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java @@ -439,6 +439,7 @@ public class MsoHeatUtilsTest extends MsoHeatUtils { String requestId = getRequestId(); doReturn(heatClient).when(heatUtils).getHeatClient(cloudSiteId, tenantId); + doNothing().when(heatUtils).saveStackRequest(eq(createStackParam), isNull(), eq("stackName")); doReturn(stackResource).when(heatClient).getStacks(); doReturn(mockCreateStack).when(stackResource).create(createStackParam); diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java index acd42dd8da..c6111a16cb 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java @@ -95,7 +95,6 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo expectedStackInfo = new StackInfo("stackName", HeatStatus.UPDATED, "stackStatusReason", null); expectedStackInfo.setCanonicalName("stackName/id"); - doReturn(Optional.of(cloudSite)).when(cloudConfig).getCloudSite(isA(String.class)); doReturn(heatClient).when(heatUtils).getHeatClient(isA(String.class), isA(String.class)); doReturn(null).when(heatUtils).executeAndRecordOpenstackRequest(isA(OpenStackRequest.class)); doReturn("0").when(environment).getProperty(isA(String.class), isA(String.class)); @@ -120,7 +119,6 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo expectedStackInfo = new StackInfo("stackName", HeatStatus.UPDATED, "stackStatusReason", null); expectedStackInfo.setCanonicalName("stackName/id"); - doReturn(Optional.of(cloudSite)).when(cloudConfig).getCloudSite(isA(String.class)); doReturn(heatClient).when(heatUtils).getHeatClient(isA(String.class), isA(String.class)); doReturn(null).when(heatUtils).executeAndRecordOpenstackRequest(isA(OpenStackRequest.class)); @@ -147,7 +145,6 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo expectedStackInfo = new StackInfo("stackName", HeatStatus.UPDATED, "stackStatusReason", null); expectedStackInfo.setCanonicalName("stackName/id"); - doReturn(Optional.of(cloudSite)).when(cloudConfig).getCloudSite(isA(String.class)); doReturn(heatClient).when(heatUtils).getHeatClient(isA(String.class), isA(String.class)); doReturn(null).when(heatUtils).executeAndRecordOpenstackRequest(isA(OpenStackRequest.class)); doReturn("0").when(environment).getProperty(isA(String.class), isA(String.class)); diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoMulticloudUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoMulticloudUtilsTest.java index 44a9bc3e10..7adfe091d3 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoMulticloudUtilsTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoMulticloudUtilsTest.java @@ -181,12 +181,12 @@ public class MsoMulticloudUtilsTest extends BaseTest { @Test public void createStackEmptyResponseEntity() throws MsoException { - wireMockServer.stubFor(post(urlPathEqualTo(MULTICLOUD_CREATE_PATH)).willReturn( - aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_CREATED))); + wireMockServer.stubFor(post(urlPathEqualTo(MULTICLOUD_CREATE_PATH)).willReturn(aResponse() + .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_CREATED).withBody("{}"))); StackInfo result = multicloudUtils.createStack("MTN14", "CloudOwner", "TEST-tenant", "TEST-stack", new VduModelInfo(), "TEST-heat", new HashMap<>(), false, 200, "TEST-env", new HashMap<>(), new HashMap<>(), false, false); assertNotNull(result); - assertEquals("TEST-stack/", result.getName()); + assertEquals("TEST-stack", result.getName()); } } diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 9b51e35c57..05d85c20a9 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -185,7 +185,7 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.3.0 test diff --git a/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java b/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java index 691ae60afd..86cfa6ee0c 100644 --- a/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java +++ b/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java @@ -22,19 +22,6 @@ package db.migration; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.flywaydb.core.api.MigrationVersion; -import org.flywaydb.core.api.migration.MigrationChecksumProvider; -import org.flywaydb.core.api.migration.MigrationInfoProvider; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; -import org.onap.so.db.catalog.beans.CloudIdentity; -import org.onap.so.db.catalog.beans.CloudSite; -import org.onap.so.db.catalog.beans.CloudifyManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -45,13 +32,24 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.Collection; +import org.flywaydb.core.api.MigrationVersion; +import org.flywaydb.core.api.migration.BaseJavaMigration; +import org.onap.so.db.catalog.beans.CloudIdentity; +import org.onap.so.db.catalog.beans.CloudSite; +import org.onap.so.db.catalog.beans.CloudifyManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; /** * Performs migration using JDBC Connection from the cloud config provided in the environment * (application-{profile}.yaml) and persist data (when not already present) to the catalod database. */ @JsonIgnoreProperties(ignoreUnknown = true) -public class R__CloudConfigMigration implements JdbcMigration, MigrationInfoProvider, MigrationChecksumProvider { +public class R__CloudConfigMigration extends BaseJavaMigration { public static final String FLYWAY = "FLYWAY"; private static final Logger logger = LoggerFactory.getLogger(R__CloudConfigMigration.class); @@ -63,7 +61,6 @@ public class R__CloudConfigMigration implements JdbcMigration, MigrationInfoProv return false; } - @Override public void migrate(Connection connection) throws Exception { logger.debug("Starting migration for CloudConfig"); @@ -238,5 +235,11 @@ public class R__CloudConfigMigration implements JdbcMigration, MigrationInfoProv public Integer getChecksum() { return Math.toIntExact(System.currentTimeMillis() / 1000); } + + @Override + public void migrate(org.flywaydb.core.api.migration.Context context) throws Exception { + migrate(context.getConnection()); + + } } diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 7d5e8cc6fd..ab3f358740 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -15,7 +15,6 @@ ${project.artifactId}-${project.version} - org.springframework.boot @@ -26,9 +25,7 @@ - - repackage - + repackage @@ -87,8 +84,6 @@ - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jpa @@ -177,14 +162,6 @@ janino 2.5.15 - - - - - org.pacesys - openstack4j-core - 3.2.0 - org.pacesys.openstack4j.connectors openstack4j-jersey2 @@ -210,7 +187,6 @@ commons-collections 3.2.2 - com.typesafe config @@ -221,14 +197,11 @@ jsr305 1.3.9 - commons-validator commons-validator 1.4.1 - - org.onap.so.adapters mso-adapter-utils @@ -248,15 +221,10 @@ org.mariadb.jdbc mariadb-java-client - - org.onap.so - common - ${project.version} - ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.3.0 test @@ -278,12 +246,16 @@ org.camunda.bpm camunda-external-task-client - 1.1.1 + 1.4.0 com.github.seancfoley ipaddress 2.0.0 + + org.springframework.boot + spring-boot-starter-validation + diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 66b9a6b993..701b5e605a 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -16,11 +16,7 @@ org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc + spring-boot-starter-validation org.apache.cxf @@ -67,7 +63,7 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.3.0 test @@ -88,18 +84,10 @@ net.javacrumbs.shedlock shedlock-provider-jdbc-template - - io.micrometer - micrometer-core - io.micrometer micrometer-registry-prometheus - - org.springframework.boot - spring-boot-starter-data-rest - org.onap.so cxf-logging @@ -136,7 +124,6 @@ cxf-rt-frontend-simple 3.3.3 - com.sun.xml.ws jaxws-ri @@ -184,7 +171,6 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} org.onap.so.adapters.requestsdb.application.MSORequestDBApplication diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java index 4fe49e38dd..89c26232bd 100644 --- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java +++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java @@ -78,7 +78,9 @@ public class ArchiveInfraRequestsScheduler { + "-" + calendar.get(Calendar.YEAR)); List requestsByEndTime = new ArrayList<>(); - PageRequest pageRequest = new PageRequest(0, 100); + + PageRequest pageRequest = PageRequest.of(0, 100); // Could use sorting here + do { requestsByEndTime = infraActiveRepo.findByEndTimeLessThan(archivingDate, pageRequest); logger.debug("{} requests to be archived based on End Time", requestsByEndTime.size()); diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 590121966e..843f42b1e6 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -131,32 +131,7 @@ - - - com.sun.activation - javax.activation - 1.2.0 - - - javax.xml.bind - jaxb-api - 2.3.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 - - - org.springframework.boot - spring-boot-starter-web - io.swagger swagger-jersey2-jaxrs @@ -164,12 +139,12 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-starter-test + test org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-validation org.onap.so.adapters @@ -204,10 +179,6 @@ 1.0.4 test - - io.micrometer - micrometer-core - io.micrometer micrometer-registry-prometheus diff --git a/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties b/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties index e4f6903e23..0c77e30fe6 100644 --- a/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties +++ b/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties @@ -88,6 +88,19 @@ org.onap.so.adapters.sdnc..security-zone-topology-operation.deactivate=POST|2700 server.port=8080 server.tomcat.max-threads=50 ssl-enable: false +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.url=jdbc:mariadb://localhost:3307/camundabpmn +spring.datasource.username=root +spring.datasource.password=password +spring.datasource.initialization-mode=always +spring.jpa.generate-ddl=false +spring.jpa.hibernate.ddl-auto=none +spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy +spring.jpa.hibernate.enable-lazy-load-no-trans=true +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +mariaDB4j.dataDir= +mariaDB4j.port=3307 +mariaDB4j.databaseName=camundabpmn spring.security.usercredentials[0].username=test spring.security.usercredentials[0].password=$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu spring.security.usercredentials[0].role=SDNC-Client diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml index eae6745866..d181e1006b 100644 --- a/adapters/mso-vfc-adapter/pom.xml +++ b/adapters/mso-vfc-adapter/pom.xml @@ -109,5 +109,9 @@ spring-boot-configuration-processor true + + org.springframework.boot + spring-boot-starter-validation + diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index 68814fc075..dbb31a6a73 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -141,40 +141,19 @@ ${project.artifactId}-${project.version} - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-test test - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - com.google.guava guava - - org.onap.so - common - ${project.version} - org.camunda.bpm camunda-external-task-client - 1.1.1 + 1.4.0 org.onap.so -- cgit 1.2.3-korg