From d1009f0f9157fbb74a9768e00cb8a264e97791dc Mon Sep 17 00:00:00 2001 From: Amit Pandey Date: Wed, 24 Jan 2024 19:10:42 +0530 Subject: [PATCH] JAVA-27509 :- Update Spring Boot validation to Spring Boot 3. (#15694) --- spring-boot-modules/spring-boot-validation/pom.xml | 11 ++++++++--- .../beanvalidation/application/Application.java | 2 +- .../application/controllers/UserController.java | 2 +- .../beanvalidation/application/entities/User.java | 11 +++++------ .../spring/servicevalidation/dao/UserAccountDao.java | 2 +- .../spring/servicevalidation/domain/UserAccount.java | 10 +++++----- .../spring/servicevalidation/domain/UserAddress.java | 2 +- .../servicevalidation/service/UserAccountService.java | 6 +++--- .../src/main/resources/application.properties | 1 + .../application/UserControllerIntegrationTest.java | 2 +- 10 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 spring-boot-modules/spring-boot-validation/src/main/resources/application.properties diff --git a/spring-boot-modules/spring-boot-validation/pom.xml b/spring-boot-modules/spring-boot-validation/pom.xml index 1412a57e2a..197fc67b22 100644 --- a/spring-boot-modules/spring-boot-validation/pom.xml +++ b/spring-boot-modules/spring-boot-validation/pom.xml @@ -8,9 +8,10 @@ 0.0.1-SNAPSHOT - com.baeldung.spring-boot-modules - spring-boot-modules - 1.0.0-SNAPSHOT + com.baeldung + parent-boot-3 + 0.0.1-SNAPSHOT + ../../parent-boot-3 @@ -41,4 +42,8 @@ + + com.baeldung.beanvalidation.application.Application + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/Application.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/Application.java index e2b933a67e..2a1e10edbc 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/Application.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/Application.java @@ -16,7 +16,7 @@ public class Application { } @Bean - public CommandLineRunner run(UserRepository userRepository) throws Exception { + public CommandLineRunner run(UserRepository userRepository) { return (String[] args) -> { User user1 = new User("Bob", "bob@domain.com"); User user2 = new User("Jenny", "jenny@domain.com"); diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java index abda9a9449..7e13aec4a0 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java @@ -6,7 +6,7 @@ import com.baeldung.beanvalidation.application.repositories.UserRepository; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/entities/User.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/entities/User.java index 511ce47775..13fc97661d 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/entities/User.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/beanvalidation/application/entities/User.java @@ -1,11 +1,10 @@ package com.baeldung.beanvalidation.application.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotBlank; @Entity public class User { diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/dao/UserAccountDao.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/dao/UserAccountDao.java index c49c5220f4..adb0117997 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/dao/UserAccountDao.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/dao/UserAccountDao.java @@ -11,7 +11,7 @@ import com.baeldung.spring.servicevalidation.domain.UserAccount; @Service public class UserAccountDao { - private Map DB = new HashMap(); + private Map DB = new HashMap<>(); public String addUserAccount(UserAccount useraccount) { DB.put(useraccount.getName(), useraccount); diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAccount.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAccount.java index 5b0e795a8a..50ea9a4a66 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAccount.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAccount.java @@ -1,10 +1,10 @@ package com.baeldung.spring.servicevalidation.domain; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; public class UserAccount { diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAddress.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAddress.java index cd149dc5f5..276f18ff67 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAddress.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/domain/UserAddress.java @@ -1,6 +1,6 @@ package com.baeldung.spring.servicevalidation.domain; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class UserAddress { diff --git a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/service/UserAccountService.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/service/UserAccountService.java index 9d79e4e226..648c45d893 100644 --- a/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/service/UserAccountService.java +++ b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/spring/servicevalidation/service/UserAccountService.java @@ -2,9 +2,9 @@ package com.baeldung.spring.servicevalidation.service; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/spring-boot-modules/spring-boot-validation/src/main/resources/application.properties b/spring-boot-modules/spring-boot-validation/src/main/resources/application.properties new file mode 100644 index 0000000000..ead0df89a3 --- /dev/null +++ b/spring-boot-modules/spring-boot-validation/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.jpa.properties.hibernate.globally_quoted_identifiers=true diff --git a/spring-boot-modules/spring-boot-validation/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java b/spring-boot-modules/spring-boot-validation/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java index 21fcaf922c..c26174d961 100644 --- a/spring-boot-modules/spring-boot-validation/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java +++ b/spring-boot-modules/spring-boot-validation/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java @@ -34,7 +34,7 @@ public class UserControllerIntegrationTest { private MockMvc mockMvc; @Test - public void whenUserControllerInjected_thenNotNull() throws Exception { + public void whenUserControllerInjected_thenNotNull() { assertThat(userController).isNotNull(); }