From be914e0bc3265027678f711c9edd59c6ae325202 Mon Sep 17 00:00:00 2001
From: Jun Kang <junhkang91@gmail.com>
Date: Wed, 27 Mar 2024 22:38:32 +0900
Subject: [PATCH] deps: Updated the imports in code of the healthcheck pattern
 for SpringBoot 3.x (#2851)

* Updated the imports in code of the single table inheritance pattern for Spring Boot 3.x

#2825
Change javax library to jakarta

* add pom.xml

* Updated the imports in code of the healthcheck pattern for SpringBoot 3.x

Change javax library to jakarta and update maven dependency versions

* change order of imports to pass Checkstyle violations

* change import order to pass lexicographical order test

* change import order to pass CustomImportOrder warning
---
 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 b6f6ba264..3fb07d14e 100644
--- a/health-check/pom.xml
+++ b/health-check/pom.xml
@@ -36,14 +36,32 @@
     </parent>
 
     <artifactId>health-check</artifactId>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <type>pom</type>
+                <version>3.2.3</version>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>6.4.4.Final</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- Spring Boot Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
         <!-- Spring Boot Actuator for health check -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -105,7 +123,6 @@
             <scope>test</scope>
         </dependency>
 
-
     </dependencies>
 
 
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 106a924cb..18f44ef38 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,5 +1,6 @@
 package com.iluwatar.health.check;
 
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executors;
@@ -7,7 +8,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
-import javax.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 0914c3807..5c9bc2dd7 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,11 +1,11 @@
 package com.iluwatar.health.check;
 
+import jakarta.annotation.PostConstruct;
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
-import javax.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 15c14488a..528753ee0 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 64a0a4e93..272cf46b2 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 2508c126d..8eb791438 100644
--- a/health-check/src/test/java/HealthCheckRepositoryTest.java
+++ b/health-check/src/test/java/HealthCheckRepositoryTest.java
@@ -3,8 +3,8 @@ import static org.mockito.Mockito.*;
 
 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;