From 2eb5c1658d0ee6784d89ec0de5065c907bcba07e Mon Sep 17 00:00:00 2001
From: junhkang <junhkang91@gmail.com>
Date: Tue, 26 Mar 2024 09:33:43 +0900
Subject: [PATCH 1/9] 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 <junhkang91@gmail.com>
Date: Tue, 26 Mar 2024 11:11:56 +0900
Subject: [PATCH 2/9] 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 @@
     </parent>
 
     <artifactId>single-table-inheritance</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>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

From f1ed6ee9a3c9a6e389423baed292c02ee8412c43 Mon Sep 17 00:00:00 2001
From: junhkang <junhkang91@gmail.com>
Date: Wed, 27 Mar 2024 09:52:39 +0900
Subject: [PATCH 3/9] 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 @@
     </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 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 <junhkang91@gmail.com>
Date: Wed, 27 Mar 2024 10:13:29 +0900
Subject: [PATCH 4/9] 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 <junhkang91@gmail.com>
Date: Wed, 27 Mar 2024 10:28:14 +0900
Subject: [PATCH 5/9] 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 <junhkang91@gmail.com>
Date: Wed, 27 Mar 2024 10:40:31 +0900
Subject: [PATCH 6/9] 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;

From 6c3bfdf5ceba7858cb195aee896a3a494f148e36 Mon Sep 17 00:00:00 2001
From: junhkang <junhkang91@gmail.com>
Date: Thu, 28 Mar 2024 09:45:59 +0900
Subject: [PATCH 7/9] Updated the maven imports of layers pattern for
 SpringBoot 3.2.4

---
 layers/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/layers/pom.xml b/layers/pom.xml
index 425b8eaedc6f..d5abd9d600c0 100644
--- a/layers/pom.xml
+++ b/layers/pom.xml
@@ -34,6 +34,24 @@
     <artifactId>layers</artifactId>
     <name>layers</name>
     <description>layers</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <type>pom</type>
+                <version>3.2.4</version>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>6.4.4.Final</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

From 1d69e22afb539d7eb5eed0c719486499bdc46dbc Mon Sep 17 00:00:00 2001
From: junhkang <junhkang91@gmail.com>
Date: Thu, 28 Mar 2024 10:36:32 +0900
Subject: [PATCH 8/9] remove unused maven import

---
 layers/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/layers/pom.xml b/layers/pom.xml
index d5abd9d600c0..6a769e08cc26 100644
--- a/layers/pom.xml
+++ b/layers/pom.xml
@@ -44,11 +44,6 @@
                 <version>3.2.4</version>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>6.4.4.Final</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

From bd14e6cd41ee266e2266b44e79ad3ebeda425996 Mon Sep 17 00:00:00 2001
From: junhkang <junhkang91@gmail.com>
Date: Thu, 28 Mar 2024 10:38:46 +0900
Subject: [PATCH 9/9] Updated the maven imports of page-controller pattern for
 SpringBoot 3.2.4

- add page-controller module on parent pom.xml
- add artifact information on page-controller pom.xml
- add Springboot3, proper test dependencies on page-controller pom.xml
---
 page-controller/pom.xml | 21 ++++++++++++++++++++-
 pom.xml                 |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/page-controller/pom.xml b/page-controller/pom.xml
index 1e75f7f86221..64e3c8a3a46e 100644
--- a/page-controller/pom.xml
+++ b/page-controller/pom.xml
@@ -29,12 +29,26 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>page-controller</artifactId>
     <parent>
       <groupId>com.iluwatar</groupId>
       <artifactId>java-design-patterns</artifactId>
       <version>1.26.0-SNAPSHOT</version>
     </parent>
+    <artifactId>page-controller</artifactId>
+    <name>page-controller</name>
+    <description>page-controller</description>
+    <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <type>pom</type>
+        <version>3.2.4</version>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -62,6 +76,11 @@
         <artifactId>mockito-core</artifactId>
         <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
diff --git a/pom.xml b/pom.xml
index 58736e47cd75..6cfb41cd4730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
     <module>abstract-document</module>
     <module>aggregator-microservices</module>
     <module>promise</module>
+    <module>page-controller</module>
     <module>page-object</module>
     <module>event-asynchronous</module>
     <module>event-queue</module>