diff options
author | 2023-09-18 14:54:22 +0000 | |
---|---|---|
committer | 2023-09-18 14:54:22 +0000 | |
commit | a01f8861a84931f4bdf2d69fa05a793afabc22e0 (patch) | |
tree | 566994ff310bf2eb55e32ee7827faeab46373805 /cps-rest | |
parent | b45c80995966be243a79bedefa25f6c05f64a2d6 (diff) | |
parent | 9693ec51cf6526082f0ad0c3ad208d144cbbb163 (diff) |
Merge "Migrate CPS to Spring-boot 3.0"
Diffstat (limited to 'cps-rest')
4 files changed, 14 insertions, 5 deletions
diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 8d92d972c..5330b8633 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -122,6 +122,14 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + </dependency> + <dependency> + <groupId>io.gsonfire</groupId> + <artifactId>gson-fire</artifactId> + </dependency> </dependencies> <build> @@ -148,6 +156,7 @@ <sourceFolder>src/gen/java</sourceFolder> <dateLibrary>java11</dateLibrary> <interfaceOnly>true</interfaceOnly> + <useSpringBoot3>true</useSpringBoot3> <useTags>true</useTags> <openApiNullable>false</openApiNullable> <skipDefaultInterface>true</skipDefaultInterface> diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java index 369c94d29..993dad58c 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java @@ -27,11 +27,11 @@ import static org.onap.cps.rest.utils.MultipartFileUtil.extractYangResourcesMap; import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED; import io.micrometer.core.annotation.Timed; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.onap.cps.api.CpsAdminService; import org.onap.cps.api.CpsModuleService; diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java index 62163327f..60e7fb6d2 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java @@ -25,13 +25,13 @@ package org.onap.cps.rest.controller; import io.micrometer.core.annotation.Timed; +import jakarta.validation.ValidationException; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import javax.validation.ValidationException; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.onap.cps.api.CpsDataService; diff --git a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java index 5dfd03bf2..1f6cf1724 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java @@ -22,8 +22,8 @@ package org.onap.cps.rest.exceptions; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ValidationException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ValidationException; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; |