From 3cb87d7c0c65abcb6b58ec227aa25f2e997db3d0 Mon Sep 17 00:00:00 2001
From: "Jeffrey.Cao" <Jeffrey.Cao@budweiserapac.com>
Date: Thu, 31 Jul 2025 17:26:46 +0800
Subject: [PATCH] * Upgrade AutoLoadCache to support Spring Boot 3.5.x with
 Java 17

---
 autoload-cache-spring-boot-starter/pom.xml    | 21 +++++++--
 .../admin/HTTPBasicAuthorizeAttribute.java    | 16 +++----
 .../AutoloadCacheAutoConfigure.java           |  2 +-
 .../AutoloadCacheProperties.java              |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  3 ++
 .../cache/demo/CacheDemoApplication.java      |  2 +-
 .../cache/demo/test/UserServiceTest.java      |  4 +-
 .../src/test/resources/init_table.sql         |  5 +-
 .../src/test/resources/mybatis/UserMapper.xml | 22 ++++-----
 pom.xml                                       | 46 ++++++++++---------
 10 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100644 autoload-cache-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/autoload-cache-spring-boot-starter/pom.xml b/autoload-cache-spring-boot-starter/pom.xml
index 41e0eac..f43071f 100644
--- a/autoload-cache-spring-boot-starter/pom.xml
+++ b/autoload-cache-spring-boot-starter/pom.xml
@@ -14,13 +14,14 @@
   <description>autoload-cache spring boot starter.</description>
   <properties>
     <skip_maven_deploy>false</skip_maven_deploy>
+    <spring-boot.version>3.5.3</spring-boot.version>
   </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -135,7 +136,7 @@
     <dependency>
       <groupId>org.mybatis.spring.boot</groupId>
       <artifactId>mybatis-spring-boot-starter</artifactId>
-      <version>1.3.0</version>
+      <version>3.0.5</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
@@ -178,6 +179,20 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+       <groupId>org.projectlombok</groupId>
+       <artifactId>lombok</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/admin/HTTPBasicAuthorizeAttribute.java b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/admin/HTTPBasicAuthorizeAttribute.java
index 3d26ffd..ca76f83 100644
--- a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/admin/HTTPBasicAuthorizeAttribute.java
+++ b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/admin/HTTPBasicAuthorizeAttribute.java
@@ -3,14 +3,14 @@
 import java.io.IOException;
 import java.util.Base64;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheAutoConfigure.java b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheAutoConfigure.java
index 23fbeaf..709ee6b 100644
--- a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheAutoConfigure.java
+++ b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheAutoConfigure.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.aop.framework.autoproxy.AbstractAdvisorAutoProxyCreator;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
diff --git a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheProperties.java b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheProperties.java
index 0436c2b..99b7ace 100644
--- a/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheProperties.java
+++ b/autoload-cache-spring-boot-starter/src/main/java/com/jarvis/cache/autoconfigure/AutoloadCacheProperties.java
@@ -1,6 +1,6 @@
 package com.jarvis.cache.autoconfigure;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/autoload-cache-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/autoload-cache-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..f59821b
--- /dev/null
+++ b/autoload-cache-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.jarvis.cache.autoconfigure.AutoloadCacheManageConfiguration
+com.jarvis.cache.autoconfigure.DistributedLockConfiguration
+com.jarvis.cache.autoconfigure.AutoloadCacheAutoConfigure
\ No newline at end of file
diff --git a/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/CacheDemoApplication.java b/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/CacheDemoApplication.java
index ef77fd1..cada592 100644
--- a/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/CacheDemoApplication.java
+++ b/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/CacheDemoApplication.java
@@ -35,7 +35,7 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
                 userMapper.allUsers();
                 
                 UserCondition condition = new UserCondition();
-                PageRequest page =new PageRequest(1, 10);
+                PageRequest page = PageRequest.of(1, 10);
                 condition.setPageable(page);
                 condition.setStatus(1);
                 userMapper.listByCondition(condition);
diff --git a/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/test/UserServiceTest.java b/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/test/UserServiceTest.java
index 8fa5141..cb0d673 100644
--- a/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/test/UserServiceTest.java
+++ b/autoload-cache-spring-boot-starter/src/test/java/com/jarvis/cache/demo/test/UserServiceTest.java
@@ -49,7 +49,7 @@ public void test1Add() throws Exception {
         userService.doLogin("tmp2", "aaaa3");
 
         UserCondition condition = new UserCondition();
-        Pageable pageable = new PageRequest(0, 10);
+        Pageable pageable = PageRequest.of(0, 10);
         condition.setPageable(pageable);
 
         List<UserDO> list = userService.listByCondition(condition);
@@ -84,7 +84,7 @@ public void testMagic() throws Exception {
         userService.getUserById(1L);
 
         UserCondition condition = new UserCondition();
-        Pageable pageable = new PageRequest(0, 5);
+        Pageable pageable = PageRequest.of(0, 5);
         condition.setPageable(pageable);
 
         List<UserDO> list = userService.listByCondition(condition);
diff --git a/autoload-cache-spring-boot-starter/src/test/resources/init_table.sql b/autoload-cache-spring-boot-starter/src/test/resources/init_table.sql
index 0fc0da7..a917f69 100644
--- a/autoload-cache-spring-boot-starter/src/test/resources/init_table.sql
+++ b/autoload-cache-spring-boot-starter/src/test/resources/init_table.sql
@@ -1 +1,4 @@
-create table if not exists user(id int not null primary key auto_increment, name varchar(100), password varchar(10), status int);
\ No newline at end of file
+create table if not exists `user`(id int not null primary key auto_increment,
+                                name varchar(100),
+                                password varchar(10),
+                                status int);
\ No newline at end of file
diff --git a/autoload-cache-spring-boot-starter/src/test/resources/mybatis/UserMapper.xml b/autoload-cache-spring-boot-starter/src/test/resources/mybatis/UserMapper.xml
index 6f379b5..b0b7d86 100644
--- a/autoload-cache-spring-boot-starter/src/test/resources/mybatis/UserMapper.xml
+++ b/autoload-cache-spring-boot-starter/src/test/resources/mybatis/UserMapper.xml
@@ -16,20 +16,20 @@
   <select id="getUserById" parameterType="java.lang.Long" resultMap="UserResultMap">
     select
     <include refid="columns" />
-    from user
+    from `user`
     where id = #{id}
   </select>
   
   <select id="allUsers" resultMap="UserResultMap">
      select
      <include refid="columns" />
-     from user
+     from `user`
   </select>
   
   <select id="listByCondition" parameterType="com.jarvis.cache.demo.condition.UserCondition" resultMap="UserResultMap">
     select
     <include refid="columns" />
-    from user
+    from `user`
     <where>
       <if test="id != null"> and id = #{id}</if>
       <if test="name != null and name != ''"> and name like concat('%', #{name}, '%') </if>
@@ -41,12 +41,12 @@
   </select>
   
   <select id="getUserIdByName" parameterType="java.lang.String" resultType="java.lang.Long">
-    select id from user
+    select id from `user`
     where name = #{name}
   </select>
   
   <select id="listIdsByCondition" parameterType="com.jarvis.cache.demo.condition.UserCondition" resultType="java.lang.Long">
-    select id  from user
+    select id  from `user`
     <where>
       <if test="id != null"> and id = #{id}</if>
       <if test="name != null and name != ''"> and name like concat('%', #{name}, '%') </if>
@@ -60,7 +60,7 @@
   <select id="listByIds" resultMap="UserResultMap">
     select
     <include refid="columns" />
-    from user
+    from `user`
     where
     <foreach collection="ids"  item="id" separator=" or ">
       id = #{id}
@@ -70,7 +70,7 @@
   <select id="listByIds2" resultMap="UserResultMap">
     select
     <include refid="columns" />
-    from user
+    from `user`
     where
     <foreach collection="ids"  item="id" separator=" or ">
       id = #{id}
@@ -78,12 +78,12 @@
   </select>
 
   <insert id="addUser" parameterType="com.jarvis.cache.demo.entity.UserDO" useGeneratedKeys="true" keyProperty="id">
-    insert into user(name, password, status) 
+    insert into `user`(name, password, status)
     values(#{name}, #{password}, 1)
   </insert>
   
   <update id="updateUser" parameterType="com.jarvis.cache.demo.entity.UserDO">
-    update user 
+    update `user`
     <set>
       <if test="password != null and password != ''"> password = #{password}, </if>
       <if test="status != null"> status = #{status},</if>
@@ -92,11 +92,11 @@
   </update>
   
   <update id="deleteUserById" parameterType="java.lang.Long">
-    update user set status = 0 where id = #{id}
+    update `user` set status = 0 where id = #{id}
   </update>
 
   <update id="deleteUserByIds">
-    update user set status = 0 where
+    update `user` set status = 0 where
     <foreach collection="ids"  item="id" separator=" or ">
       id = #{id}
     </foreach>
diff --git a/pom.xml b/pom.xml
index a73094f..6e11f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,14 +13,14 @@
   <description>Use AOP and Annotation manage cache.</description>
   <url>https://github.com/qiujiayu/AutoLoadCache</url>
   <properties>
-    <revision>7.2.1</revision>
-    <java_source_version>1.8</java_source_version>
-    <java_target_version>1.8</java_target_version>
+    <revision>8.0.0</revision>
+    <java_source_version>17</java_source_version>
+    <java_target_version>17</java_target_version>
     <file_encoding>UTF-8</file_encoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>5.2.21.RELEASE</spring.version>
-    <maven_deploy_version>2.8.2</maven_deploy_version>
-    <maven_compiler_version>3.8.1</maven_compiler_version>
+    <spring-framework.version>6.2.8</spring-framework.version>
+    <maven_deploy_version>3.1.3</maven_deploy_version>
+    <maven_compiler_version>3.13.0</maven_compiler_version>
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
   <modules>
@@ -56,20 +56,27 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>${spring-framework.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.23</version>
+        <version>2.0.17</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.21</version>
+        <version>1.26.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-pool2</artifactId>
-        <version>2.4.2</version>
+        <version>2.12.1</version>
       </dependency>
       <dependency>
         <groupId>com.alibaba</groupId>
@@ -79,17 +86,12 @@
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
-        <version>1.8.10</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-expression</artifactId>
-        <version>${spring.version}</version>
+        <version>1.9.24</version>
       </dependency>
       <dependency>
         <groupId>io.lettuce</groupId>
         <artifactId>lettuce-core</artifactId>
-        <version>5.3.1.RELEASE</version>
+        <version>6.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>redis.clients</groupId>
@@ -119,7 +121,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.14.0-rc1</version>
+        <version>2.19.1</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
@@ -149,12 +151,12 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.10</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
-        <version>3.16.3</version>
+        <version>3.24.3</version>
       </dependency>
       <dependency>
         <groupId>com.googlecode.combinatoricslib</groupId>
@@ -164,7 +166,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13.1</version>
+        <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -208,7 +210,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.8.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -216,7 +218,7 @@
               <goal>jar</goal>
             </goals>
             <configuration>
-              <source>8</source>
+              <source>17</source>
             </configuration>
           </execution>
         </executions>