From 2eb5c1658d0ee6784d89ec0de5065c907bcba07e Mon Sep 17 00:00:00 2001 From: junhkang Date: Tue, 26 Mar 2024 09:33:43 +0900 Subject: [PATCH 1/6] Updated the imports in code of the single table inheritance pattern for Spring Boot 3.x #2825 Change javax library to jakarta --- .../src/main/java/com/iluwatar/entity/Car.java | 4 ++-- .../main/java/com/iluwatar/entity/Freighter.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Train.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Truck.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Vehicle.java | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java index c8d3185fdce9..10e7fb2f12fd 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java index ce35f3df37df..0c20aacefe1c 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java index 10a74f36ac5a..d7bc226bea27 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java index e389666e4dcc..26ae2724c7bc 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java index 901a37705455..814894d64d28 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java @@ -1,12 +1,12 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; From 5dec4f02ae78708155792475a09b23636e30d626 Mon Sep 17 00:00:00 2001 From: junhkang Date: Tue, 26 Mar 2024 11:11:56 +0900 Subject: [PATCH 2/6] add pom.xml --- single-table-inheritance/pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/single-table-inheritance/pom.xml b/single-table-inheritance/pom.xml index 159a683bea21..2bef8842e07a 100644 --- a/single-table-inheritance/pom.xml +++ b/single-table-inheritance/pom.xml @@ -10,12 +10,26 @@ single-table-inheritance - + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.3 + import + + + org.springframework.boot spring-boot-starter-data-jpa + + jakarta.xml.bind + jakarta.xml.bind-api + com.h2database h2 From f1ed6ee9a3c9a6e389423baed292c02ee8412c43 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 09:52:39 +0900 Subject: [PATCH 3/6] Updated the imports in code of the healthcheck pattern for SpringBoot 3.x Change javax library to jakarta and update maven dependency versions --- health-check/pom.xml | 23 ++++++++++++++++--- .../check/AsynchronousHealthChecker.java | 2 +- .../health/check/CpuHealthIndicator.java | 2 +- .../iluwatar/health/check/HealthCheck.java | 10 ++++---- .../health/check/HealthCheckRepository.java | 6 ++--- .../test/java/HealthCheckRepositoryTest.java | 4 ++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/health-check/pom.xml b/health-check/pom.xml index b6f6ba2644f1..3fb07d14ee1b 100644 --- a/health-check/pom.xml +++ b/health-check/pom.xml @@ -36,14 +36,32 @@ health-check - + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.3 + import + + + org.hibernate + hibernate-core + 6.4.4.Final + + + org.springframework.boot spring-boot-starter-web - + + jakarta.xml.bind + jakarta.xml.bind-api + org.springframework.boot @@ -105,7 +123,6 @@ test - diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index 106a924cbb11..1fc4790ec3c6 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.actuate.health.Health; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 0914c3807d66..b59754e006fd 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -5,7 +5,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java b/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java index 15c14488ae0b..528753ee035a 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java +++ b/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java @@ -1,10 +1,10 @@ package com.iluwatar.health.check; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import lombok.Data; /** diff --git a/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java b/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java index 64a0a4e93159..272cf46b2159 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java +++ b/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java @@ -1,8 +1,8 @@ package com.iluwatar.health.check; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/health-check/src/test/java/HealthCheckRepositoryTest.java b/health-check/src/test/java/HealthCheckRepositoryTest.java index 2508c126d9e4..8eb791438db8 100644 --- a/health-check/src/test/java/HealthCheckRepositoryTest.java +++ b/health-check/src/test/java/HealthCheckRepositoryTest.java @@ -3,8 +3,8 @@ import com.iluwatar.health.check.HealthCheck; import com.iluwatar.health.check.HealthCheckRepository; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; From ac4d529eb4d157b1c9d04408beafa00dbec699be Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:13:29 +0900 Subject: [PATCH 4/6] change order of imports to pass Checkstyle violations --- .../com/iluwatar/health/check/AsynchronousHealthChecker.java | 2 +- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index 1fc4790ec3c6..eb8378e08d75 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -6,8 +6,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.function.Supplier; import jakarta.annotation.PreDestroy; +import java.util.function.Supplier; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.actuate.health.Health; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index b59754e006fd..2faa1ace4bcc 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -4,8 +4,8 @@ import java.lang.management.OperatingSystemMXBean; import java.time.Instant; import java.util.HashMap; -import java.util.Map; import jakarta.annotation.PostConstruct; +import java.util.Map; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; From ab31c4499221ce9c907bc532203f54e43e61a697 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:28:14 +0900 Subject: [PATCH 5/6] change import order to pass lexicographical order test --- .../com/iluwatar/health/check/AsynchronousHealthChecker.java | 2 +- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index eb8378e08d75..18f44ef38c5b 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -1,12 +1,12 @@ package com.iluwatar.health.check; +import jakarta.annotation.PreDestroy; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import jakarta.annotation.PreDestroy; import java.util.function.Supplier; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 2faa1ace4bcc..28b7de10099f 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -3,8 +3,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.time.Instant; -import java.util.HashMap; import jakarta.annotation.PostConstruct; +import java.util.HashMap; import java.util.Map; import lombok.Getter; import lombok.Setter; From 672b44a4fa13bd5e695a5d086160a0d672ace936 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:40:31 +0900 Subject: [PATCH 6/6] change import order to pass CustomImportOrder warning --- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 28b7de10099f..5c9bc2dd7e7e 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -1,9 +1,9 @@ package com.iluwatar.health.check; +import jakarta.annotation.PostConstruct; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.time.Instant; -import jakarta.annotation.PostConstruct; import java.util.HashMap; import java.util.Map; import lombok.Getter;