From 6a7f13fa7e284cbec5b0743c10fdd33286aaf2ec Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 19 Jun 2023 16:05:33 -0400 Subject: Port to java 17 Update to java 17 / springboot 3 to align with OpenDaylight Argon. Copied and ported CADI library from AAF Issue-ID: CCSDK-3917 Signed-off-by: Dan Timoney Change-Id: Idecb0cf43c48ccbbc0c61bf4278b87a37f92a56e --- .../main/java/org/onap/ccsdk/apps/ms/sliboot/FilterConfiguration.java | 2 +- .../src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java | 2 +- .../onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java | 4 ++-- .../java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java | 2 +- .../org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ms/sliboot/src/main/java/org') diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/FilterConfiguration.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/FilterConfiguration.java index 295953a4..ebacc049 100644 --- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/FilterConfiguration.java +++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/FilterConfiguration.java @@ -5,7 +5,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.Properties; -import org.onap.aaf.cadi.filter.CadiFilter; +import org.onap.ccsdk.apps.cadi.filter.CadiFilter; import org.onap.ccsdk.sli.core.utils.common.EnvProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java index 0fd23a9e..e393dd0c 100644 --- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java +++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java @@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import springfox.documentation.swagger2.annotations.EnableSwagger2; import org.springframework.context.annotation.Bean; -import org.onap.aaf.cadi.filter.CadiFilter; +import org.onap.ccsdk.apps.cadi.filter.CadiFilter; @SpringBootApplication(scanBasePackages={ "org.onap.ccsdk.apps.ms.sliboot.*", "org.onap.ccsdk.apps.services" }) @EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*") diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java index 44981845..2383fe69 100644 --- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java +++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java @@ -47,8 +47,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.*; @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-02-20T12:50:11.207-05:00") diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java index 1ca4fe1f..8081d6ac 100644 --- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java +++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java @@ -1,6 +1,6 @@ package org.onap.ccsdk.apps.ms.sliboot.data; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "TEST_RESULT_CONFIG") @Table(name = "TEST_RESULT_CONFIG") diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java index b9d09934..ab3aedb5 100644 --- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java +++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java @@ -1,6 +1,6 @@ package org.onap.ccsdk.apps.ms.sliboot.data; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name="TEST_RESULT_OPERATIONAL") @Table(name="TEST_RESULT_OPERATIONAL") -- cgit 1.2.3-korg