From cbafea02949a77167a657333334b1d58f8c015dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sat, 10 Aug 2024 16:27:44 +0800
Subject: [PATCH 001/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 87d4a9d3..d3733ce0 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -10,9 +10,9 @@ name: Maven Build
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ 'dev-1.x' ]
   pull_request:
-    branches: [ "main" , "release" ]
+    branches: [ 'release-1.x' ]
 
 jobs:
   build:

From 5cfefa0bafd31a92222b8d61a71f55c48e32260f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sat, 10 Aug 2024 16:27:46 +0800
Subject: [PATCH 002/157] Update maven-publish.yml

---
 .github/workflows/maven-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 79384364..819d3014 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -10,11 +10,11 @@ name: Maven Publish
 
 on:
   push:
-    branches: [ 'release' ]
+    branches: [ 'release-1.x' ]
   workflow_dispatch:
     inputs:
       revision:
-        description: 'The version to release'
+        description: 'The version to pulish'
         required: true
         default: '0.0.1-SNAPSHOT'
 

From 156ac127c6798249b5a9dfe5b5bc2e44d36b5fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sat, 10 Aug 2024 16:28:35 +0800
Subject: [PATCH 003/157] Update maven-publish.yml

---
 .github/workflows/maven-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 819d3014..241727bb 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
     inputs:
       revision:
-        description: 'The version to pulish'
+        description: 'The version to publish'
         required: true
         default: '0.0.1-SNAPSHOT'
 

From a07061e6e69f245b82110fda584c61d719ad47c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sat, 10 Aug 2024 16:44:36 +0800
Subject: [PATCH 004/157] Remove the dependency
 'io.github.microsphere-projects:microsphere-java-enterprise-dependencies'

---
 microsphere-spring-parent/pom.xml                        | 9 ---------
 microsphere-spring-web/pom.xml                           | 6 ------
 .../webmvc/metadata/WebEndpointMappingRegistrar.java     | 5 +++--
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 98fcb339..9a5c0c78 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,7 +20,6 @@
 
     <properties>
         <microsphere-java.version>0.0.6</microsphere-java.version>
-        <microsphere-java-enterprise.version>0.0.3</microsphere-java-enterprise.version>
         <spring-boot.version>2.7.18</spring-boot.version>
         <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
         <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
@@ -48,14 +47,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.github.microsphere-projects</groupId>
-                <artifactId>microsphere-java-enterprise-dependencies</artifactId>
-                <version>${microsphere-java-enterprise.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.xerial</groupId>
                 <artifactId>sqlite-jdbc</artifactId>
diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index 18033d61..45d934ce 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -27,12 +27,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- MicroSphere Servlet -->
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-servlet</artifactId>
-        </dependency>
-
         <!-- Servlet API -->
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
index 6571a6f8..0bcfdc07 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
@@ -23,6 +23,7 @@
 import io.microsphere.spring.web.metadata.ServletRegistrationWebEndpointMappingFactory;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.web.metadata.WebEndpointMappingRegistry;
+import io.microsphere.util.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
@@ -42,7 +43,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.microsphere.enterprise.servlet.enumeration.ServletVersion.SERVLET_3_0;
 import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
 
 /**
@@ -92,7 +92,8 @@ private Collection<WebEndpointMapping> collectWebEndpointMappings() {
 
         ServletContext servletContext = context.getServletContext();
 
-        if (SERVLET_3_0.le(servletContext)) { // Servlet 3.0+
+        Version servletVersion = Version.of(servletContext.getMajorVersion(), servletContext.getMinorVersion());
+        if (Version.of(3).le(servletVersion)) { // Servlet 3.0+
             collectFromServletContext(servletContext, context, webEndpointMappings);
         }
 

From 7c6d78f06a01ba019fa84eddf8756927905c3817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sun, 11 Aug 2024 16:00:49 +0800
Subject: [PATCH 005/157] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 365b415a..e6e58770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.0.3-SNAPSHOT</revision>
+        <revision>1.0.0-SNAPSHOT</revision>
     </properties>
 
     <modules>

From 11faa2f2c8e94d1aec4330bda6fa4ae70301f112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sun, 11 Aug 2024 16:01:51 +0800
Subject: [PATCH 006/157] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e6e58770..365b415a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>1.0.0-SNAPSHOT</revision>
+        <revision>0.0.3-SNAPSHOT</revision>
     </properties>
 
     <modules>

From 5fd51b86df6976b0ef005d5226a1f7c0016df217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sun, 11 Aug 2024 16:02:08 +0800
Subject: [PATCH 007/157] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 365b415a..d2530956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.0.3-SNAPSHOT</revision>
+        <revision>0.0.3</revision>
     </properties>
 
     <modules>

From ca21ad26a82310c00df9ea3397e46521f6c5021c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Sun, 11 Aug 2024 16:08:52 +0800
Subject: [PATCH 008/157] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2530956..48e14e62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.0.3</revision>
+        <revision>0.0.4-SNAPSHOT</revision>
     </properties>
 
     <modules>

From 2989d43c54fd6969480ee3d5ea33d24092867d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 14:52:02 +0800
Subject: [PATCH 009/157] Update

---
 .github/workflows/maven-build.yml             |  8 +++--
 microsphere-spring-parent/pom.xml             | 35 +++++++++++++++++++
 ...RegistrationWebEndpointMappingFactory.java |  4 +--
 ...RegistrationWebEndpointMappingFactory.java |  4 +--
 ...RegistrationWebEndpointMappingFactory.java |  4 +--
 .../web/metadata/WebEndpointMapping.java      | 32 ++++++++---------
 .../metadata/WebEndpointMappingFactory.java   |  8 ++---
 pom.xml                                       |  2 +-
 8 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index e7ba7acd..7a0215a7 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -19,8 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-3.0' , 'spring-boot-3.1' , 'spring-boot-3.2' , 'spring-boot-3.3' ]
+        java: [ '8', '11' , '17' , '21' ]
+        maven-profile-spring-boot: [ 'spring-boot-1.0' , 'spring-boot-1.1' , 'spring-boot-1.2' , 'spring-boot-1.3' ,
+                                     'spring-boot-1.4' , 'spring-boot-1.5' , 'spring-boot-2.0' , 'spring-boot-2.1' ,
+                                     'spring-boot-2.2' , 'spring-boot-2.3' , 'spring-boot-2.4' , 'spring-boot-2.5' ,
+                                     'spring-boot-2.6' , 'spring-boot-2.7' , 'spring-boot-3.0' , 'spring-boot-3.1' ,
+                                     'spring-boot-3.2' , 'spring-boot-3.3' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 9a5c0c78..428a99cb 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -76,6 +76,41 @@
     </dependencyManagement>
 
     <profiles>
+        <profile>
+            <id>spring-boot-1.0</id>
+            <properties>
+                <spring-boot.version>1.0.2.RELEASE</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-1.1</id>
+            <properties>
+                <spring-boot.version>1.1.12.RELEASE</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-1.2</id>
+            <properties>
+                <spring-boot.version>1.2.8.RELEASE</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-1.3</id>
+            <properties>
+                <spring-boot.version>1.3.8.RELEASE</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-1.4</id>
+            <properties>
+                <spring-boot.version>1.4.7.RELEASE</spring-boot.version>
+            </properties>
+        </profile>
+
         <profile>
             <id>spring-boot-1.5</id>
             <properties>
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
index 1db323c5..1c7fa760 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import jakarta.servlet.FilterRegistration;
-import jakarta.servlet.ServletContext;
+import javax.servlet.FilterRegistration;
+import javax.servlet.ServletContext;
 import java.util.Collection;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
index 3851ba4e..a634b906 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
@@ -18,8 +18,8 @@
 
 import org.springframework.lang.NonNull;
 
-import jakarta.servlet.Registration;
-import jakarta.servlet.ServletContext;
+import javax.servlet.Registration;
+import javax.servlet.ServletContext;
 import java.util.Collection;
 
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.SERVLET;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
index 3088924b..efee856c 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletRegistration;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
 import java.util.Collection;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
index 066e1fcb..cefaf0cb 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
@@ -41,8 +41,8 @@
 /**
  * The meta-data class for Web Endpoint Mapping that could be one of these endpoints:
  * <ul>
- *     <li>{@link jakarta.servlet.Servlet Servlet}</li>
- *     <li>{@link jakarta.servlet.Filter Servlet's Filter}</li>
+ *     <li>{@link javax.servlet.Servlet Servlet}</li>
+ *     <li>{@link javax.servlet.Filter Servlet's Filter}</li>
  *     <li>Spring WebMVC {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}</li>
  *     <li>Spring WebFlux {@link org.springframework.web.reactive.DispatcherHandler DispatcherHandler}</li>
  *     <li>Customized</li>
@@ -51,8 +51,8 @@
  * The method {@link #getKind()} can be used to identify the kind of endpoints, and the method
  * {@link #getEndpoint()} is an abstract presentation of actual endpoint that may be :
  * <ul>
- *     <li>{@link jakarta.servlet.ServletRegistration#getName() the name of Servlet}</li>
- *     <li>{@link jakarta.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
+ *     <li>{@link javax.servlet.ServletRegistration#getName() the name of Servlet}</li>
+ *     <li>{@link javax.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
  *     <li>the any handler of Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}:
  *      <ul>
  *          <li>The {@link String} presenting the name of Handler bean</li>
@@ -72,17 +72,17 @@
  * <p>
  * The method {@link #getSource()} can trace the source of {@link WebEndpointMapping} if present, it could be :
  * <ul>
- *     <li>{@link jakarta.servlet.ServletContext ServletContext}</li>
+ *     <li>{@link javax.servlet.ServletContext ServletContext}</li>
  *     <li>Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}</li>
  *     <li>Spring WebFlux {@link org.springframework.web.reactive.HandlerMapping}</li>
  * </ul>, or it's {@link #NON_SOURCE non-source}
  *
  * @param <E> the type of endpoint
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @see jakarta.servlet.ServletRegistration
- * @see jakarta.servlet.FilterRegistration
- * @see jakarta.servlet.annotation.WebServlet
- * @see jakarta.servlet.annotation.WebFilter
+ * @see javax.servlet.ServletRegistration
+ * @see javax.servlet.FilterRegistration
+ * @see javax.servlet.annotation.WebServlet
+ * @see javax.servlet.annotation.WebFilter
  * @see org.springframework.web.servlet.DispatcherServlet
  * @see org.springframework.web.reactive.DispatcherHandler
  * @see org.springframework.web.servlet.HandlerMapping
@@ -134,12 +134,12 @@ public class WebEndpointMapping<E> {
     public enum Kind {
 
         /**
-         * {@link jakarta.servlet.Servlet}
+         * {@link javax.servlet.Servlet}
          */
         SERVLET,
 
         /**
-         * {@link jakarta.servlet.Filter}
+         * {@link javax.servlet.Filter}
          */
         FILTER,
 
@@ -317,8 +317,8 @@ private WebEndpointMapping() {
     /**
      * The kind of endpoint:
      * <ul>
-     *     <li>{@link jakarta.servlet.Servlet Servlet}</li>
-     *     <li>{@link jakarta.servlet.Filter Servlet's Filter}</li>
+     *     <li>{@link javax.servlet.Servlet Servlet}</li>
+     *     <li>{@link javax.servlet.Filter Servlet's Filter}</li>
      *     <li>Spring WebMVC {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}</li>
      *     <li>Spring WebFlux {@link org.springframework.web.reactive.DispatcherHandler DispatcherHandler}</li>
      *     <li>Customized</li>
@@ -334,8 +334,8 @@ public Kind getKind() {
     /**
      * The abstract presentation of actual endpoint that may be :
      * <ul>
-     *     <li>{@link jakarta.servlet.ServletRegistration#getName() the name of Servlet}</li>
-     *     <li>{@link jakarta.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
+     *     <li>{@link javax.servlet.ServletRegistration#getName() the name of Servlet}</li>
+     *     <li>{@link javax.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
      *     <li>the any handler of Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}:
      *      <ul>
      *          <li>The {@link String} presenting the name of Handler bean</li>
@@ -372,7 +372,7 @@ public int getId() {
     /**
      * The source of {@link WebEndpointMapping} if present, it could be :
      * <ul>
-     *     <li>{@link jakarta.servlet.ServletContext ServletContext}</li>
+     *     <li>{@link javax.servlet.ServletContext ServletContext}</li>
      *     <li>Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}</li>
      *     <li>Spring WebFlux {@link org.springframework.web.reactive.HandlerMapping}</li>
      * </ul>, or it's {@link #NON_SOURCE non-source}
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
index 9ee2bc4c..f6ebbde6 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
@@ -36,8 +36,8 @@ public interface WebEndpointMappingFactory<E> {
      *
      * @param endpoint could be one of these :
      *                 <ul>
-     *                 <li>{@link jakarta.servlet.ServletRegistration}</li>
-     *                 <li>{@link jakarta.servlet.FilterRegistration}</li>
+     *                 <li>{@link javax.servlet.ServletRegistration}</li>
+     *                 <li>{@link javax.servlet.FilterRegistration}</li>
      *                 <li>{@link org.springframework.web.servlet.mvc.method.RequestMappingInfo}</li>
      *                 <li>{@link org.springframework.web.reactive.result.method.RequestMappingInfo}</li>
      *                 </ul>
@@ -52,8 +52,8 @@ default boolean supports(E endpoint) {
      *
      * @param endpoint could be one of these :
      *                 <ul>
-     *                 <li>{@link jakarta.servlet.ServletRegistration}</li>
-     *                 <li>{@link jakarta.servlet.FilterRegistration}</li>
+     *                 <li>{@link javax.servlet.ServletRegistration}</li>
+     *                 <li>{@link javax.servlet.FilterRegistration}</li>
      *                 <li>{@link org.springframework.web.servlet.mvc.method.RequestMappingInfo}</li>
      *                 <li>{@link org.springframework.web.reactive.result.method.RequestMappingInfo}</li>
      *                 </ul>
diff --git a/pom.xml b/pom.xml
index 365b415a..48e14e62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.0.3-SNAPSHOT</revision>
+        <revision>0.0.4-SNAPSHOT</revision>
     </properties>
 
     <modules>

From a8330da2fb54e1cc8c20a7d52675a4d9a55042e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 14:55:35 +0800
Subject: [PATCH 010/157] Update Build

---
 .github/workflows/maven-build.yml | 3 +--
 microsphere-spring-parent/pom.xml | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 7a0215a7..07ec4835 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -23,8 +23,7 @@ jobs:
         maven-profile-spring-boot: [ 'spring-boot-1.0' , 'spring-boot-1.1' , 'spring-boot-1.2' , 'spring-boot-1.3' ,
                                      'spring-boot-1.4' , 'spring-boot-1.5' , 'spring-boot-2.0' , 'spring-boot-2.1' ,
                                      'spring-boot-2.2' , 'spring-boot-2.3' , 'spring-boot-2.4' , 'spring-boot-2.5' ,
-                                     'spring-boot-2.6' , 'spring-boot-2.7' , 'spring-boot-3.0' , 'spring-boot-3.1' ,
-                                     'spring-boot-3.2' , 'spring-boot-3.3' ]
+                                     'spring-boot-2.6' , 'spring-boot-2.7' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 428a99cb..92df4140 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,7 +20,6 @@
 
     <properties>
         <microsphere-java.version>0.0.6</microsphere-java.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
         <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
         <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
         <mariadb4j.version>2.5.3</mariadb4j.version>
@@ -169,6 +168,9 @@
 
         <profile>
             <id>spring-boot-2.7</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <spring-boot.version>2.7.18</spring-boot.version>
             </properties>

From b682985596afb5da68050f1e1eb858135e0d5883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:25:09 +0800
Subject: [PATCH 011/157] Update pom.xml

---
 microsphere-spring-parent/pom.xml | 88 +++++--------------------------
 1 file changed, 12 insertions(+), 76 deletions(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 92df4140..7d970db4 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,22 +20,12 @@
 
     <properties>
         <microsphere-java.version>0.0.6</microsphere-java.version>
-        <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
-        <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
-        <mariadb4j.version>2.5.3</mariadb4j.version>
-        <embedded-redis.version>0.6</embedded-redis.version>
+        <spring-boot.version>2.7.18</spring-boot.version>
+        <lettuce.version>6.1.10.RELEASE</lettuce.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- Spring Boot Dependencies -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
 
             <!-- Microsphere Dependencies -->
             <dependency>
@@ -46,77 +36,26 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Spring Boot Dependencies -->
             <dependency>
-                <groupId>org.xerial</groupId>
-                <artifactId>sqlite-jdbc</artifactId>
-                <version>${sqlite-jdbc.version}</version>
-            </dependency>
-
-            <!-- MariaDB Connector/J-->
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>${mariadb-java-client.version}</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
-            <!-- MariaDB4j -->
+            <!-- Lettuce -->
             <dependency>
-                <groupId>ch.vorburger.mariaDB4j</groupId>
-                <artifactId>mariaDB4j</artifactId>
-                <version>${mariadb4j.version}</version>
+                <groupId>io.lettuce</groupId>
+                <artifactId>lettuce-core</artifactId>
+                <version>${lettuce.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.github.kstyrc</groupId>
-                <artifactId>embedded-redis</artifactId>
-                <version>${embedded-redis.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <profiles>
-        <profile>
-            <id>spring-boot-1.0</id>
-            <properties>
-                <spring-boot.version>1.0.2.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-1.1</id>
-            <properties>
-                <spring-boot.version>1.1.12.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-1.2</id>
-            <properties>
-                <spring-boot.version>1.2.8.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-1.3</id>
-            <properties>
-                <spring-boot.version>1.3.8.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-1.4</id>
-            <properties>
-                <spring-boot.version>1.4.7.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-1.5</id>
-            <properties>
-                <spring-boot.version>1.5.22.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
-
         <profile>
             <id>spring-boot-2.0</id>
             <properties>
@@ -168,9 +107,6 @@
 
         <profile>
             <id>spring-boot-2.7</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <spring-boot.version>2.7.18</spring-boot.version>
             </properties>

From b6c1ba95ef7554fbf4fa08f8ac5e802bbae83574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:25:11 +0800
Subject: [PATCH 012/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 66 +++++++++++++++++----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 3c7937b8..a4b22664 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -21,6 +21,12 @@
     <properties>
         <zookeeper.version>3.8.1</zookeeper.version>
         <wix-embedded-mysql.version>4.6.2</wix-embedded-mysql.version>
+        <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
+        <mysql-connection-j.version>8.0.33</mysql-connection-j.version>
+        <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
+        <mariadb4j.version>2.5.3</mariadb4j.version>
+        <embedded-redis.version>0.6</embedded-redis.version>
+        <xmlunit.version>2.9.1</xmlunit.version>
     </properties>
 
     <dependencies>
@@ -71,6 +77,35 @@
         <dependency>
             <groupId>com.github.kstyrc</groupId>
             <artifactId>embedded-redis</artifactId>
+            <version>${embedded-redis.version}</version>
+        </dependency>
+
+        <!-- SQLLite -->
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>${sqlite-jdbc.version}</version>
+        </dependency>
+
+        <!-- MySQL JDBC Driver -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql-connection-j.version}</version>
+        </dependency>
+
+        <!-- MariaDB Connector/J-->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb-java-client.version}</version>
+        </dependency>
+
+        <!-- MariaDB4j -->
+        <dependency>
+            <groupId>ch.vorburger.mariaDB4j</groupId>
+            <artifactId>mariaDB4j</artifactId>
+            <version>${mariadb4j.version}</version>
         </dependency>
 
         <!-- Spring Redis -->
@@ -98,37 +133,6 @@
             <artifactId>spring-kafka-test</artifactId>
         </dependency>
 
-        <!-- SQLite -->
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-        </dependency>
-
-        <!-- Embedded MySQL -->
-        <dependency>
-            <groupId>com.wix</groupId>
-            <artifactId>wix-embedded-mysql</artifactId>
-            <version>${wix-embedded-mysql.version}</version>
-        </dependency>
-
-        <!-- MariaDB Connector/J-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
-
-        <!-- MariaDB4j -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-        </dependency>
-
-        <!-- MySQL JDBC Driver -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>

From 8554d7fb389ac2485c31a4ed7fb4b3094a26fd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:25:13 +0800
Subject: [PATCH 013/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 07ec4835..14a30870 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,10 +20,8 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-1.0' , 'spring-boot-1.1' , 'spring-boot-1.2' , 'spring-boot-1.3' ,
-                                     'spring-boot-1.4' , 'spring-boot-1.5' , 'spring-boot-2.0' , 'spring-boot-2.1' ,
-                                     'spring-boot-2.2' , 'spring-boot-2.3' , 'spring-boot-2.4' , 'spring-boot-2.5' ,
-                                     'spring-boot-2.6' , 'spring-boot-2.7' ]
+        maven-profile-spring-boot: [ 'spring-boot-2.0' , 'spring-boot-2.1' , 'spring-boot-2.2' , 'spring-boot-2.3' ,
+                                     'spring-boot-2.4' , 'spring-boot-2.5' , 'spring-boot-2.6' , 'spring-boot-2.7' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From 5dfca09c7eb7dbd0f56e342ccad5c8c6b2b69e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:26:22 +0800
Subject: [PATCH 014/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index a4b22664..011bb4c2 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-assertj</artifactId>
+            <version>${xmlunit.version}</version>
         </dependency>
 
         <!-- Spring Framework -->

From 656e34f2a1564e8cf6fb8531fb4cc16513a9138e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:28:22 +0800
Subject: [PATCH 015/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 011bb4c2..846eed34 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -147,4 +147,20 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>spring-boot-2.0</id>
+            <properties>
+                <spring-boot.version>2.7.18</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-2.1</id>
+            <properties>
+                <spring-boot.version>2.7.18</spring-boot.version>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file

From 61ca1b71da9cb136e10d443530972e2fb79e2d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:33:42 +0800
Subject: [PATCH 016/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 846eed34..9d54f88d 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -20,7 +20,6 @@
 
     <properties>
         <zookeeper.version>3.8.1</zookeeper.version>
-        <wix-embedded-mysql.version>4.6.2</wix-embedded-mysql.version>
         <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
         <mysql-connection-j.version>8.0.33</mysql-connection-j.version>
         <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
@@ -140,11 +139,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
     </dependencies>
 
     <profiles>

From 0b636958212f4598e77c27207bda9d7db7485730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:39:31 +0800
Subject: [PATCH 017/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 9d54f88d..86fd5379 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -155,6 +155,27 @@
                 <spring-boot.version>2.7.18</spring-boot.version>
             </properties>
         </profile>
+
+        <profile>
+            <id>spring-boot-2.2</id>
+            <properties>
+                <spring-boot.version>2.7.18</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-2.3</id>
+            <properties>
+                <spring-boot.version>2.7.18</spring-boot.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-boot-2.4</id>
+            <properties>
+                <spring-boot.version>2.7.18</spring-boot.version>
+            </properties>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file

From 731ee5bcb7f105e0f6d115cd57ba77d2f32c1450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:56:33 +0800
Subject: [PATCH 018/157] Update

---
 .github/workflows/maven-build.yml |  6 ++---
 microsphere-spring-test/pom.xml   | 37 -------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 14a30870..b875eedf 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-2.0' , 'spring-boot-2.1' , 'spring-boot-2.2' , 'spring-boot-2.3' ,
-                                     'spring-boot-2.4' , 'spring-boot-2.5' , 'spring-boot-2.6' , 'spring-boot-2.7' ]
+        # maven-profile-spring-boot: [ 'spring-boot-2.0' , 'spring-boot-2.1' , 'spring-boot-2.2' , 'spring-boot-2.3' ,
+        #                             'spring-boot-2.4' , 'spring-boot-2.5' , 'spring-boot-2.6' , 'spring-boot-2.7' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -40,5 +40,5 @@ jobs:
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
           -DargLine="${{ matrix.java >= 16 && '--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED' || '' }}"
-          -P${{ matrix.maven-profile-spring-boot }}
+          # -P${{ matrix.maven-profile-spring-boot }}
           test
\ No newline at end of file
diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 86fd5379..9f45266b 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -141,41 +141,4 @@
 
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>spring-boot-2.0</id>
-            <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-2.1</id>
-            <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-2.2</id>
-            <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-2.3</id>
-            <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-boot-2.4</id>
-            <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file

From 7058dc6a6931d6a0d868654bacd4d167acf9620a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5=EF=BC=88mercyblitz=EF=BC=89?=
 <mercyblitz@gmail.com>
Date: Thu, 15 Aug 2024 16:57:29 +0800
Subject: [PATCH 019/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index b875eedf..50d61b60 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,8 +20,7 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        # maven-profile-spring-boot: [ 'spring-boot-2.0' , 'spring-boot-2.1' , 'spring-boot-2.2' , 'spring-boot-2.3' ,
-        #                             'spring-boot-2.4' , 'spring-boot-2.5' , 'spring-boot-2.6' , 'spring-boot-2.7' ]
+        maven-profile-spring-boot: [ 'spring-boot-2.7' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -40,5 +39,5 @@ jobs:
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
           -DargLine="${{ matrix.java >= 16 && '--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED' || '' }}"
-          # -P${{ matrix.maven-profile-spring-boot }}
+          -P${{ matrix.maven-profile-spring-boot }}
           test
\ No newline at end of file

From 5c3b7c4018dc870de201dde4cbb322c83034782e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:13:29 +0800
Subject: [PATCH 020/157] Update pom.xml

---
 microsphere-spring-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index f031e2d7..51d8fc61 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -19,7 +19,7 @@
     <description>Microsphere Spring Parent</description>
 
     <properties>
-        <microsphere-java.version>0.0.6</microsphere-java.version>
+        <microsphere-java.version>0.0.7</microsphere-java.version>
         <spring-boot.version>2.7.18</spring-boot.version>
         <lettuce.version>6.1.10.RELEASE</lettuce.version>
     </properties>

From 926c450899f96048f4309529157b17645a234ef1 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:24 +0800
Subject: [PATCH 021/157] Update AutowireCandidateResolvingListener.java

---
 .../AutowireCandidateResolvingListener.java     | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
index 7b7119f6..e8c87a45 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
@@ -37,7 +37,6 @@
  * <ul>
  *     <li>{@link AutowireCandidateResolver#getSuggestedValue(DependencyDescriptor) resolving suggested value}</li>
  *     <li>{@link AutowireCandidateResolver#getLazyResolutionProxyIfNecessary(DependencyDescriptor, String) resolving lazy proxy}</li>
- *     <li>{@link AutowireCandidateResolver#getLazyResolutionProxyClass(DependencyDescriptor, String) resolving lazy proxy class}</li>
  * </ul>
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
@@ -63,8 +62,8 @@ static List<AutowireCandidateResolvingListener> loadListeners(@Nullable BeanFact
         // Add all Spring SPI with extension
         listeners.addAll(loadFactories(beanFactory, AutowireCandidateResolvingListener.class));
         // Add all Spring Beans if BeanFactory is available
-        if (beanFactory instanceof ListableBeanFactory lbf) {
-            listeners.addAll(getSortedBeans(lbf, AutowireCandidateResolvingListener.class));
+        if (beanFactory instanceof ListableBeanFactory) {
+            listeners.addAll(getSortedBeans((ListableBeanFactory) beanFactory, AutowireCandidateResolvingListener.class));
         }
         // Sort
         sort(listeners);
@@ -90,16 +89,4 @@ default void suggestedValueResolved(DependencyDescriptor descriptor, @Nullable O
      */
     default void lazyProxyResolved(DependencyDescriptor descriptor, @Nullable String beanName, @Nullable Object proxy) {
     }
-
-    /**
-     * The event raised after {@link AutowireCandidateResolver#getLazyResolutionProxyClass(DependencyDescriptor, String)}
-     * called
-     *
-     * @param descriptor the descriptor for the target method parameter or field
-     * @param beanName   the name of the bean that contains the injection point
-     * @param proxyClass the lazy resolution proxy class for the dependency target
-     * @see AutowireCandidateResolver#getLazyResolutionProxyClass(DependencyDescriptor, String)
-     */
-    default void lazyProxyClassResolved(DependencyDescriptor descriptor, @Nullable String beanName, @Nullable Class<?> proxyClass) {
-    }
 }

From f9c0c61b3716d1c0511ef69d323a8d9cdde5d46b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:26 +0800
Subject: [PATCH 022/157] Update
 CompositeAutowireCandidateResolvingListener.java

---
 .../support/CompositeAutowireCandidateResolvingListener.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/CompositeAutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/CompositeAutowireCandidateResolvingListener.java
index b5cc22e1..3bb84806 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/CompositeAutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/CompositeAutowireCandidateResolvingListener.java
@@ -60,9 +60,4 @@ public void suggestedValueResolved(DependencyDescriptor descriptor, Object sugge
     public void lazyProxyResolved(DependencyDescriptor descriptor, String beanName, Object proxy) {
         forEach(listeners, listener -> listener.lazyProxyResolved(descriptor, beanName, proxy));
     }
-
-    @Override
-    public void lazyProxyClassResolved(DependencyDescriptor descriptor, String beanName, Class<?> proxyClass) {
-        forEach(listeners, listener -> listener.lazyProxyClassResolved(descriptor, beanName, proxyClass));
-    }
 }

From 7e1a37962d2fe4bdab290bdfd89f277bf6ac5acb Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:29 +0800
Subject: [PATCH 023/157] Update LoggingAutowireCandidateResolvingListener.java

---
 .../support/LoggingAutowireCandidateResolvingListener.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/LoggingAutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/LoggingAutowireCandidateResolvingListener.java
index a0f9bf7c..cbe2e1bd 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/LoggingAutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/LoggingAutowireCandidateResolvingListener.java
@@ -46,13 +46,6 @@ public void lazyProxyResolved(DependencyDescriptor descriptor, String beanName,
         }
     }
 
-    @Override
-    public void lazyProxyClassResolved(DependencyDescriptor descriptor, String beanName, Class<?> proxyClass) {
-        if (proxyClass != null) {
-            log("The lazy proxy class [descriptor : {} , bean name : '{}'] was resolved : {}", descriptor, beanName, proxyClass);
-        }
-    }
-
     protected void log(String messagePattern, Object... args) {
         if (logger.isDebugEnabled()) {
             logger.debug(messagePattern, args);

From a8349bb4f62c39cedca3960bfae126cc61bcfed5 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:33 +0800
Subject: [PATCH 024/157] Update ConfigurationProperty.java

---
 .../microsphere/spring/config/ConfigurationProperty.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
index 3737614d..bbbf7af0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
@@ -130,7 +130,9 @@ public Metadata getMetadata() {
 
     @Override
     public final boolean equals(Object o) {
-        if (!(o instanceof ConfigurationProperty that)) return false;
+        if (!(o instanceof ConfigurationProperty)) return false;
+
+        ConfigurationProperty that = (ConfigurationProperty) o;
 
         return isRequired() == that.isRequired()
                 && getName().equals(that.getName())
@@ -196,7 +198,9 @@ public void setTargets(List<String> targets) {
 
         @Override
         public final boolean equals(Object o) {
-            if (!(o instanceof Metadata metadata)) return false;
+            if (!(o instanceof Metadata)) return false;
+
+            Metadata metadata = (Metadata) o;
 
             return Objects.equals(description, metadata.description)
                     && Objects.equals(targets, metadata.targets);

From f4a12044ff5e694749d314c918372d1d1731a360 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:36 +0800
Subject: [PATCH 025/157] Update ListenableAutowireCandidateResolver.java

---
 .../support/ListenableAutowireCandidateResolver.java      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index ef790b27..a85ca384 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -127,14 +127,6 @@ public Object getLazyResolutionProxyIfNecessary(DependencyDescriptor descriptor,
         return proxy;
     }
 
-    @Nullable
-    @Override
-    public Class<?> getLazyResolutionProxyClass(DependencyDescriptor descriptor, String beanName) {
-        Class<?> proxyClass = delegate.getLazyResolutionProxyClass(descriptor, beanName);
-        compositeListener.lazyProxyClassResolved(descriptor, beanName, proxyClass);
-        return proxyClass;
-    }
-
     @Override
     public AutowireCandidateResolver cloneIfNecessary() {
         return delegate.cloneIfNecessary();

From 7225e440b838bbfc0ee201d676af0983dd808e20 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:18:39 +0800
Subject: [PATCH 026/157] Update ListenableAutowireCandidateResolverTest.java

---
 .../support/ListenableAutowireCandidateResolverTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index 02714e08..ffbf5be7 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -62,9 +62,9 @@ public void test() {
 
     @Override
     public void suggestedValueResolved(DependencyDescriptor descriptor, Object suggestedValue) {
-        if (descriptor.getAnnotation(Value.class) != null && suggestedValue instanceof String rawValue) {
+        if (descriptor.getAnnotation(Value.class) != null && suggestedValue instanceof String) {
             if ("testName".equals(descriptor.getField().getName())) {
-                resolvedTestName = environment.resolvePlaceholders(rawValue);
+                resolvedTestName = environment.resolvePlaceholders((String) suggestedValue);
             }
         }
     }

From 180a42e4f8bd2b4779d8016a2e0ddfacdb3677fc Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:44:33 +0800
Subject: [PATCH 027/157] To Compare with Spring Framework < 5.3.8

---
 .../env/ListenableConfigurableEnvironment.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 185ec047..fc92be1d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -29,11 +29,14 @@
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
+import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
+import static io.microsphere.reflect.MethodUtils.findMethod;
+import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
@@ -65,6 +68,12 @@ public class ListenableConfigurableEnvironment implements ConfigurableEnvironmen
      */
     public static final boolean ENABLED_PROPERTY_VALUE = false;
 
+    /**
+     * The {@link Method} of {@link Environment#matchesProfiles(String...)} since Spring Framework 5.3.8
+     */
+    @Nullable
+    private static final Method matchesProfilesMethod = findMethod(Environment.class, "matchesProfiles", String[].class);
+
     private final ConfigurableEnvironment delegate;
 
     private List<EnvironmentListener> environmentListeners;
@@ -175,9 +184,12 @@ public String[] getDefaultProfiles() {
         return defaultProfiles;
     }
 
-    @Override
     public boolean matchesProfiles(String... profileExpressions) {
-        return delegate.matchesProfiles(profileExpressions);
+        if (matchesProfilesMethod != null) {
+            Object arg = profileExpressions;
+            return invokeMethod(delegate, matchesProfilesMethod, arg);
+        }
+        return acceptsProfiles(profileExpressions);
     }
 
     @Deprecated

From 7164bc00d10338e3f92e6a88acef3302e9891fa7 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:44:37 +0800
Subject: [PATCH 028/157] Update ListenableAutowireCandidateResolverTest.java

---
 .../support/ListenableAutowireCandidateResolverTest.java        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index ffbf5be7..20090e2f 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -4,8 +4,6 @@
 import io.microsphere.spring.util.TestBean;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.DependencyDescriptor;

From a0f36bdfb01a5dbe1ef37a1d01a95a73b65aaf5a Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 18:45:32 +0800
Subject: [PATCH 029/157] Add spring-boot-2.6 into build matrix

---
 .github/workflows/maven-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 50d61b60..c15df439 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-2.7' ]
+        maven-profile-spring-boot: [ 'spring-boot-2.7' , 'spring-boot-2.6' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From 525547ac1d8d442df4ae617e518f2f872147bed4 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 19:21:05 +0800
Subject: [PATCH 030/157] Update pom.xml

---
 microsphere-spring-test/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index 9f45266b..ccceeb6b 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -133,6 +133,12 @@
             <artifactId>spring-kafka-test</artifactId>
         </dependency>
 
+        <!-- Metrics -->
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
+
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>

From ce26d93bc90476adca1d8fc3e13fa40addcbd1e3 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 26 Nov 2024 19:21:20 +0800
Subject: [PATCH 031/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index c15df439..da436a3c 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-2.7' , 'spring-boot-2.6' ]
+        maven-profile-spring-boot: [ 'spring-boot-2.7' , 'spring-boot-2.6', 'spring-boot-2.5' ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From 6ee143a30ad50e248395a7208d25c1ddde77ff4b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Sun, 1 Dec 2024 12:21:18 +0800
Subject: [PATCH 032/157] Polish #32

---
 ...stenableAutowireCandidateResolverTest.java |  8 ++++----
 .../ConfigurationPropertyRepositoryTest.java  | 10 +++++-----
 .../config/ConfigurationPropertyTest.java     |  6 +++---
 ...ListenableConfigurableEnvironmentTest.java |  8 ++++----
 .../spring/util/BeanDefinitionUtilsTest.java  |  2 +-
 .../spring/util/SpringVersionUtilsTest.java   |  2 +-
 .../spring/util/WrapperUtilsTest.java         | 12 +++++------
 microsphere-spring-guice/pom.xml              |  4 ++--
 .../guice/annotation/EnableGuiceTest.java     | 12 +++++------
 .../annotation/EnableP6DataSourceTest.java    |  1 -
 ...beddedDataBaseBeanDefinitionRegistrar.java |  3 ---
 .../embedded/EnableEmbeddedDatabaseTest.java  |  1 -
 microsphere-spring-web/pom.xml                |  4 ++--
 .../SmartWebEndpointMappingFactoryTest.java   | 20 +++++++++----------
 .../web/metadata/WebEndpointMappingTest.java  | 17 +++++++---------
 .../web/rule/WebRequestMethodsRuleTest.java   |  6 +++---
 .../web/rule/WebRequestPattensRuleTest.java   |  4 ++--
 ...strationWebEndpointMappingFactoryTest.java | 10 +++++-----
 ...strationWebEndpointMappingFactoryTest.java | 10 +++++-----
 microsphere-spring-webmvc/pom.xml             |  4 ++--
 ...pingInfoWebEndpointMappingFactoryTest.java | 18 ++++++++---------
 21 files changed, 76 insertions(+), 86 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index 20090e2f..18fc1d05 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -2,8 +2,8 @@
 
 
 import io.microsphere.spring.util.TestBean;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -12,7 +12,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,7 +24,7 @@
  * @see ListenableAutowireCandidateResolver
  * @since 1.0.0
  */
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @TestPropertySource(
         properties = {
                 "microsphere.spring.listenable-autowire-candidate-resolver.enabled=true",
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
index acb5f28f..ea59c21b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
@@ -16,19 +16,19 @@
  */
 package io.microsphere.spring.config;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Collection;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * {@link ConfigurationPropertyRepository} Test
@@ -37,7 +37,7 @@
  * @see ConfigurationPropertyRepository
  * @since 1.0.0
  */
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(
         classes = {
                 ConfigurationPropertyRepository.class,
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
index 3c9e43fb..bba9d7a3 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
@@ -16,12 +16,12 @@
  */
 package io.microsphere.spring.config;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 
 /**
  * {@link ConfigurationProperty} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
index 35251287..a0ae9505 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.core.env;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -26,7 +26,7 @@
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(
         classes = ListenableConfigurableEnvironmentTest.class,
         initializers = ListenableConfigurableEnvironmentInitializer.class
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java
index 1ec9d45b..760de1fd 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.util;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
index 301f9bb2..a2d77810 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
@@ -27,7 +27,7 @@
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CONTEXT_VERSION;
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CORE_VERSION;
 import static io.microsphere.spring.util.SpringVersionUtils.getSpringVersion;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * {@link SpringVersionUtils} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java
index 4b4962b4..552175aa 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java
@@ -1,11 +1,11 @@
 package io.microsphere.spring.util;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
 public class WrapperUtilsTest {
@@ -20,7 +20,7 @@ public void testUnwrapWithConfigurableListableBeanFactory() {
         ConfigurableListableBeanFactory result = WrapperUtils.unwrap(beanFactory);
 
         // Assert
-        assertEquals(configurableListableBeanFactoryMock, result, "The unwrap method should return the same instance when passed a ConfigurableListableBeanFactory.");
+        assertEquals("The unwrap method should return the same instance when passed a ConfigurableListableBeanFactory.", configurableListableBeanFactoryMock, result);
     }
 
     @Test
@@ -29,8 +29,8 @@ public void testUnwrapWithNonConfigurableListableBeanFactory() {
         BeanFactory nonConfigurableBeanFactoryMock = mock(BeanFactory.class);
 
         // Act & Assert
-        assertThrows(IllegalArgumentException.class, () -> WrapperUtils.unwrap(nonConfigurableBeanFactoryMock),
-                "The unwrap method should throw an IllegalArgumentException when the bean factory is not an instance of ConfigurableListableBeanFactory.");
+        assertThrows("The unwrap method should throw an IllegalArgumentException when the bean factory is not an instance of ConfigurableListableBeanFactory.",
+                IllegalArgumentException.class, () -> WrapperUtils.unwrap(nonConfigurableBeanFactoryMock));
     }
 
 }
diff --git a/microsphere-spring-guice/pom.xml b/microsphere-spring-guice/pom.xml
index adfaac5f..660b80bf 100644
--- a/microsphere-spring-guice/pom.xml
+++ b/microsphere-spring-guice/pom.xml
@@ -48,8 +48,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java b/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
index 1f79885d..296038d7 100644
--- a/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
+++ b/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
@@ -17,14 +17,14 @@
 package io.microsphere.spring.guice.annotation;
 
 import com.google.inject.Inject;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 
 /**
@@ -33,7 +33,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = {
         EnableGuiceTest.class
 })
diff --git a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
index e3fefdb0..2f2e3d7f 100644
--- a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
+++ b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.sql.DataSource;
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
index ff348153..03760784 100644
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
+++ b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
@@ -1,6 +1,5 @@
 package io.microsphere.spring.test.jdbc.embedded;
 
-import ch.vorburger.exec.ManagedProcessException;
 import ch.vorburger.mariadb4j.DB;
 import ch.vorburger.mariadb4j.DBConfigurationBuilder;
 import org.springframework.beans.factory.BeanCreationException;
@@ -8,10 +7,8 @@
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
index e359f962..d8f4028b 100644
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
+++ b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
@@ -17,7 +17,6 @@
 import java.sql.Statement;
 
 import static io.microsphere.spring.test.jdbc.embedded.EmbeddedDatabaseType.MARIADB;
-import static org.junit.Assert.assertTrue;
 
 /**
  * {@link EnableEmbeddedDatabase} Test
diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index 45d934ce..399045b6 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -70,8 +70,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
index 394d7b50..4889c2f4 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
@@ -16,21 +16,19 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Optional;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.springframework.util.StreamUtils.copyToString;
 
 /**
@@ -39,8 +37,8 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@Execution(ExecutionMode.SAME_THREAD)
-@ExtendWith(SpringExtension.class)
+
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = SmartWebEndpointMappingFactoryTest.class)
 public class SmartWebEndpointMappingFactoryTest {
 
@@ -51,7 +49,7 @@ public class SmartWebEndpointMappingFactoryTest {
 
     private String fullJson;
 
-    @BeforeEach
+    @Before
     public void init() throws Throwable {
         this.fullJson = copyToString(this.fullJsonResource.getInputStream(), UTF_8);
     }
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
index 959ad702..3f46e956 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
@@ -16,21 +16,19 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.IOException;
 
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.CUSTOMIZED;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.springframework.util.StreamUtils.copyToString;
 
 /**
@@ -39,8 +37,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@Execution(ExecutionMode.SAME_THREAD)
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = WebEndpointMappingTest.class)
 public class WebEndpointMappingTest {
 
@@ -49,7 +46,7 @@ public class WebEndpointMappingTest {
 
     private String fullJson;
 
-    @BeforeEach
+    @Before
     public void init() throws Throwable {
         this.fullJson = copyToString(this.fullJsonResource.getInputStream(), UTF_8);
     }
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
index f7faf278..5a2af218 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * {@link WebRequestMethodsRule} Test
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
index b0264103..3307e21e 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 /**
  * {@link WebRequestPattensRule} Test
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
index 05528beb..a62cd50c 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
@@ -17,8 +17,8 @@
 //package io.microsphere.spring.web.servlet;
 //
 //import io.microsphere.spring.web.metadata.WebEndpointMapping;
-//import org.junit.jupiter.api.BeforeEach;
-//import org.junit.jupiter.api.Test;
+//import org.junit.Before;
+//import org.junit.Test;
 //
 //import javax.servlet.DispatcherType;
 //import javax.servlet.FilterRegistration;
@@ -28,8 +28,8 @@
 //
 //import static io.microsphere.util.ArrayUtils.of;
 //import static io.microsphere.util.ArrayUtils.size;
-//import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-//import static org.junit.jupiter.api.Assertions.assertEquals;
+//import static org.junit.Assert.assertArrayEquals;
+//import static org.junit.Assert.assertEquals;
 //
 ///**
 // * {@link FilterRegistrationWebEndpointMappingFactory} Test
@@ -47,7 +47,7 @@
 //
 //    private FilterRegistration.Dynamic registration;
 //
-//    @BeforeEach
+//    @Before
 //    public void init() throws ServletException {
 //        filterName = "test-filter";
 //        url = "/test-filter";
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
index 6234d7c5..85d1b39d 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
@@ -18,8 +18,8 @@
 
 import io.microsphere.spring.web.metadata.ServletRegistrationWebEndpointMappingFactory;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.mock.web.MockServletConfig;
 
 import javax.servlet.ServletException;
@@ -27,8 +27,8 @@
 import java.util.Optional;
 
 import static io.microsphere.util.ArrayUtils.of;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * {@link ServletRegistrationWebEndpointMappingFactory} Test
@@ -50,7 +50,7 @@ public class ServletRegistrationWebEndpointMappingFactoryTest {
 
     private TestServlet testServlet;
 
-    @BeforeEach
+    @Before
     public void init() throws ServletException {
         servletName = "test-servlet";
         url = "/test";
diff --git a/microsphere-spring-webmvc/pom.xml b/microsphere-spring-webmvc/pom.xml
index 69d524cc..d0132886 100644
--- a/microsphere-spring-webmvc/pom.xml
+++ b/microsphere-spring-webmvc/pom.xml
@@ -50,8 +50,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
index f29dced6..9785222f 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
@@ -17,13 +17,13 @@
 package io.microsphere.spring.webmvc.metadata;
 
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
@@ -31,9 +31,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
@@ -41,7 +41,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@ExtendWith(SpringExtension.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest(classes = {
         RequestMappingInfoWebEndpointMappingFactoryTest.class
 },
@@ -56,7 +56,7 @@ public class RequestMappingInfoWebEndpointMappingFactoryTest {
     @Autowired
     private RequestMappingInfoHandlerMapping requestMappingInfoHandlerMapping;
 
-    @BeforeEach
+    @Before
     public void init() {
         factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
         this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();

From b647ebf88208911790fee3a2bcc081ad8bd0552c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Sun, 1 Dec 2024 18:50:27 +0800
Subject: [PATCH 033/157] Polish #35

---
 microsphere-spring-context/pom.xml            |  63 +++++-
 .../annotation/TTLCachingConfiguration.java   |   3 -
 .../redis/TTLRedisCacheWriterWrapper.java     | 198 +++++++++---------
 .../cache/redis/TTLRedisConfiguration.java    | 142 ++++++-------
 .../spring/util/SpringVersionUtils.java       |   2 +-
 .../cache/annotation/TTLCacheableTest.java    | 196 ++++++++---------
 microsphere-spring-parent/pom.xml             | 125 ++++++-----
 microsphere-spring-test/pom.xml               |  11 +-
 microsphere-spring-webmvc/pom.xml             |  12 --
 .../spring/webmvc/IdempotentException.java    |  60 +++---
 .../spring/webmvc/annotation/Idempotent.java  |  74 +++----
 ...tentAnnotatedMethodHandlerInterceptor.java | 146 ++++++-------
 .../bootstrap/IdempotentWebApplication.java   | 150 ++++++-------
 ...pingInfoWebEndpointMappingFactoryTest.java | 158 +++++++-------
 14 files changed, 698 insertions(+), 642 deletions(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index 3f77ea26..e962f794 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -42,26 +42,19 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
+            <artifactId>spring-context-support</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>spring-beans</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context-indexer</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Spring Data Redis -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
+            <artifactId>spring-aop</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -133,4 +126,54 @@
 
     </dependencies>
 
+    <profiles>
+
+        <profile>
+            <id>spring-framework-5.0</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-indexer</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>spring-framework-5.1</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-indexer</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>spring-framework-5.2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-indexer</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>spring-framework-5.3</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-indexer</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/annotation/TTLCachingConfiguration.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/annotation/TTLCachingConfiguration.java
index f34ecf5a..0681c796 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/annotation/TTLCachingConfiguration.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/annotation/TTLCachingConfiguration.java
@@ -17,9 +17,7 @@
 package io.microsphere.spring.cache.annotation;
 
 import io.microsphere.spring.cache.intereptor.TTLCacheResolver;
-import io.microsphere.spring.cache.redis.TTLRedisConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 
 /**
  * TTL Caching Configuration
@@ -27,7 +25,6 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@Import(TTLRedisConfiguration.class)
 class TTLCachingConfiguration {
 
     @Bean(name = TTLCacheResolver.BEAN_NAME)
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
index a31489d1..47529159 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
@@ -1,99 +1,99 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.cache.redis;
-
-import org.springframework.data.redis.cache.CacheStatistics;
-import org.springframework.data.redis.cache.CacheStatisticsCollector;
-import org.springframework.data.redis.cache.RedisCacheWriter;
-import org.springframework.lang.Nullable;
-
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-
-import static io.microsphere.reflect.MethodUtils.invokeMethod;
-import static io.microsphere.spring.cache.TTLContext.doWithTTL;
-
-/**
- * TTL {@link RedisCacheWriter} Wrapper
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-public class TTLRedisCacheWriterWrapper implements RedisCacheWriter {
-
-    private final RedisCacheWriter delegate;
-
-    public TTLRedisCacheWriterWrapper(RedisCacheWriter delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void put(String name, byte[] key, byte[] value, Duration ttl) {
-        doWithTTL(effectiveTTL -> {
-            delegate.put(name, key, value, effectiveTTL);
-        }, ttl);
-    }
-
-    public CompletableFuture<Void> store(String name, byte[] key, byte[] value, Duration ttl) {
-        // Compatible with Spring Data Redis < 3.2
-        return invokeMethod(delegate, "store", name, key, value, ttl);
-    }
-
-    @Override
-    @Nullable
-    public byte[] get(String name, byte[] key) {
-        return delegate.get(name, key);
-    }
-
-    public CompletableFuture<byte[]> retrieve(String name, byte[] key, Duration ttl) {
-        // Compatible with Spring Data Redis < 3.2
-        return invokeMethod(delegate, "retrieve", name, key, ttl);
-    }
-
-    @Override
-    @Nullable
-    public byte[] putIfAbsent(String name, byte[] key, byte[] value, Duration ttl) {
-        return doWithTTL(effectiveTTL -> {
-            return delegate.putIfAbsent(name, key, value, effectiveTTL);
-        }, ttl);
-    }
-
-    @Override
-    public void remove(String name, byte[] key) {
-        delegate.remove(name, key);
-    }
-
-    @Override
-    public void clean(String name, byte[] pattern) {
-        delegate.clean(name, pattern);
-    }
-
-    @Override
-    public void clearStatistics(String name) {
-        delegate.clearStatistics(name);
-    }
-
-    @Override
-    public RedisCacheWriter withStatisticsCollector(CacheStatisticsCollector cacheStatisticsCollector) {
-        return delegate.withStatisticsCollector(cacheStatisticsCollector);
-    }
-
-    @Override
-    public CacheStatistics getCacheStatistics(String cacheName) {
-        return delegate.getCacheStatistics(cacheName);
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.cache.redis;
+//
+//import org.springframework.data.redis.cache.CacheStatistics;
+//import org.springframework.data.redis.cache.CacheStatisticsCollector;
+//import org.springframework.data.redis.cache.RedisCacheWriter;
+//import org.springframework.lang.Nullable;
+//
+//import java.time.Duration;
+//import java.util.concurrent.CompletableFuture;
+//
+//import static io.microsphere.reflect.MethodUtils.invokeMethod;
+//import static io.microsphere.spring.cache.TTLContext.doWithTTL;
+//
+///**
+// * TTL {@link RedisCacheWriter} Wrapper
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//public class TTLRedisCacheWriterWrapper implements RedisCacheWriter {
+//
+//    private final RedisCacheWriter delegate;
+//
+//    public TTLRedisCacheWriterWrapper(RedisCacheWriter delegate) {
+//        this.delegate = delegate;
+//    }
+//
+//    @Override
+//    public void put(String name, byte[] key, byte[] value, Duration ttl) {
+//        doWithTTL(effectiveTTL -> {
+//            delegate.put(name, key, value, effectiveTTL);
+//        }, ttl);
+//    }
+//
+//    public CompletableFuture<Void> store(String name, byte[] key, byte[] value, Duration ttl) {
+//        // Compatible with Spring Data Redis < 3.2
+//        return invokeMethod(delegate, "store", name, key, value, ttl);
+//    }
+//
+//    @Override
+//    @Nullable
+//    public byte[] get(String name, byte[] key) {
+//        return delegate.get(name, key);
+//    }
+//
+//    public CompletableFuture<byte[]> retrieve(String name, byte[] key, Duration ttl) {
+//        // Compatible with Spring Data Redis < 3.2
+//        return invokeMethod(delegate, "retrieve", name, key, ttl);
+//    }
+//
+//    @Override
+//    @Nullable
+//    public byte[] putIfAbsent(String name, byte[] key, byte[] value, Duration ttl) {
+//        return doWithTTL(effectiveTTL -> {
+//            return delegate.putIfAbsent(name, key, value, effectiveTTL);
+//        }, ttl);
+//    }
+//
+//    @Override
+//    public void remove(String name, byte[] key) {
+//        delegate.remove(name, key);
+//    }
+//
+//    @Override
+//    public void clean(String name, byte[] pattern) {
+//        delegate.clean(name, pattern);
+//    }
+//
+//    @Override
+//    public void clearStatistics(String name) {
+//        delegate.clearStatistics(name);
+//    }
+//
+//    @Override
+//    public RedisCacheWriter withStatisticsCollector(CacheStatisticsCollector cacheStatisticsCollector) {
+//        return delegate.withStatisticsCollector(cacheStatisticsCollector);
+//    }
+//
+//    @Override
+//    public CacheStatistics getCacheStatistics(String cacheName) {
+//        return delegate.getCacheStatistics(cacheName);
+//    }
+//}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisConfiguration.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisConfiguration.java
index 6c10053a..11b86807 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisConfiguration.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisConfiguration.java
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.cache.redis;
-
-
-import io.microsphere.spring.beans.factory.config.GenericBeanPostProcessorAdapter;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.cache.RedisCacheWriter;
-
-import static io.microsphere.reflect.FieldUtils.setFieldValue;
-import static io.microsphere.spring.util.FieldUtils.getFieldValue;
-import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
-import static io.microsphere.util.ClassLoaderUtils.isPresent;
-
-/**
- * Redis Configuration with TTL features
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @see org.springframework.data.redis.cache.RedisCacheManager
- * @since 1.0.0
- */
-public class TTLRedisConfiguration implements BeanFactoryPostProcessor {
-
-    private static final String REDIS_CACHE_MANAGER_CLASS_NAME = "org.springframework.data.redis.cache.RedisCacheManager";
-
-    private static final boolean REDIS_CACHE_MANAGER_CLASS_PRESENT = isPresent(REDIS_CACHE_MANAGER_CLASS_NAME, getDefaultClassLoader());
-
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-        boolean present = REDIS_CACHE_MANAGER_CLASS_PRESENT;
-        if (!present) {
-            present = isPresent(REDIS_CACHE_MANAGER_CLASS_NAME, beanFactory.getBeanClassLoader());
-        }
-
-        if (present) {
-            beanFactory.addBeanPostProcessor(new RedisCacheManagerBeanPostProcessor());
-        }
-    }
-
-    static class RedisCacheManagerBeanPostProcessor extends GenericBeanPostProcessorAdapter<RedisCacheManager> {
-
-        @Override
-        protected void processBeforeInitialization(RedisCacheManager bean, String beanName) throws BeansException {
-            String fieldName = "cacheWriter";
-            RedisCacheWriter redisCacheWriter = getFieldValue(bean, fieldName, RedisCacheWriter.class);
-            if (redisCacheWriter != null) {
-                TTLRedisCacheWriterWrapper redisCacheWriterWrapper = new TTLRedisCacheWriterWrapper(redisCacheWriter);
-                setFieldValue(bean, fieldName, redisCacheWriterWrapper);
-            }
-        }
-    }
-
-
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.cache.redis;
+//
+//
+//import io.microsphere.spring.beans.factory.config.GenericBeanPostProcessorAdapter;
+//import org.springframework.beans.BeansException;
+//import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+//import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+//import org.springframework.data.redis.cache.RedisCacheManager;
+//import org.springframework.data.redis.cache.RedisCacheWriter;
+//
+//import static io.microsphere.reflect.FieldUtils.setFieldValue;
+//import static io.microsphere.spring.util.FieldUtils.getFieldValue;
+//import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
+//import static io.microsphere.util.ClassLoaderUtils.isPresent;
+//
+///**
+// * Redis Configuration with TTL features
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @see org.springframework.data.redis.cache.RedisCacheManager
+// * @since 1.0.0
+// */
+//public class TTLRedisConfiguration implements BeanFactoryPostProcessor {
+//
+//    private static final String REDIS_CACHE_MANAGER_CLASS_NAME = "org.springframework.data.redis.cache.RedisCacheManager";
+//
+//    private static final boolean REDIS_CACHE_MANAGER_CLASS_PRESENT = isPresent(REDIS_CACHE_MANAGER_CLASS_NAME, getDefaultClassLoader());
+//
+//    @Override
+//    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+//        boolean present = REDIS_CACHE_MANAGER_CLASS_PRESENT;
+//        if (!present) {
+//            present = isPresent(REDIS_CACHE_MANAGER_CLASS_NAME, beanFactory.getBeanClassLoader());
+//        }
+//
+//        if (present) {
+//            beanFactory.addBeanPostProcessor(new RedisCacheManagerBeanPostProcessor());
+//        }
+//    }
+//
+//    static class RedisCacheManagerBeanPostProcessor extends GenericBeanPostProcessorAdapter<RedisCacheManager> {
+//
+//        @Override
+//        protected void processBeforeInitialization(RedisCacheManager bean, String beanName) throws BeansException {
+//            String fieldName = "cacheWriter";
+//            RedisCacheWriter redisCacheWriter = getFieldValue(bean, fieldName, RedisCacheWriter.class);
+//            if (redisCacheWriter != null) {
+//                TTLRedisCacheWriterWrapper redisCacheWriterWrapper = new TTLRedisCacheWriterWrapper(redisCacheWriter);
+//                setFieldValue(bean, fieldName, redisCacheWriterWrapper);
+//            }
+//        }
+//    }
+//
+//
+//}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
index 3e205851..9eae6fe9 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
@@ -69,7 +69,7 @@ public abstract class SpringVersionUtils extends BaseUtils {
     public static final Version SPRING_CONTEXT_VERSION = getSpringVersion(ApplicationContext.class);
 
     /**
-     * The version of "spring-context" module
+     * The version of "spring-context-support" module
      */
     @Nullable
     public static final Version SPRING_CONTEXT_SUPPORT_VERSION = getSpringVersion("org.springframework.mail.MailSender");
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
index 57f801dc..91dfba71 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
@@ -1,98 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.cache.annotation;
-
-import io.microsphere.spring.test.redis.EnableRedisTest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Collection;
-import java.util.concurrent.ThreadLocalRandom;
-
-import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-/**
- * {@link TTLCacheable} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        TTLCacheableTest.class, TTLCacheableTest.CachingData.class
-})
-@EnableTTLCaching(proxyTargetClass = true)
-@EnableRedisTest
-public class TTLCacheableTest {
-
-    @Bean
-    public static CacheManager simpleCacheManager() {
-        Collection<? extends Cache> caches = singletonList(new ConcurrentMapCache("test"));
-        SimpleCacheManager simpleCacheManager = new SimpleCacheManager();
-        simpleCacheManager.setCaches(caches);
-        return simpleCacheManager;
-    }
-
-    @Bean
-    @Primary
-    public static CacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) {
-        return RedisCacheManager.create(redisConnectionFactory);
-    }
-
-    @Bean(destroyMethod = "destroy")
-    public LettuceConnectionFactory redisConnectionFactory() {
-        return new LettuceConnectionFactory(new RedisStandaloneConfiguration("127.0.0.1", 6379));
-    }
-
-
-    static class CachingData {
-        @TTLCacheable(cacheNames = "test",
-                cacheManagers = {"redisCacheManager"},
-                expire = 100)
-        public int randomInt(int value) {
-            return ThreadLocalRandom.current().nextInt(value);
-        }
-    }
-
-    @Autowired
-    private CachingData testData;
-
-    @Test
-    public void test() throws InterruptedException {
-        int value = testData.randomInt(100);
-        assertEquals(value, testData.randomInt(100));
-
-        Thread.sleep(200L);
-
-        assertNotEquals(value, testData.randomInt(100));
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.cache.annotation;
+//
+//import io.microsphere.spring.test.redis.EnableRedisTest;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.cache.Cache;
+//import org.springframework.cache.CacheManager;
+//import org.springframework.cache.concurrent.ConcurrentMapCache;
+//import org.springframework.cache.support.SimpleCacheManager;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.data.redis.cache.RedisCacheManager;
+//import org.springframework.data.redis.connection.RedisConnectionFactory;
+//import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+//import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import java.util.Collection;
+//import java.util.concurrent.ThreadLocalRandom;
+//
+//import static java.util.Collections.singletonList;
+//import static org.junit.Assert.assertEquals;
+//import static org.junit.Assert.assertNotEquals;
+//
+///**
+// * {@link TTLCacheable} Test
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@RunWith(SpringRunner.class)
+//@ContextConfiguration(classes = {
+//        TTLCacheableTest.class, TTLCacheableTest.CachingData.class
+//})
+//@EnableTTLCaching(proxyTargetClass = true)
+//@EnableRedisTest
+//public class TTLCacheableTest {
+//
+//    @Bean
+//    public static CacheManager simpleCacheManager() {
+//        Collection<? extends Cache> caches = singletonList(new ConcurrentMapCache("test"));
+//        SimpleCacheManager simpleCacheManager = new SimpleCacheManager();
+//        simpleCacheManager.setCaches(caches);
+//        return simpleCacheManager;
+//    }
+//
+//    @Bean
+//    @Primary
+//    public static CacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) {
+//        return RedisCacheManager.create(redisConnectionFactory);
+//    }
+//
+//    @Bean(destroyMethod = "destroy")
+//    public LettuceConnectionFactory redisConnectionFactory() {
+//        return new LettuceConnectionFactory(new RedisStandaloneConfiguration("127.0.0.1", 6379));
+//    }
+//
+//
+//    static class CachingData {
+//        @TTLCacheable(cacheNames = "test",
+//                cacheManagers = {"redisCacheManager"},
+//                expire = 100)
+//        public int randomInt(int value) {
+//            return ThreadLocalRandom.current().nextInt(value);
+//        }
+//    }
+//
+//    @Autowired
+//    private CachingData testData;
+//
+//    @Test
+//    public void test() throws InterruptedException {
+//        int value = testData.randomInt(100);
+//        assertEquals(value, testData.randomInt(100));
+//
+//        Thread.sleep(200L);
+//
+//        assertNotEquals(value, testData.randomInt(100));
+//    }
+//}
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 51d8fc61..f3c4ab2f 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,8 +20,13 @@
 
     <properties>
         <microsphere-java.version>0.0.7</microsphere-java.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
+        <servlet-api.version>4.0.1</servlet-api.version>
+        <jackson.version>2.18.2</jackson.version>
+        <snakeyaml.version>2.3</snakeyaml.version>
         <lettuce.version>6.1.10.RELEASE</lettuce.version>
+        <logback.version>1.5.12</logback.version>
+        <junit.version>4.13.2</junit.version>
+        <mockito.version>5.14.2</mockito.version>
     </properties>
 
     <dependencyManagement>
@@ -36,11 +41,20 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- Spring Boot Dependencies -->
+            <!-- Spring Framework BOM -->
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Jackson BOM -->
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -52,95 +66,110 @@
                 <version>${lettuce.version}</version>
             </dependency>
 
-        </dependencies>
-    </dependencyManagement>
+            <!-- YAML -->
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
 
-    <profiles>
-        <profile>
-            <id>spring-boot-2.0</id>
-            <properties>
-                <spring-boot.version>2.0.9.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
+            <!-- Servlet API -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${servlet-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
-        <profile>
-            <id>spring-boot-2.1</id>
-            <properties>
-                <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
+            <!-- JUnit -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
 
-        <profile>
-            <id>spring-boot-2.2</id>
-            <properties>
-                <spring-boot.version>2.2.13.RELEASE</spring-boot.version>
-            </properties>
-        </profile>
+            <!-- Mockito Bom -->
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-bom</artifactId>
+                <version>${mockito.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
 
+        </dependencies>
+    </dependencyManagement>
+
+    <profiles>
         <profile>
-            <id>spring-boot-2.3</id>
+            <id>spring-framework-3.2</id>
             <properties>
-                <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+                <spring.version>3.2.18.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-2.4</id>
+            <id>spring-framework-4.0</id>
             <properties>
-                <spring-boot.version>2.4.13</spring-boot.version>
+                <spring.version>4.0.9.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-2.5</id>
+            <id>spring-framework-4.1</id>
             <properties>
-                <spring-boot.version>2.5.15</spring-boot.version>
+                <spring.version>4.1.9.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-2.6</id>
+            <id>spring-framework-4.2</id>
             <properties>
-                <spring-boot.version>2.6.15</spring-boot.version>
+                <spring.version>4.2.9.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-2.7</id>
+            <id>spring-framework-4.3</id>
             <properties>
-                <spring-boot.version>2.7.18</spring-boot.version>
+                <spring.version>4.3.30.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-3.0</id>
+            <id>spring-framework-5.0</id>
             <properties>
-                <java.version>17</java.version>
-                <spring-boot.version>3.0.13</spring-boot.version>
+                <spring.version>5.0.20.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-3.1</id>
+            <id>spring-framework-5.1</id>
             <properties>
-                <java.version>17</java.version>
-                <spring-boot.version>3.1.12</spring-boot.version>
+                <spring.version>5.1.20.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-3.2</id>
+            <id>spring-framework-5.2</id>
             <properties>
-                <spring-boot.version>3.2.11</spring-boot.version>
-                <java.version>17</java.version>
+                <spring.version>5.2.25.RELEASE</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-boot-3.3</id>
+            <id>spring-framework-5.3</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <spring-boot.version>3.3.5</spring-boot.version>
-                <java.version>17</java.version>
+                <spring.version>5.3.39</spring.version>
             </properties>
         </profile>
     </profiles>
diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
index ccceeb6b..fb22e9a2 100644
--- a/microsphere-spring-test/pom.xml
+++ b/microsphere-spring-test/pom.xml
@@ -19,6 +19,8 @@
     <description>Microsphere Spring Test</description>
 
     <properties>
+        <spring-data-redis.version>2.7.18</spring-data-redis.version>
+        <spring-kafka.version>2.9.13</spring-kafka.version>
         <zookeeper.version>3.8.1</zookeeper.version>
         <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
         <mysql-connection-j.version>8.0.33</mysql-connection-j.version>
@@ -112,6 +114,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
+            <version>${spring-data-redis.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -125,18 +128,14 @@
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
+            <version>${spring-kafka.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka-test</artifactId>
-        </dependency>
-
-        <!-- Metrics -->
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
+            <version>${spring-kafka.version}</version>
         </dependency>
 
         <!-- Logging -->
diff --git a/microsphere-spring-webmvc/pom.xml b/microsphere-spring-webmvc/pom.xml
index d0132886..51fa5724 100644
--- a/microsphere-spring-webmvc/pom.xml
+++ b/microsphere-spring-webmvc/pom.xml
@@ -61,18 +61,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
index cd445838..ab7e1930 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
@@ -1,30 +1,30 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.webmvc;
-
-/**
- * TODO Comment
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since TODO
- */
-public class IdempotentException extends RuntimeException {
-
-    public IdempotentException(String s) {
-        super(s);
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.webmvc;
+//
+///**
+// * TODO Comment
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since TODO
+// */
+//public class IdempotentException extends RuntimeException {
+//
+//    public IdempotentException(String s) {
+//        super(s);
+//    }
+//}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
index 7d9ba2a3..2b7d5061 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
@@ -1,37 +1,37 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.webmvc.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Idempotent Annotation
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface Idempotent {
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.webmvc.annotation;
+//
+//import java.lang.annotation.Documented;
+//import java.lang.annotation.ElementType;
+//import java.lang.annotation.Inherited;
+//import java.lang.annotation.Retention;
+//import java.lang.annotation.RetentionPolicy;
+//import java.lang.annotation.Target;
+//
+///**
+// * Idempotent Annotation
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@Target({ElementType.TYPE, ElementType.METHOD})
+//@Retention(RetentionPolicy.RUNTIME)
+//@Inherited
+//@Documented
+//public @interface Idempotent {
+//}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
index 61d3325e..7877e749 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
@@ -1,73 +1,73 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.webmvc.interceptor;
-
-import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
-import io.microsphere.spring.webmvc.IdempotentException;
-import io.microsphere.spring.webmvc.annotation.Idempotent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.web.context.request.ServletWebRequest;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.method.HandlerMethod;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-/**
- * {@link AnnotatedMethodHandlerInterceptor} for {@link Idempotent} annotation
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-public class IdempotentAnnotatedMethodHandlerInterceptor extends AnnotatedMethodHandlerInterceptor<Idempotent> implements ApplicationListener<HandlerMethodArgumentsResolvedEvent> {
-
-    @Override
-    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod,
-                                Idempotent idempotent) throws Exception {
-
-        System.out.println(handlerMethod);
-        System.out.println(idempotent);
-
-        return true;
-    }
-
-    // Handler Methods' arguments Resolved
-    // Handler Method is not executed
-    @Override
-    public void onApplicationEvent(HandlerMethodArgumentsResolvedEvent event) {
-        Method method = event.getMethod();
-        Object[] args = event.getArguments();
-        System.out.println("method : " + method + " , args : " + Arrays.asList(args));
-        WebRequest webRequest = event.getWebRequest();
-        if (webRequest instanceof ServletWebRequest) {
-            ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
-            HttpServletRequest request = servletWebRequest.getNativeRequest(HttpServletRequest.class);
-            // HttpSession based on Spring Redis
-            // Spring Session
-            HttpSession httpSession = request.getSession();
-            String token = request.getHeader("token");
-            Object tokenValue = httpSession.getAttribute(token);
-            if (tokenValue != null) {
-                //
-                throw new IdempotentException("");
-            }
-        }
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.webmvc.interceptor;
+//
+//import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
+//import io.microsphere.spring.webmvc.IdempotentException;
+//import io.microsphere.spring.webmvc.annotation.Idempotent;
+//import org.springframework.context.ApplicationListener;
+//import org.springframework.web.context.request.ServletWebRequest;
+//import org.springframework.web.context.request.WebRequest;
+//import org.springframework.web.method.HandlerMethod;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpSession;
+//import java.lang.reflect.Method;
+//import java.util.Arrays;
+//
+///**
+// * {@link AnnotatedMethodHandlerInterceptor} for {@link Idempotent} annotation
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//public class IdempotentAnnotatedMethodHandlerInterceptor extends AnnotatedMethodHandlerInterceptor<Idempotent> implements ApplicationListener<HandlerMethodArgumentsResolvedEvent> {
+//
+//    @Override
+//    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod,
+//                                Idempotent idempotent) throws Exception {
+//
+//        System.out.println(handlerMethod);
+//        System.out.println(idempotent);
+//
+//        return true;
+//    }
+//
+//    // Handler Methods' arguments Resolved
+//    // Handler Method is not executed
+//    @Override
+//    public void onApplicationEvent(HandlerMethodArgumentsResolvedEvent event) {
+//        Method method = event.getMethod();
+//        Object[] args = event.getArguments();
+//        System.out.println("method : " + method + " , args : " + Arrays.asList(args));
+//        WebRequest webRequest = event.getWebRequest();
+//        if (webRequest instanceof ServletWebRequest) {
+//            ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
+//            HttpServletRequest request = servletWebRequest.getNativeRequest(HttpServletRequest.class);
+//            // HttpSession based on Spring Redis
+//            // Spring Session
+//            HttpSession httpSession = request.getSession();
+//            String token = request.getHeader("token");
+//            Object tokenValue = httpSession.getAttribute(token);
+//            if (tokenValue != null) {
+//                //
+//                throw new IdempotentException("");
+//            }
+//        }
+//    }
+//}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java
index 154b6628..6e0a73da 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java
@@ -1,75 +1,75 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.webmvc.interceptor.bootstrap;
-
-import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
-import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
-import io.microsphere.spring.webmvc.annotation.EnableWebMvcExtension;
-import io.microsphere.spring.webmvc.annotation.Idempotent;
-import io.microsphere.spring.webmvc.interceptor.IdempotentAnnotatedMethodHandlerInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.event.EventListener;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Idempotent Web Application
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@EnableAutoConfiguration
-@EnableWebMvcExtension(registerHandlerInterceptors = {
-        IdempotentAnnotatedMethodHandlerInterceptor.class
-})
-@Import(value = {
-        DemoController.class
-})
-public class IdempotentWebApplication {
-
-    private static final Logger logger = LoggerFactory.getLogger(IdempotentWebApplication.class);
-
-    public static void main(String[] args) {
-        SpringApplication.run(IdempotentWebApplication.class, args);
-    }
-
-    @EventListener(WebEndpointMappingsReadyEvent.class)
-    public void onEvent(WebEndpointMappingsReadyEvent event) {
-        logger.info(event.toString());
-    }
-
-    @EventListener(HandlerMethodArgumentsResolvedEvent.class)
-    public void onEvent(HandlerMethodArgumentsResolvedEvent event) {
-        logger.info(event.toString());
-    }
-
-}
-
-@RestController
-class DemoController {
-
-    @GetMapping("/echo/{message}")
-    @Idempotent
-    public String echo(@PathVariable String message) {
-        return "[ECHO] : " + message;
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.webmvc.interceptor.bootstrap;
+//
+//import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
+//import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
+//import io.microsphere.spring.webmvc.annotation.EnableWebMvcExtension;
+//import io.microsphere.spring.webmvc.annotation.Idempotent;
+//import io.microsphere.spring.webmvc.interceptor.IdempotentAnnotatedMethodHandlerInterceptor;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+//import org.springframework.context.annotation.Import;
+//import org.springframework.context.event.EventListener;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.PathVariable;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * Idempotent Web Application
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@EnableAutoConfiguration
+//@EnableWebMvcExtension(registerHandlerInterceptors = {
+//        IdempotentAnnotatedMethodHandlerInterceptor.class
+//})
+//@Import(value = {
+//        DemoController.class
+//})
+//public class IdempotentWebApplication {
+//
+//    private static final Logger logger = LoggerFactory.getLogger(IdempotentWebApplication.class);
+//
+//    public static void main(String[] args) {
+//        SpringApplication.run(IdempotentWebApplication.class, args);
+//    }
+//
+//    @EventListener(WebEndpointMappingsReadyEvent.class)
+//    public void onEvent(WebEndpointMappingsReadyEvent event) {
+//        logger.info(event.toString());
+//    }
+//
+//    @EventListener(HandlerMethodArgumentsResolvedEvent.class)
+//    public void onEvent(HandlerMethodArgumentsResolvedEvent event) {
+//        logger.info(event.toString());
+//    }
+//
+//}
+//
+//@RestController
+//class DemoController {
+//
+//    @GetMapping("/echo/{message}")
+//    @Idempotent
+//    public String echo(@PathVariable String message) {
+//        return "[ECHO] : " + message;
+//    }
+//}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
index 9785222f..65cdfd95 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
@@ -1,79 +1,79 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.webmvc.metadata;
-
-import io.microsphere.spring.web.metadata.WebEndpointMapping;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-
-import java.util.Map;
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {
-        RequestMappingInfoWebEndpointMappingFactoryTest.class
-},
-        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EnableAutoConfiguration
-public class RequestMappingInfoWebEndpointMappingFactoryTest {
-
-    private Map<RequestMappingInfo, HandlerMethod> handlerMethods;
-
-    private RequestMappingMetadataWebEndpointMappingFactory factory;
-
-    @Autowired
-    private RequestMappingInfoHandlerMapping requestMappingInfoHandlerMapping;
-
-    @Before
-    public void init() {
-        factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
-        this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();
-    }
-
-    @Test
-    public void test() {
-        assertNotNull(handlerMethods);
-        for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : handlerMethods.entrySet()) {
-            RequestMappingMetadata metadata = new RequestMappingMetadata(entry.getKey(), entry.getValue());
-            Optional<WebEndpointMapping<HandlerMetadata<HandlerMethod, RequestMappingInfo>>> webEndpointMapping = factory.create(metadata);
-            assertTrue(webEndpointMapping.isPresent());
-            webEndpointMapping.ifPresent(mapping -> {
-                assertEquals(this.requestMappingInfoHandlerMapping, mapping.getSource());
-                assertNotNull(webEndpointMapping.get().toJSON());
-            });
-        }
-    }
-
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.webmvc.metadata;
+//
+//import io.microsphere.spring.web.metadata.WebEndpointMapping;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.web.method.HandlerMethod;
+//import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+//import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
+//
+//import java.util.Map;
+//import java.util.Optional;
+//
+//import static org.junit.Assert.assertEquals;
+//import static org.junit.Assert.assertNotNull;
+//import static org.junit.Assert.assertTrue;
+//
+///**
+// * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = {
+//        RequestMappingInfoWebEndpointMappingFactoryTest.class
+//},
+//        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//@EnableAutoConfiguration
+//public class RequestMappingInfoWebEndpointMappingFactoryTest {
+//
+//    private Map<RequestMappingInfo, HandlerMethod> handlerMethods;
+//
+//    private RequestMappingMetadataWebEndpointMappingFactory factory;
+//
+//    @Autowired
+//    private RequestMappingInfoHandlerMapping requestMappingInfoHandlerMapping;
+//
+//    @Before
+//    public void init() {
+//        factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
+//        this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();
+//    }
+//
+//    @Test
+//    public void test() {
+//        assertNotNull(handlerMethods);
+//        for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : handlerMethods.entrySet()) {
+//            RequestMappingMetadata metadata = new RequestMappingMetadata(entry.getKey(), entry.getValue());
+//            Optional<WebEndpointMapping<HandlerMetadata<HandlerMethod, RequestMappingInfo>>> webEndpointMapping = factory.create(metadata);
+//            assertTrue(webEndpointMapping.isPresent());
+//            webEndpointMapping.ifPresent(mapping -> {
+//                assertEquals(this.requestMappingInfoHandlerMapping, mapping.getSource());
+//                assertNotNull(webEndpointMapping.get().toJSON());
+//            });
+//        }
+//    }
+//
+//}

From 2d949dfe99b8f5744736b1785194983f06505f3c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Sun, 1 Dec 2024 18:52:58 +0800
Subject: [PATCH 034/157] Update pom.xml

---
 microsphere-spring-context/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index e962f794..d1f536cf 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -123,7 +123,6 @@
             <scope>test</scope>
         </dependency>
 
-
     </dependencies>
 
     <profiles>

From 888ad018fc034e959e78cd3d43f204803a32a600 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 13:37:54 +0800
Subject: [PATCH 035/157] Update pom.xml

---
 microsphere-spring-context/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index d1f536cf..85b893ca 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -116,13 +116,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-spring-test</artifactId>
-            <version>${revision}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <profiles>

From a3184c8513a4711c7e59651623917e9be05158c1 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 13:37:59 +0800
Subject: [PATCH 036/157] Update pom.xml

---
 microsphere-spring-dependencies/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/microsphere-spring-dependencies/pom.xml b/microsphere-spring-dependencies/pom.xml
index 5e0d485d..e0d50fd2 100644
--- a/microsphere-spring-dependencies/pom.xml
+++ b/microsphere-spring-dependencies/pom.xml
@@ -57,12 +57,6 @@
                 <version>${revision}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.github.microsphere-projects</groupId>
-                <artifactId>microsphere-spring-test</artifactId>
-                <version>${revision}</version>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file

From 878bf33f38820c3d7165bb050fe8628f20b89909 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 13:45:01 +0800
Subject: [PATCH 037/157] Polish #36

---
 microsphere-spring-test/pom.xml               | 149 ------------------
 .../ClassImportBeanDefinitionRegistrar.java   |  41 -----
 .../AnnotatedTypeMetadataTestFactory.java     |  39 -----
 .../annotation/TestConditionContext.java      |  52 ------
 ...beddedDataBaseBeanDefinitionRegistrar.java | 147 -----------------
 ...eddedDataBaseBeanDefinitionsRegistrar.java |  32 ----
 .../jdbc/embedded/EmbeddedDatabaseType.java   |  17 --
 .../jdbc/embedded/EnableEmbeddedDatabase.java |  52 ------
 .../embedded/EnableEmbeddedDatabases.java     |  30 ----
 .../test/kafka/CompositeMessageListener.java  |  60 -------
 .../spring/test/kafka/EnableKafkaTest.java    |  98 ------------
 .../test/kafka/KafkaTestConfiguration.java    |  85 ----------
 .../kafka/embedded/EmbeddedKafkaHolder.java   |  33 ----
 .../spring/test/redis/EnableRedisTest.java    |  32 ----
 .../test/redis/RedisTestConfiguration.java    |  56 -------
 ...dedRedisServerBeanDefinitionRegistrar.java |  80 ----------
 .../embedded/EnableEmbeddedRedisServer.java   |  56 -------
 .../test/util/CompatibilityTestUtils.java     |  99 ------------
 .../embedded/EnableEmbeddedDatabaseTest.java  |  78 ---------
 .../spring/test/kafka/EmbeddedKafkaTest.java  | 146 -----------------
 .../test/kafka/EnableKafkaTestCase.java       |  76 ---------
 .../spring/test/kafka/KafkaTemplateTests.java |  81 ----------
 .../redis/RedisTestConfigurationTest.java     |  39 -----
 .../EnableEmbeddedRedisServerTest.java        |  30 ----
 .../META-INF/mysql/manual_schema.sql          |  71 ---------
 pom.xml                                       |   1 -
 26 files changed, 1680 deletions(-)
 delete mode 100644 microsphere-spring-test/pom.xml
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
 delete mode 100644 microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
deleted file mode 100644
index fb22e9a2..00000000
--- a/microsphere-spring-test/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-    <parent>
-        <groupId>io.github.microsphere-projects</groupId>
-        <artifactId>microsphere-spring-parent</artifactId>
-        <version>${revision}</version>
-        <relativePath>../microsphere-spring-parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.github.microsphere-projects</groupId>
-    <artifactId>microsphere-spring-test</artifactId>
-    <version>${revision}</version>
-    <packaging>jar</packaging>
-
-    <name>Microsphere :: Spring :: Test</name>
-    <description>Microsphere Spring Test</description>
-
-    <properties>
-        <spring-data-redis.version>2.7.18</spring-data-redis.version>
-        <spring-kafka.version>2.9.13</spring-kafka.version>
-        <zookeeper.version>3.8.1</zookeeper.version>
-        <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
-        <mysql-connection-j.version>8.0.33</mysql-connection-j.version>
-        <mariadb-java-client.version>2.7.12</mariadb-java-client.version>
-        <mariadb4j.version>2.5.3</mariadb4j.version>
-        <embedded-redis.version>0.6</embedded-redis.version>
-        <xmlunit.version>2.9.1</xmlunit.version>
-    </properties>
-
-    <dependencies>
-
-        <!-- Microsphere -->
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-java-core</artifactId>
-        </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-assertj</artifactId>
-            <version>${xmlunit.version}</version>
-        </dependency>
-
-        <!-- Spring Framework -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Zookeeper -->
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
-
-        <!-- Embedded Redis -->
-        <dependency>
-            <groupId>com.github.kstyrc</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <version>${embedded-redis.version}</version>
-        </dependency>
-
-        <!-- SQLLite -->
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-            <version>${sqlite-jdbc.version}</version>
-        </dependency>
-
-        <!-- MySQL JDBC Driver -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>${mysql-connection-j.version}</version>
-        </dependency>
-
-        <!-- MariaDB Connector/J-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>${mariadb-java-client.version}</version>
-        </dependency>
-
-        <!-- MariaDB4j -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-            <version>${mariadb4j.version}</version>
-        </dependency>
-
-        <!-- Spring Redis -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <version>${spring-data-redis.version}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>io.lettuce</groupId>
-            <artifactId>lettuce-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Spring Kafka -->
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <version>${spring-kafka.version}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka-test</artifactId>
-            <version>${spring-kafka.version}</version>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
deleted file mode 100644
index aabe47b4..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.microsphere.spring.test;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanNameGenerator;
-import org.springframework.context.annotation.AnnotationBeanNameGenerator;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.type.AnnotationMetadata;
-
-/**
- * Class {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class ClassImportBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private final String[] beanClassNames;
-
-    private final BeanNameGenerator beanNameGenerator;
-
-    public ClassImportBeanDefinitionRegistrar(String[] beanClassNames) {
-        this.beanClassNames = beanClassNames;
-        this.beanNameGenerator = new AnnotationBeanNameGenerator();
-    }
-
-    @Override
-    public final void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        for (String beanClassName : beanClassNames) {
-            registerBeanDefinition(beanClassName, registry);
-        }
-    }
-
-    private void registerBeanDefinition(String beanClassName, BeanDefinitionRegistry registry) {
-        BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(beanClassName);
-        BeanDefinition beanDefinition = beanDefinitionBuilder.getBeanDefinition();
-        String beanName = beanNameGenerator.generateBeanName(beanDefinition, registry);
-        registry.registerBeanDefinition(beanName, beanDefinition);
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
deleted file mode 100644
index ccbaf226..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.microsphere.spring.test.context.annotation;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.core.type.StandardMethodMetadata;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Method;
-
-/**
- * {@link AnnotatedTypeMetadata} Test Factory
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class AnnotatedTypeMetadataTestFactory implements BeanClassLoaderAware {
-
-    private ClassLoader classLoader;
-
-    public AnnotatedTypeMetadata createMethodAnnotatedTypeMetadata() {
-        Method method = findTestMethod();
-        return new StandardMethodMetadata(method);
-    }
-
-    private Method findTestMethod() {
-        StackTraceElement[] stackTraces = Thread.currentThread().getStackTrace();
-        StackTraceElement stackTrace = stackTraces[3];
-        String className = stackTrace.getClassName();
-        String methodName = stackTrace.getMethodName();
-        Class<?> targetClass = ClassUtils.resolveClassName(className, classLoader);
-        return ReflectionUtils.findMethod(targetClass, methodName);
-    }
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
deleted file mode 100644
index 580e5e68..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.microsphere.spring.test.context.annotation;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-
-/**
- * {@link ConditionContext} test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class TestConditionContext implements ConditionContext, ApplicationContextAware {
-
-    private ConfigurableApplicationContext applicationContext;
-
-    @Override
-    public BeanDefinitionRegistry getRegistry() {
-        return (BeanDefinitionRegistry) applicationContext.getBeanFactory();
-    }
-
-    @Override
-    public ConfigurableListableBeanFactory getBeanFactory() {
-        return applicationContext.getBeanFactory();
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        return applicationContext.getEnvironment();
-    }
-
-    @Override
-    public ResourceLoader getResourceLoader() {
-        return applicationContext;
-    }
-
-    @Override
-    public ClassLoader getClassLoader() {
-        return applicationContext.getClassLoader();
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = (ConfigurableApplicationContext) applicationContext;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
deleted file mode 100644
index 03760784..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import ch.vorburger.mariadb4j.DB;
-import ch.vorburger.mariadb4j.DBConfigurationBuilder;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.util.StringUtils;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.annotation.Annotation;
-import java.util.Properties;
-import java.util.StringJoiner;
-
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * Embedded database {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedDatabase
- * @since 1.0.0
- */
-class EmbeddedDataBaseBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedDatabase.class;
-
-    private static final String INTERNAL_USE_PROPERTY_NAME_PREFIX = "_";
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        registerBeanDefinitions(attributes, registry);
-    }
-
-    void registerBeanDefinitions(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        EmbeddedDatabaseType type = attributes.getEnum("type");
-
-        switch (type) {
-            case SQLITE:
-                processSQLite(attributes, registry);
-                break;
-            case MARIADB:
-                processMariaDB(attributes, registry);
-                break;
-        }
-    }
-
-    private void processSQLite(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        registerSQLiteDataSourceBeanDefinition(attributes, registry);
-    }
-
-    private void processMariaDB(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        int port = attributes.getNumber("port");
-        Properties properties = resolveProperties(attributes, registry);
-        startEmbeddedMariaDB4j(port, properties);
-        registerMariaDBDataSourceBeanDefinition(port, attributes, registry);
-    }
-
-    private void registerSQLiteDataSourceBeanDefinition(AnnotationAttributes attributes,
-                                                        BeanDefinitionRegistry registry) {
-        registerDataSourceBeanDefinition("jdbc:sqlite::memory:", attributes, registry);
-    }
-
-    private void startEmbeddedMariaDB4j(int port, Properties properties) {
-        DBConfigurationBuilder configBuilder = DBConfigurationBuilder.newBuilder();
-        configBuilder.setPort(port);
-        String sqlSource = properties.getProperty("_sql.source");
-        ResourceLoader resourceLoader = new DefaultResourceLoader();
-        DB db = null;
-        try {
-            db = DB.newEmbeddedDB(configBuilder.build());
-            db.start();
-            if (StringUtils.hasText(sqlSource)) {
-                Resource resource = resourceLoader.getResource(sqlSource);
-                db.source(resource.getInputStream());
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void registerMariaDBDataSourceBeanDefinition(int port,
-                                                         AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        String jdbcURL = "jdbc:mariadb://127.0.0.1:" + port;
-        registerDataSourceBeanDefinition(jdbcURL, attributes, registry);
-    }
-
-    private void registerDataSourceBeanDefinition(String jdbcURL,
-                                                  AnnotationAttributes attributes,
-                                                  BeanDefinitionRegistry registry) {
-        String beanName = attributes.getString("dataSource");
-        boolean primary = attributes.getBoolean("primary");
-        Properties properties = resolveProperties(attributes, registry);
-
-        BeanDefinitionBuilder beanDefinitionBuilder = genericBeanDefinition(DriverManagerDataSource.class);
-        beanDefinitionBuilder.addConstructorArgValue(jdbcURL);
-        beanDefinitionBuilder.addConstructorArgValue(properties);
-        if (registry.containsBeanDefinition(beanName)) {
-            throw new BeanCreationException("The duplicated BeanDefinition with name : " + beanName);
-        }
-        AbstractBeanDefinition beanDefinition = beanDefinitionBuilder.getBeanDefinition();
-        beanDefinition.setPrimary(primary);
-        registry.registerBeanDefinition(beanName, beanDefinition);
-    }
-
-    private Properties resolveProperties(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        ConfigurableBeanFactory beanFactory = null;
-        if (registry instanceof ConfigurableBeanFactory) {
-            beanFactory = (ConfigurableBeanFactory) registry;
-        }
-        String[] values = attributes.getStringArray("properties");
-        if (values.length == 0) {
-            return null;
-        }
-        StringJoiner stringJoiner = new StringJoiner(System.lineSeparator());
-        for (String value : values) {
-            // TODO
-            // Resolve the placeholders
-            // If value starts with "_", ignored
-//            if (value.startsWith(INTERNAL_USE_PROPERTY_NAME_PREFIX)) {
-//                continue;
-//            }
-            String resolvedValue = beanFactory == null ? value :
-                    beanFactory.resolveEmbeddedValue(value);
-            stringJoiner.add(resolvedValue);
-        }
-        Properties properties = new Properties();
-        try {
-            properties.load(new StringReader(stringJoiner.toString()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return properties;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
deleted file mode 100644
index 72c6397a..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.type.AnnotationMetadata;
-
-import java.lang.annotation.Annotation;
-
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * {@link EnableEmbeddedDatabases} {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedDatabases
- * @see EmbeddedDataBaseBeanDefinitionRegistrar
- * @since 1.0.0
- */
-class EmbeddedDataBaseBeanDefinitionsRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedDatabases.class;
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        EmbeddedDataBaseBeanDefinitionRegistrar registrar = new EmbeddedDataBaseBeanDefinitionRegistrar();
-        for (AnnotationAttributes valueAttributes : attributes.getAnnotationArray("value")) {
-            registrar.registerBeanDefinitions(valueAttributes, registry);
-        }
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
deleted file mode 100644
index e94e6339..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-/**
- * Embedded database types
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public enum EmbeddedDatabaseType {
-
-    SQLITE,
-
-    /**
-     * MariaDB
-     */
-    MARIADB
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
deleted file mode 100644
index 25bae8dc..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import javax.sql.DataSource;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable an embedded database
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Import(EmbeddedDataBaseBeanDefinitionRegistrar.class)
-@Repeatable(EnableEmbeddedDatabases.class)
-public @interface EnableEmbeddedDatabase {
-
-    /**
-     * @return Embedded Database Type, SQLite as default
-     */
-    EmbeddedDatabaseType type() default EmbeddedDatabaseType.SQLITE;
-
-    /**
-     * JDBC connection port
-     *
-     * @return if not specified port, return <code>-1</code>
-     */
-    int port() default -1;
-
-    /**
-     * @return {@link DataSource} Bean Name
-     */
-    String dataSource();
-
-    /**
-     * @return Primary Bean or not
-     */
-    boolean primary() default false;
-
-    /**
-     * @return JDBC Properties Properties, Key-value
-     */
-    String[] properties() default {};
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
deleted file mode 100644
index 1cfa729d..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * {@link Repeatable} {@link EnableEmbeddedDatabase}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(EmbeddedDataBaseBeanDefinitionsRegistrar.class)
-public @interface EnableEmbeddedDatabases {
-
-    /**
-     * @return Multiple {@link EnableEmbeddedDatabase}
-     */
-    EnableEmbeddedDatabase[] value();
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
deleted file mode 100644
index 25c5ee54..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.support.Acknowledgment;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Composite {@link MessageListener}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class CompositeMessageListener<K, V> implements MessageListener<K, V> {
-
-    private final List<MessageListener<K, V>> messageListeners = new LinkedList<>();
-
-    public CompositeMessageListener<K, V> addMessageListener(MessageListener<K, V> messageListener) {
-        if (messageListener != this) {
-            this.messageListeners.add(messageListener);
-        }
-        return this;
-    }
-
-    public CompositeMessageListener<K, V> addMessageListeners(Iterable<MessageListener<K, V>> messageListeners) {
-        messageListeners.forEach(this::addMessageListener);
-        return this;
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Acknowledgment acknowledgment) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, acknowledgment);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Consumer<?, ?> consumer) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, consumer);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Acknowledgment acknowledgment, Consumer<?, ?> consumer) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, acknowledgment, consumer);
-        });
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
deleted file mode 100644
index f21403d7..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AliasFor;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable Kafka Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EmbeddedKafka
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@EmbeddedKafka
-@Import(KafkaTestConfiguration.class)
-public @interface EnableKafkaTest {
-
-    /**
-     * @return the number of brokers
-     */
-    @AliasFor(value = "value", annotation = EmbeddedKafka.class)
-    int brokers() default 1;
-
-    /**
-     * @return passed into {@code kafka.utils.TestUtils.createBrokerConfig()}.
-     */
-    @AliasFor(value = "controlledShutdown", annotation = EmbeddedKafka.class)
-    boolean controlledShutdown() default false;
-
-    /**
-     * Set explicit ports on which the kafka brokers will listen. Useful when running an
-     * embedded broker that you want to access from other processes.
-     * A port must be provided for each instance, which means the number of ports must match the value of the count attribute.
-     *
-     * @return ports for brokers.
-     * @since 2.2.4
-     */
-    @AliasFor(value = "ports", annotation = EmbeddedKafka.class)
-    int[] ports() default {9092};
-
-    /**
-     * @return partitions per topic
-     */
-    @AliasFor(value = "partitions", annotation = EmbeddedKafka.class)
-    int partitions() default 1;
-
-    /**
-     * Topics that should be created Topics may contain property placeholders, e.g.
-     * {@code topics = "${kafka.topic.one:topicOne}"} The topics will be created with
-     * {@link #partitions()} partitions; to provision other topics with other partition
-     * counts call the {@code addTopics(NewTopic... topics)} method on the autowired
-     * broker.
-     *
-     * @return the topics to create
-     */
-    @AliasFor(value = "topics", annotation = EmbeddedKafka.class)
-    String[] topics() default {};
-
-    /**
-     * Properties in form {@literal key=value} that should be added to the broker config
-     * before runs. Properties may contain property placeholders, e.g.
-     * {@code delete.topic.enable=${topic.delete:true}}.
-     *
-     * @return the properties to add
-     * @see #brokerPropertiesLocation()
-     * @see org.springframework.kafka.test.EmbeddedKafkaBroker#brokerProperties(java.util.Map)
-     */
-    @AliasFor(value = "brokerProperties", annotation = EmbeddedKafka.class)
-    String[] brokerProperties() default {
-            "listeners = PLAINTEXT://127.0.0.1:9092",
-            "auto.create.topics.enable = true"
-    };
-
-    /**
-     * Spring {@code Resource} url specifying the location of properties that should be
-     * added to the broker config. The {@code brokerPropertiesLocation} url and the
-     * properties themselves may contain placeholders that are resolved during
-     * initialization. Properties specified by {@link #brokerProperties()} will override
-     * properties found in {@code brokerPropertiesLocation}.
-     *
-     * @return a {@code Resource} url specifying the location of properties to add
-     * @see #brokerProperties()
-     * @see org.springframework.kafka.test.EmbeddedKafkaBroker#brokerProperties(java.util.Map)
-     */
-    @AliasFor(value = "brokerPropertiesLocation", annotation = EmbeddedKafka.class)
-    String brokerPropertiesLocation() default "";
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
deleted file mode 100644
index a1c87e54..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.GenericMessageListenerContainer;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.support.LoggingProducerListener;
-import org.springframework.kafka.support.ProducerListener;
-import org.springframework.kafka.support.converter.RecordMessageConverter;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import java.util.Map;
-import java.util.StringJoiner;
-
-/**
- * Kafka Test configuration
- *
- * @param <K> Key type
- * @param <V> Value type
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class KafkaTestConfiguration<K, V> {
-
-    private final RecordMessageConverter messageConverter;
-
-    private final ProducerListener<K, V> kafkaProducerListener;
-
-    public KafkaTestConfiguration(ObjectProvider<RecordMessageConverter> messageConverter,
-                                  ObjectProvider<ProducerListener<K, V>> kafkaProducerListener) {
-        this.messageConverter = messageConverter.getIfAvailable();
-        this.kafkaProducerListener = kafkaProducerListener.getIfAvailable(LoggingProducerListener::new);
-    }
-
-    @Bean
-    public KafkaTemplate<K, V> kafkaTemplate(EmbeddedKafkaBroker embeddedKafka) {
-        Map<String, Object> producerProps = KafkaTestUtils.producerProps(embeddedKafka);
-        ProducerFactory<K, V> pf = new DefaultKafkaProducerFactory<>(producerProps);
-        KafkaTemplate<K, V> kafkaTemplate = new KafkaTemplate(pf);
-        if (messageConverter != null) {
-            kafkaTemplate.setMessageConverter(messageConverter);
-        }
-        kafkaTemplate.setProducerListener(kafkaProducerListener);
-        return kafkaTemplate;
-    }
-
-    @Bean
-    public GenericMessageListenerContainer<K, V> messageListenerContainer(EmbeddedKafkaBroker embeddedKafka,
-                                                                          CompositeMessageListener<K, V> compositeMessageListener) {
-        String[] topics = embeddedKafka.getTopics().toArray(new String[0]);
-        StringJoiner nameBuilder = new StringJoiner("-");
-        nameBuilder.add("group");
-        for (String topic : topics) {
-            nameBuilder.add(topic);
-        }
-        String beanName = nameBuilder.toString();
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps(beanName, "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<K, V> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(topics);
-        KafkaMessageListenerContainer<K, V> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        container.setBeanName(beanName);
-        container.setupMessageListener(compositeMessageListener);
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-        return container;
-    }
-
-    @Bean
-    @Primary
-//    @Autowired(required = false)
-    public CompositeMessageListener<K, V> compositeMessageListener() {
-        CompositeMessageListener<K, V> compositeMessageListener = new CompositeMessageListener<>();
-//        compositeMessageListener.addMessageListeners(messageListeners);
-        return compositeMessageListener;
-    }
-
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
deleted file mode 100644
index d685004b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.microsphere.spring.test.kafka.embedded;
-
-import org.apache.kafka.common.KafkaException;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-
-/**
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see <a href="https://docs.spring.io/spring-kafka/docs/current/reference/html/#using-the-same-brokers-for-multiple-test-classes">EmbeddedKafkaHolder</a>
- * @since 1.0.0
- */
-public final class EmbeddedKafkaHolder {
-
-    private static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(1, false);
-
-    private static boolean started;
-
-    private EmbeddedKafkaHolder() {
-        super();
-    }
-
-    public static EmbeddedKafkaRule getEmbeddedKafka() {
-        if (!started) {
-            try {
-                embeddedKafka.before();
-            } catch (Exception e) {
-                throw new KafkaException(e);
-            }
-            started = true;
-        }
-        return embeddedKafka;
-    }
-
-}
\ No newline at end of file
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
deleted file mode 100644
index 0f83c41b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import redis.embedded.RedisServer;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable Redis Test configures the component list:
- * <ul>
- *     <li>{@link RedisTemplate RedisTemplate&lt;Object,Object&gt;}</li>
- *     <li>{@link StringRedisTemplate}</li>
- *     <li>{@link RedisServer}</li>
- * </ul>
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(RedisTestConfiguration.class)
-public @interface EnableRedisTest {
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
deleted file mode 100644
index 3960056d..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import io.microsphere.spring.test.redis.embedded.EnableEmbeddedRedisServer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import redis.embedded.RedisServer;
-
-/**
- * Redis test configuration class configures the component list：
- * <ul>
- *     <li>{@link RedisTemplate RedisTemplate&lt;Object,Object&gt;}</li>
- *     <li>{@link StringRedisTemplate}</li>
- *     <li>{@link RedisServer}</li>
- * </ul>
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@EnableEmbeddedRedisServer
-class RedisTestConfiguration {
-
-    @Bean
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        redisTemplate.setKeySerializer(stringRedisSerializer);
-        redisTemplate.setHashKeySerializer(stringRedisSerializer);
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-    @Bean
-    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        StringRedisTemplate redisTemplate = new StringRedisTemplate();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        redisTemplate.setKeySerializer(stringRedisSerializer);
-        redisTemplate.setHashKeySerializer(stringRedisSerializer);
-        redisTemplate.afterPropertiesSet();
-
-        return redisTemplate;
-    }
-
-    @Bean(destroyMethod = "destroy")
-    public LettuceConnectionFactory redisConnectionFactory() {
-        return new LettuceConnectionFactory(new RedisStandaloneConfiguration("127.0.0.1", 6379));
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
deleted file mode 100644
index 517ed226..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.StringUtils;
-import redis.embedded.RedisServer;
-import redis.embedded.RedisServerBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * Embedded Redis server {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedRedisServer
- * @since 1.0.0
- */
-class EmbeddedRedisServerBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedRedisServer.class;
-
-    private ResourceLoader resourceLoader;
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        RedisServer redisServer = resolveRedisServer(attributes);
-        BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(RedisServer.class, () -> redisServer);
-        beanDefinitionBuilder.setInitMethodName("start");
-        beanDefinitionBuilder.setDestroyMethodName("stop");
-
-        String beanName = attributes.getString("name");
-        registry.registerBeanDefinition(beanName, beanDefinitionBuilder.getBeanDefinition());
-    }
-
-    RedisServer resolveRedisServer(AnnotationAttributes attributes) {
-        RedisServerBuilder builder = RedisServer.builder();
-        Integer port = attributes.getNumber("port");
-        builder.port(port);
-
-        String slaveOf = attributes.getString("slaveOf");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(slaveOf)) {
-            String[] values = StringUtils.split(slaveOf, ":");
-            builder.slaveOf(values[0], Integer.decode(values[1]));
-        }
-
-        String configFile = attributes.getString("configFile");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(configFile)) {
-            Resource resource = resourceLoader.getResource(configFile);
-            try {
-                File redisConfFile = resource.getFile();
-                builder.configFile(redisConfFile.getAbsolutePath());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        String setting = attributes.getString("setting");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(setting)) {
-            builder.setting(setting);
-        }
-
-        return builder.build();
-    }
-
-    @Override
-    public void setResourceLoader(ResourceLoader resourceLoader) {
-        this.resourceLoader = resourceLoader;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
deleted file mode 100644
index c8ab4844..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable the embedded Redis server
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see redis.embedded.RedisServer
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(EmbeddedRedisServerBeanDefinitionRegistrar.class)
-public @interface EnableEmbeddedRedisServer {
-
-    /**
-     * No Definition
-     */
-    String NO_DEFINITION = "N/D";
-
-    /**
-     * @return Redis Server bean Name
-     */
-    String name() default "redisServer";
-
-    /**
-     * @return Redis Server port, default：6379
-     */
-    int port() default 6379;
-
-    /**
-     * @return Redis Server Slave addresses
-     */
-    String slaveOf() default NO_DEFINITION;
-
-    /**
-     * @return Redis Server config file
-     */
-    String configFile() default NO_DEFINITION;
-
-
-    /**
-     * @return Redis Server settings
-     */
-    String setting() default NO_DEFINITION;
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java b/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
deleted file mode 100644
index 3e98876b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.microsphere.test.util;
-
-import org.slf4j.Logger;
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Compatibility test tool
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class CompatibilityTestUtils {
-
-    public static final Predicate<Method> PUBLIC_METHOD_FILTER = method -> Modifier.isPublic(method.getModifiers())
-            && !Object.class.equals(method.getDeclaringClass());
-
-    public static final Predicate<Field> PUBLIC_STATIC_FIELD_FILTER = field -> {
-        int modifiers = field.getModifiers();
-        return Modifier.isStatic(modifiers) &&
-                Modifier.isPublic(modifiers) &&
-                !field.getType().equals(Logger.class) // Excluding log objects
-                ;
-    };
-
-    /**
-     * Test method compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     * @param methodFilter  Method filter
-     */
-    public static void testCompatibilityOnMethods(Class<?> originalClass, Class<?> testedClass, Predicate<Method> methodFilter) {
-        ReflectionUtils.doWithMethods(originalClass, method -> {
-            String methodName = method.getName();
-            Class<?> returnType = method.getReturnType();
-            Class<?>[] parameterTypes = method.getParameterTypes();
-            Method targetMethod = ReflectionUtils.findMethod(testedClass, methodName, parameterTypes);
-            assertNotNull(String.format("Method [Name: %s, parameter: %s] is not defined in target class [%s]!", methodName, Arrays.asList(parameterTypes), testedClass.getName()), targetMethod);
-            assertTrue(String.format("The return type of the original method [Name: %s, parameter: %s] is not compatible with the target method [%s]!", methodName, Arrays.asList(parameterTypes), method),
-                    targetMethod.getReturnType().isAssignableFrom(returnType));
-        }, method -> methodFilter == null ? true : methodFilter.test(method));
-    }
-
-    /**
-     * Testing field Compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     */
-    public static void testCompatibilityOnFields(Class<?> originalClass, Class<?> testedClass) {
-        testCompatibilityOnFields(originalClass, testedClass, null);
-    }
-
-    /**
-     * Testing field Compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     * @param fieldFilter   Field filter
-     */
-    public static void testCompatibilityOnFields(Class<?> originalClass, Class<?> testedClass, Predicate<Field> fieldFilter) {
-        List<String> errorMessages = new LinkedList<>();
-        ReflectionUtils.doWithFields(originalClass, field -> {
-            String fieldName = field.getName();
-            Class<?> fieldType = field.getType();
-            Field targetField = ReflectionUtils.findField(testedClass, fieldName, fieldType);
-            if (targetField == null) {
-                errorMessages.add(String.format("Field [Name: %s, Type: %s] not defined in target class [%s]!",
-                        fieldName, fieldType.getName(), testedClass.getName()));
-                return;
-            }
-
-
-            if (Modifier.isStatic(field.getModifiers())) {
-                Object fieldValue = field.get(null);
-                Object targetValue = targetField.get(null);
-                if (!Objects.equals(fieldValue, targetValue)) {
-                    errorMessages.add(originalClass.getName() + " , " + fieldName + " = " + fieldValue);
-                }
-            }
-
-        }, field -> fieldFilter == null ? true : fieldFilter.test(field));
-
-        errorMessages.forEach(System.err::println);
-
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
deleted file mode 100644
index d8f4028b..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static io.microsphere.spring.test.jdbc.embedded.EmbeddedDatabaseType.MARIADB;
-
-/**
- * {@link EnableEmbeddedDatabase} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Ignore
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = EnableEmbeddedDatabaseTest.class)
-@EnableEmbeddedDatabase(dataSource = "primary", primary = true)
-@EnableEmbeddedDatabase(dataSource = "secondary")
-@EnableEmbeddedDatabase(
-        type = MARIADB, port = 0, dataSource = "mariadbDataSource",
-        properties = {
-                "charset=utf-8",
-                "useSSL=false",
-                "useUnicode=true",
-                "_sql.source=classpath:/META-INF/mysql/manual_schema.sql"
-        }
-)
-public class EnableEmbeddedDatabaseTest {
-
-    private static final Logger logger = LoggerFactory.getLogger(EnableEmbeddedDatabaseTest.class);
-
-    @Autowired
-    @Qualifier("primary")
-    private DataSource dataSource;
-
-    @Autowired
-    @Qualifier("secondary")
-    private DataSource dataSource2;
-
-    @Autowired
-    @Qualifier("mariadbDataSource")
-    private DataSource mariadbDataSource;
-
-    @Test
-    public void test() throws SQLException {
-        Connection connection = dataSource.getConnection();
-        Statement statement = connection.createStatement();
-        statement.close();
-        connection.close();
-    }
-
-    @Test
-    public void testMariadbDataSource() throws Exception {
-        Connection connection = mariadbDataSource.getConnection();
-        Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery("SHOW databases");
-        while (resultSet.next()) {
-            String databaseName = resultSet.getString(1);
-            logger.info("database : {}", databaseName);
-        }
-        statement.close();
-        connection.close();
-    }
-}
-
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
deleted file mode 100644
index 58625218..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * {@link EmbeddedKafka}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        EmbeddedKafkaTest.class
-})
-@DirtiesContext
-@EmbeddedKafka(partitions = 1,
-        topics = {
-                "test-topic"
-        },
-        brokerProperties = {
-                "listeners = PLAINTEXT://127.0.0.1:9092",
-                "port = 9092",
-                "auto.create.topics.enable = true"
-        })
-public class EmbeddedKafkaTest {
-
-    private static final String TEMPLATE_TOPIC = "topic-EmbeddedKafkaTest";
-
-    @Autowired
-    private EmbeddedKafkaBroker embeddedKafka;
-
-    @Autowired
-    private KafkaTemplate<Object, Object> kafkaTemplate;
-
-    @Test
-    public void test() throws Throwable {
-        assertNotNull(kafkaTemplate);
-
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("test", "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<Object, Object> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Object, Object> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Object, Object>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Object, Object>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Object, Object> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-
-        kafkaTemplate.send(TEMPLATE_TOPIC, "Hello,World");
-
-        records.poll(10, TimeUnit.SECONDS);
-
-
-    }
-
-
-    @Test
-    public void testTemplate() throws Exception {
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("testT", "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<Integer, String>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Integer, String> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Integer, String>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Integer, String>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Integer, String> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-//        Map<String, Object> producerProps =
-//                KafkaTestUtils.producerProps(embeddedKafka);
-//        ProducerFactory<Integer, String> pf =
-//                new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-//        KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf);
-
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        kafkaTemplate.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        kafkaTemplate.sendDefault(0, 2, "bar");
-        ConsumerRecord<Integer, String> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        kafkaTemplate.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-
-        kafkaTemplate.sendDefault("Hello,World");
-        records.poll(10, TimeUnit.SECONDS);
-    }
-
-    @Bean
-    public KafkaTemplate<Object, Object> kafkaTemplate(EmbeddedKafkaBroker embeddedKafka) {
-        Map<String, Object> producerProps = KafkaTestUtils.producerProps(embeddedKafka);
-        ProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-        KafkaTemplate<Object, Object> kafkaTemplate = new KafkaTemplate(pf);
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        return kafkaTemplate;
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
deleted file mode 100644
index 946bffc4..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * {@link EnableKafkaTest} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        EnableKafkaTestCase.class
-})
-@DirtiesContext
-@EnableKafkaTest(topics = {
-        "test-topic"
-})
-public class EnableKafkaTestCase {
-
-    private static final String TEMPLATE_TOPIC = "topic-EnableKafkaTestCase";
-
-    @Autowired
-    private KafkaTemplate<Object, Object> kafkaTemplate;
-
-    @Autowired
-    private CompositeMessageListener<Object, Object> compositeMessageListener;
-
-    @Test
-    public void test() throws Exception {
-
-        final BlockingQueue<ConsumerRecord<Object, Object>> records = new LinkedBlockingQueue<>();
-        compositeMessageListener.addMessageListener(new MessageListener<Object, Object>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Object, Object> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-        });
-
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        kafkaTemplate.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        kafkaTemplate.sendDefault(0, 2, "bar");
-        ConsumerRecord<Object, Object> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        kafkaTemplate.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-
-        kafkaTemplate.sendDefault("Hello,World");
-        records.poll(10, TimeUnit.SECONDS);
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
deleted file mode 100644
index 31f3d761..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * TODO Comment
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since TODO
- */
-public class KafkaTemplateTests {
-
-    private static final String TEMPLATE_TOPIC = "topic-KafkaTemplateTests";
-
-    @ClassRule
-    public static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(1, true, TEMPLATE_TOPIC);
-
-    @Test
-    public void testTemplate() throws Exception {
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("testT", "false",
-                embeddedKafka.getEmbeddedKafka());
-        DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<Integer, String>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Integer, String> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Integer, String>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Integer, String>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Integer, String> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container,
-                embeddedKafka.getEmbeddedKafka().getPartitionsPerTopic());
-        Map<String, Object> producerProps =
-                KafkaTestUtils.producerProps(embeddedKafka.getEmbeddedKafka());
-        ProducerFactory<Integer, String> pf =
-                new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-        KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf);
-        template.setDefaultTopic(TEMPLATE_TOPIC);
-        template.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        template.sendDefault(0, 2, "bar");
-        ConsumerRecord<Integer, String> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        template.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-    }
-
-}
\ No newline at end of file
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
deleted file mode 100644
index f1370db8..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link RedisTestConfiguration} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@EnableRedisTest
-@ContextConfiguration(classes = RedisTestConfigurationTest.class)
-public class RedisTestConfigurationTest {
-
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-    @Test
-    public void test() {
-        assertTrue(redisTemplate.opsForValue().setIfAbsent("Hello", "World"));
-        assertEquals("World", redisTemplate.opsForValue().get("Hello"));
-        assertTrue(stringRedisTemplate.opsForValue().setIfPresent("Hello", "World"));
-        assertEquals("World", stringRedisTemplate.opsForValue().get("Hello"));
-    }
-
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
deleted file mode 100644
index 9f79ff62..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import redis.embedded.RedisServer;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link EnableEmbeddedRedisServer} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = EnableEmbeddedRedisServerTest.class)
-@EnableEmbeddedRedisServer(port = 6380)
-public class EnableEmbeddedRedisServerTest {
-
-    @Autowired
-    private RedisServer redisServer;
-
-    @Test
-    public void test() {
-        assertTrue(redisServer.isActive());
-    }
-}
diff --git a/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql b/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql
deleted file mode 100644
index a8809f5f..00000000
--- a/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql
+++ /dev/null
@@ -1,71 +0,0 @@
-DROP SCHEMA IF EXISTS demo_ds;
-DROP SCHEMA IF EXISTS demo_ds_0;
-DROP SCHEMA IF EXISTS demo_ds_1;
-
-DROP SCHEMA IF EXISTS demo_write_ds;
-DROP SCHEMA IF EXISTS demo_read_ds_0;
-DROP SCHEMA IF EXISTS demo_read_ds_1;
-
-DROP SCHEMA IF EXISTS demo_write_ds_0;
-DROP SCHEMA IF EXISTS demo_write_ds_0_read_0;
-DROP SCHEMA IF EXISTS demo_write_ds_0_read_1;
-DROP SCHEMA IF EXISTS demo_write_ds_1;
-DROP SCHEMA IF EXISTS demo_write_ds_1_read_0;
-DROP SCHEMA IF EXISTS demo_write_ds_1_read_1;
-
-DROP SCHEMA IF EXISTS shadow_demo_ds;
-DROP SCHEMA IF EXISTS shadow_demo_ds_0;
-DROP SCHEMA IF EXISTS shadow_demo_ds_1;
-
-DROP SCHEMA IF EXISTS demo_shadow_write_ds;
-DROP SCHEMA IF EXISTS demo_shadow_read_ds;
-DROP SCHEMA IF EXISTS demo_read_ds;
-
-CREATE SCHEMA IF NOT EXISTS demo_ds;
-CREATE SCHEMA IF NOT EXISTS demo_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_write_ds;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_1;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_1;
-
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds;
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds_0;
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_shadow_write_ds;
-CREATE SCHEMA IF NOT EXISTS demo_shadow_read_ds;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds;
-
--- Should sync from master-salve automatically
--- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
-
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
-
--- CREATE TABLE IF NOT EXISTS demo_shadow_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
diff --git a/pom.xml b/pom.xml
index 48e14e62..bdac80e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
         <module>microsphere-spring-webmvc</module>
         <module>microsphere-spring-webflux</module>
         <module>microsphere-spring-guice</module>
-        <module>microsphere-spring-test</module>
     </modules>
 
     <distributionManagement>

From ddc88d5c2405b91b1d9af65a3988da01b4ee557d Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 13:45:56 +0800
Subject: [PATCH 038/157] Update
 InterceptingApplicationEventMulticasterProxy.java

---
 ...ptingApplicationEventMulticasterProxy.java | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
index b0aa4ae7..d4fce891 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
@@ -29,10 +29,13 @@
 import org.springframework.core.env.Environment;
 import org.springframework.lang.Nullable;
 
+import java.lang.reflect.Method;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.function.Predicate;
 
+import static io.microsphere.reflect.MethodUtils.findDeclaredMethod;
+import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.context.event.InterceptingApplicationEventMulticaster.resolveEventType;
 import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
 import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
@@ -62,6 +65,18 @@ public class InterceptingApplicationEventMulticasterProxy extends GenericBeanPos
      */
     public static final String DEFAULT_RESET_BEAN_NAME = APPLICATION_EVENT_MULTICASTER_BEAN_NAME + "_ORIGINAL";
 
+    /**
+     * The method name of {@link ApplicationEventMulticaster#removeApplicationListeners(Predicate)}
+     * since Spring Framework 5.3.5
+     */
+    private static final Method removeApplicationListenersMethod = findDeclaredMethod(ApplicationEventMulticaster.class, "removeApplicationListeners", Predicate.class);
+
+    /**
+     * The method name of {@link ApplicationEventMulticaster#removeApplicationListenerBeans(Predicate)}
+     * since Spring Framework 5.3.5
+     */
+    private static final Method removeApplicationListenerBeansMethod = findDeclaredMethod(ApplicationEventMulticaster.class, "removeApplicationListenerBeans", Predicate.class);
+
     private final String delegateBeanName;
 
     private ApplicationEventMulticaster delegate;
@@ -100,14 +115,12 @@ public void removeApplicationListenerBean(String listenerBeanName) {
         delegate.removeApplicationListenerBean(listenerBeanName);
     }
 
-    @Override
     public void removeApplicationListeners(Predicate<ApplicationListener<?>> predicate) {
-        delegate.removeApplicationListeners(predicate);
+        invokeMethod(this.delegate, removeApplicationListenersMethod, predicate);
     }
 
-    @Override
     public void removeApplicationListenerBeans(Predicate<String> predicate) {
-        delegate.removeApplicationListenerBeans(predicate);
+        invokeMethod(this.delegate, removeApplicationListenerBeansMethod, predicate);
     }
 
     @Override

From a21c2faa31872668d207158d9855f6edf10396c9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 17:25:19 +0800
Subject: [PATCH 039/157] Remove the Spring Versions that start with 6.x

---
 .../spring/core/SpringVersion.java            | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
index 3e329c34..fc1bdbf9 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
@@ -411,33 +411,27 @@ public enum SpringVersion {
 
     SPRING_5_3_29,
 
-    SPRING_6,
+    SPRING_5_3_30,
 
-    SPRING_6_0,
+    SPRING_5_3_31,
 
-    SPRING_6_0_0,
+    SPRING_5_3_32,
 
-    SPRING_6_0_1,
+    SPRING_5_3_33,
 
-    SPRING_6_0_2,
+    SPRING_5_3_34,
 
-    SPRING_6_0_3,
+    SPRING_5_3_35,
 
-    SPRING_6_0_4,
+    SPRING_5_3_36,
 
-    SPRING_6_0_5,
+    SPRING_5_3_37,
 
-    SPRING_6_0_6,
+    SPRING_5_3_38,
 
-    SPRING_6_0_7,
+    SPRING_5_3_39,
 
-    SPRING_6_0_8,
-
-    SPRING_6_0_9,
-
-    SPRING_6_0_10,
-
-    SPRING_6_0_11;
+    CURRENT(Version.of(org.springframework.core.SpringVersion.getVersion()));;
 
     private final Version version;
 
@@ -445,6 +439,10 @@ public enum SpringVersion {
         this.version = resolveVersion(name());
     }
 
+    SpringVersion(Version version) {
+        this.version = version;
+    }
+
     static Version resolveVersion(String name) {
         String version = name.substring(7).replace(UNDER_SCORE_CHAR, DOT_CHAR);
         return Version.of(version);

From fbeeebc97b58fe90ab72f5a1750fa025717e4a5c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 2 Dec 2024 17:25:23 +0800
Subject: [PATCH 040/157] Update SpringVersionTest.java

---
 .../java/io/microsphere/spring/core/SpringVersionTest.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
index aad3c4b7..ed6c048e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
@@ -34,6 +34,9 @@ public class SpringVersionTest {
     @Test
     public void testGetVersion() {
         for (SpringVersion springVersion : SpringVersion.values()) {
+            if (SpringVersion.CURRENT.equals(springVersion)) {
+                continue;
+            }
             Version version = resolveVersion(springVersion.name());
             assertEquals(springVersion.getVersion(), version);
             assertTrue(springVersion.eq(version));

From 8d3eac8732834e23941073ca50c751700dbb51cb Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Sat, 14 Dec 2024 16:59:26 +0800
Subject: [PATCH 041/157] Update pom.xml

---
 microsphere-spring-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index f3c4ab2f..2f80b617 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -19,7 +19,7 @@
     <description>Microsphere Spring Parent</description>
 
     <properties>
-        <microsphere-java.version>0.0.7</microsphere-java.version>
+        <microsphere-java.version>0.0.8</microsphere-java.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <jackson.version>2.18.2</jackson.version>
         <snakeyaml.version>2.3</snakeyaml.version>

From 35463a1017327b748bbb9bedc3782528c22be3e8 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 16 Dec 2024 15:07:55 +0800
Subject: [PATCH 042/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index da436a3c..a1f59d28 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -20,7 +20,11 @@ jobs:
     strategy:
       matrix:
         java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [ 'spring-boot-2.7' , 'spring-boot-2.6', 'spring-boot-2.5' ]
+        maven-profile-spring-boot: [
+          'spring-framework-5.3' , 'spring-framework-5.2', 'spring-framework-5.1' , 'spring-framework-5.0' ,
+          'spring-framework-4.3' , 'spring-framework-4.2' , 'spring-framework-4.1', 'spring-framework-4.0' ,
+          'spring-framework-3.2'
+        ]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From 470fa67e3213275f42e5d81af36e2b58a3c18304 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 16 Dec 2024 15:08:15 +0800
Subject: [PATCH 043/157] Polish #34

---
 .../spring/util/BeanFactoryUtils.java         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
index f1ee84b7..1621252f 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
@@ -20,10 +20,13 @@
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.lang.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -171,4 +174,21 @@ public static Set<Class<?>> getResolvableDependencyTypes(DefaultListableBeanFact
         return resolvableDependencies == null ? emptySet() : resolvableDependencies.keySet();
     }
 
+    /**
+     * Get all instances of {@link BeanPostProcessor} in the specified {@link BeanFactory}
+     *
+     * @param beanFactory {@link BeanFactory}
+     * @return non-null {@link List}
+     */
+    public static List<BeanPostProcessor> getBeanPostProcessors(@Nullable BeanFactory beanFactory) {
+        final List<BeanPostProcessor> beanPostProcessors;
+        if (beanFactory instanceof AbstractBeanFactory) {
+            AbstractBeanFactory abf = (AbstractBeanFactory) beanFactory;
+            beanPostProcessors = unmodifiableList(abf.getBeanPostProcessors());
+        } else {
+            beanPostProcessors = emptyList();
+        }
+        return beanPostProcessors;
+    }
+
 }

From 4b40752814106b132df86982027baf982ec734aa Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 16 Dec 2024 15:08:30 +0800
Subject: [PATCH 044/157] Polish #34

---
 .../spring/util/ApplicationContextUtils.java  | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
index 3a9c382b..37cf96a1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
@@ -17,9 +17,18 @@
 package io.microsphere.spring.util;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.SpringVersion;
+import org.springframework.lang.NonNull;
 
+import java.util.List;
+
+import static io.microsphere.spring.util.BeanFactoryUtils.getBeanPostProcessors;
+import static io.microsphere.text.FormatUtils.format;
+import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static io.microsphere.util.ClassUtils.cast;
 
 /**
@@ -30,6 +39,19 @@
  */
 public abstract class ApplicationContextUtils {
 
+    /**
+     * The {@link org.springframework.context.support.ApplicationContextAwareProcessor} Class Name (Internal).
+     *
+     * @see org.springframework.context.support.ApplicationContextAwareProcessor
+     */
+    public static final String APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME = "org.springframework.context.support.ApplicationContextAwareProcessor";
+    /**
+     * The {@link org.springframework.context.support.ApplicationContextAwareProcessor} Class (Internal).
+     *
+     * @see org.springframework.context.support.ApplicationContextAwareProcessor
+     */
+    private static final Class<?> APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS = resolveClass(APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME);
+
     public static ConfigurableApplicationContext asConfigurableApplicationContext(ApplicationContext context) {
         return cast(context, ConfigurableApplicationContext.class);
     }
@@ -37,4 +59,41 @@ public static ConfigurableApplicationContext asConfigurableApplicationContext(Ap
     public static ApplicationContext asApplicationContext(BeanFactory beanFactory) {
         return cast(beanFactory, ApplicationContext.class);
     }
+
+    /**
+     * Get the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
+     *
+     * @return the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
+     */
+    @NonNull
+    public static BeanPostProcessor getApplicationContextAwareProcessor(ConfigurableApplicationContext context) {
+        ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+        return getApplicationContextAwareProcessor(beanFactory);
+    }
+
+    /**
+     * Get the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
+     *
+     * @return the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
+     */
+    @NonNull
+    public static BeanPostProcessor getApplicationContextAwareProcessor(BeanFactory beanFactory) {
+        List<BeanPostProcessor> beanPostProcessors = getBeanPostProcessors(beanFactory);
+        BeanPostProcessor applicationContextAwareProcessor = null;
+        for (BeanPostProcessor beanPostProcessor : beanPostProcessors) {
+            if (beanPostProcessor.getClass().equals(APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS)) {
+                applicationContextAwareProcessor = beanPostProcessor;
+                break;
+            }
+        }
+        if (applicationContextAwareProcessor == null) {
+            String message = format("The BeanPostProcessor[class : '{}' , present : {}] was not added in the BeanFactory[{}] @ Spring Framework '{}'",
+                    APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME,
+                    APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS != null,
+                    SpringVersion.getVersion());
+            throw new IllegalStateException(message);
+        }
+        return applicationContextAwareProcessor;
+    }
+
 }

From ea263bf234704b0b535f935b510c086de64d9eac Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 16 Dec 2024 15:08:42 +0800
Subject: [PATCH 045/157] Polish #34

---
 .../io/microsphere/spring/util/BeanUtils.java | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index 52d368fa..b1b963d0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.EmbeddedValueResolver;
@@ -42,9 +43,11 @@
 import java.util.Map;
 
 import static io.microsphere.spring.util.ApplicationContextUtils.asConfigurableApplicationContext;
+import static io.microsphere.spring.util.ApplicationContextUtils.getApplicationContextAwareProcessor;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.util.ClassLoaderUtils.isPresent;
+import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
 import static org.springframework.beans.factory.BeanFactoryUtils.beanNamesForTypeIncludingAncestors;
@@ -65,7 +68,7 @@ public abstract class BeanUtils {
 
     private static final String[] EMPTY_BEAN_NAMES = new String[0];
 
-    private static final boolean APPLICATION_STARTUP_CLASS_PRESENT = isPresent("org.springframework.core.metrics.ApplicationStartup", null);
+    private static final Class<?> APPLICATION_STARTUP_CLASS = resolveClass("org.springframework.core.metrics.ApplicationStartup");
 
     /**
      * Is Bean Present or not?
@@ -75,12 +78,9 @@ public abstract class BeanUtils {
      * @return If present , return <code>true</code> , or <code>false</code>
      */
     public static boolean isBeanPresent(ListableBeanFactory beanFactory, Class<?> beanClass) {
-
         return isBeanPresent(beanFactory, beanClass, false);
-
     }
 
-
     /**
      * Is Bean Present or not?
      *
@@ -574,35 +574,9 @@ static void invokeAwareInterfaces(Object bean, ApplicationContext context, @Null
 
         invokeBeanFactoryAwareInterfaces(bean, beanFactory, beanFactory);
 
-        if (bean instanceof EnvironmentAware) {
-            ((EnvironmentAware) bean).setEnvironment(context.getEnvironment());
-        }
-
-        if (bean instanceof EmbeddedValueResolverAware && beanFactory != null) {
-            StringValueResolver embeddedValueResolver = new EmbeddedValueResolver(beanFactory);
-            ((EmbeddedValueResolverAware) bean).setEmbeddedValueResolver(embeddedValueResolver);
-        }
-
-        if (bean instanceof ResourceLoaderAware) {
-            ((ResourceLoaderAware) bean).setResourceLoader(context);
-        }
+        BeanPostProcessor beanPostProcessor = getApplicationContextAwareProcessor(beanFactory);
 
-        if (bean instanceof ApplicationEventPublisherAware) {
-            ((ApplicationEventPublisherAware) bean).setApplicationEventPublisher(context);
-        }
-
-        if (bean instanceof MessageSourceAware) {
-            ((MessageSourceAware) bean).setMessageSource(context);
-        }
-
-        if (APPLICATION_STARTUP_CLASS_PRESENT) {
-            if (bean instanceof ApplicationStartupAware && applicationContext != null) {
-                ((ApplicationStartupAware) bean).setApplicationStartup(applicationContext.getApplicationStartup());
-            }
-        }
-        if (bean instanceof ApplicationContextAware) {
-            ((ApplicationContextAware) bean).setApplicationContext(context);
-        }
+        beanPostProcessor.postProcessBeforeInitialization(bean, "");
     }
 
     /**

From eea6304ecd6d01d41172e74d4d9a83f230f323c3 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 16 Dec 2024 15:08:48 +0800
Subject: [PATCH 046/157] Update pom.xml

---
 microsphere-spring-jdbc/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/microsphere-spring-jdbc/pom.xml b/microsphere-spring-jdbc/pom.xml
index 07c08c55..2d8c8585 100644
--- a/microsphere-spring-jdbc/pom.xml
+++ b/microsphere-spring-jdbc/pom.xml
@@ -67,12 +67,5 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-spring-test</artifactId>
-            <version>${revision}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>
\ No newline at end of file

From 67f8675120b69adef6935719476dce40646b52c5 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 17 Dec 2024 17:50:23 +0800
Subject: [PATCH 047/157] Polish #34

---
 microsphere-spring-webmvc/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/microsphere-spring-webmvc/pom.xml b/microsphere-spring-webmvc/pom.xml
index 51fa5724..61470cfd 100644
--- a/microsphere-spring-webmvc/pom.xml
+++ b/microsphere-spring-webmvc/pom.xml
@@ -34,6 +34,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Spring Web -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Spring WebMVC -->
         <dependency>
             <groupId>org.springframework</groupId>

From 7d15c4dd4b35cbe7b40e4424815e07fc73f823be Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 17 Dec 2024 17:50:31 +0800
Subject: [PATCH 048/157] Polish #34

---
 .../context/event/BeanFactoryListeners.java   |   8 +-
 .../spring/context/event/BeanListeners.java   |   8 +-
 .../io/microsphere/spring/core/SpringAPI.java |  84 +++++++++
 .../spring/util/ApplicationContextUtils.java  |  19 +-
 .../spring/util/BeanRegistrar.java            |   5 +
 .../io/microsphere/spring/util/BeanUtils.java |   8 +-
 .../main/resources/META-INF/spring-api.json   |  17 ++
 .../spring/util/BeanUtilsTest.java            |   1 -
 .../spring/util/FieldUtilsTest.java           |  14 +-
 .../util/SpringFactoriesLoaderUtilsTest.java  |   3 +-
 .../io/microsphere/spring/util/TestBean.java  |  18 +-
 .../annotation/EnableP6DataSourceTest.java    | 136 +++++++-------
 .../P6DataSourceBeanPostProcessorTest.java    | 122 ++++++------
 .../AbstractWebEndpointMappingFactory.java    |   2 +-
 .../spring/web/util/WebRequestUtils.java      |  19 +-
 ...pingMetadataWebEndpointMappingFactory.java |  29 ++-
 .../spring/webmvc/IdempotentException.java    |  62 ++++---
 .../spring/webmvc/annotation/Idempotent.java  |  74 ++++----
 .../webmvc/config/IdempotentConfig.java       |  46 +++++
 .../webmvc/controller/TestController.java     |  43 +++++
 ...tentAnnotatedMethodHandlerInterceptor.java | 146 +++++++--------
 .../bootstrap/IdempotentWebApplication.java   |  75 --------
 ...pingInfoWebEndpointMappingFactoryTest.java | 173 ++++++++++--------
 23 files changed, 624 insertions(+), 488 deletions(-)
 create mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
 create mode 100644 microsphere-spring-context/src/main/resources/META-INF/spring-api.json
 create mode 100644 microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/config/IdempotentConfig.java
 create mode 100644 microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/controller/TestController.java
 delete mode 100644 microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
index 49c9d546..f5118135 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
@@ -97,9 +98,10 @@ private void iterate(Consumer<BeanFactoryListener> listenerConsumer, String acti
     }
 
     void registerBean(BeanDefinitionRegistry registry) {
-        BeanDefinitionBuilder beanDefinitionBuilder = rootBeanDefinition(BeanFactoryListeners.class, () -> this);
-        beanDefinitionBuilder.setPrimary(true);
-        registry.registerBeanDefinition(BEAN_NAME, beanDefinitionBuilder.getBeanDefinition());
+//        BeanDefinitionBuilder beanDefinitionBuilder = rootBeanDefinition(BeanFactoryListeners.class, () -> this);
+//        beanDefinitionBuilder.setPrimary(true);
+//        registry.registerBeanDefinition(BEAN_NAME, beanDefinitionBuilder.getBeanDefinition());
+        registerFactoryBean(registry, BEAN_NAME, this);
     }
 
     static BeanFactoryListeners getBean(BeanFactory beanFactory) {
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
index 5828d48b..c6ef4617 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
@@ -173,9 +174,10 @@ private boolean isIgnored(String beanName) {
     }
 
     void registerBean(BeanDefinitionRegistry registry) {
-        BeanDefinitionBuilder beanDefinitionBuilder = rootBeanDefinition(BeanListeners.class, () -> this);
-        beanDefinitionBuilder.setPrimary(true);
-        registry.registerBeanDefinition(BEAN_NAME, beanDefinitionBuilder.getBeanDefinition());
+//        BeanDefinitionBuilder beanDefinitionBuilder = rootBeanDefinition(BeanListeners.class, () -> this);
+//        beanDefinitionBuilder.setPrimary(true);
+//        registry.registerBeanDefinition(BEAN_NAME, beanDefinitionBuilder.getBeanDefinition());
+        registerFactoryBean(registry, BEAN_NAME, this);
     }
 
     static BeanListeners getBean(BeanFactory beanFactory) {
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
new file mode 100644
index 00000000..9b6f47d8
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.core;
+
+import org.springframework.lang.Nullable;
+
+import static io.microsphere.spring.core.SpringVersion.SPRING_4_1;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_3;
+import static io.microsphere.util.ClassLoaderUtils.resolveClass;
+
+/**
+ * The enumeration of Spring API
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see Enum
+ * @see SpringVersion
+ * @since 1.0.0
+ */
+public enum SpringAPI {
+
+    /**
+     * {@link org.springframework.beans.factory.SmartInitializingSingleton} since Spring Framework 4.1
+     */
+    SMART_INITIALIZING_SINGLETON("org.springframework.beans.factory.SmartInitializingSingleton", SPRING_4_1),
+
+    /**
+     * {@link org.springframework.core.metrics.ApplicationStartup} since Spring Framework 5.3
+     */
+    APPLICATION_STARTUP("org.springframework.core.metrics.ApplicationStartup", SPRING_5_3),
+
+    /**
+     * The interface {@link org.springframework.core.metrics.ApplicationStartup} since Spring Framework 5.3
+     */
+    APPLICATION_STARTUP_AWARE("org.springframework.context.ApplicationStartupAware", SPRING_5_3);
+
+    private final String className;
+
+    private final SpringVersion since;
+
+    private final Class<?> revolvedClass;
+
+    SpringAPI(String className, SpringVersion since) {
+        this.className = className;
+        this.since = since;
+        this.revolvedClass = resolveClass(className);
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public SpringVersion getSince() {
+        return since;
+    }
+
+    @Nullable
+    public Class<?> getRevolvedClass() {
+        return revolvedClass;
+    }
+
+    /**
+     * Determine whether the API is present
+     *
+     * @return {@code true} if the API is present
+     */
+    public boolean isPresent() {
+        return revolvedClass != null;
+    }
+
+}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
index 37cf96a1..06cdb0fb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
@@ -16,6 +16,8 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -23,6 +25,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.SpringVersion;
 import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.List;
 
@@ -39,6 +42,8 @@
  */
 public abstract class ApplicationContextUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationContextUtils.class);
+
     /**
      * The {@link org.springframework.context.support.ApplicationContextAwareProcessor} Class Name (Internal).
      *
@@ -76,7 +81,7 @@ public static BeanPostProcessor getApplicationContextAwareProcessor(Configurable
      *
      * @return the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
      */
-    @NonNull
+    @Nullable
     public static BeanPostProcessor getApplicationContextAwareProcessor(BeanFactory beanFactory) {
         List<BeanPostProcessor> beanPostProcessors = getBeanPostProcessors(beanFactory);
         BeanPostProcessor applicationContextAwareProcessor = null;
@@ -87,11 +92,13 @@ public static BeanPostProcessor getApplicationContextAwareProcessor(BeanFactory
             }
         }
         if (applicationContextAwareProcessor == null) {
-            String message = format("The BeanPostProcessor[class : '{}' , present : {}] was not added in the BeanFactory[{}] @ Spring Framework '{}'",
-                    APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME,
-                    APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS != null,
-                    SpringVersion.getVersion());
-            throw new IllegalStateException(message);
+            if (logger.isWarnEnabled()) {
+                logger.warn("The BeanPostProcessor[class : '{}' , present : {}] was not added in the BeanFactory[{}] @ Spring Framework '{}'",
+                        APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME,
+                        APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS != null,
+                        beanFactory,
+                        SpringVersion.getVersion());
+            }
         }
         return applicationContextAwareProcessor;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
index 32994772..ab3f0687 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
@@ -229,8 +229,13 @@ public static int registerSpringFactoriesBeans(BeanDefinitionRegistry registry,
     }
 
     public static final void registerFactoryBean(BeanDefinitionRegistry registry, String beanName, Object bean) {
+        registerFactoryBean(registry, beanName, bean, false);
+    }
+
+    public static final void registerFactoryBean(BeanDefinitionRegistry registry, String beanName, Object bean, boolean primary) {
         AbstractBeanDefinition beanDefinition = genericBeanDefinition(DelegatingFactoryBean.class, bean);
         beanDefinition.setSource(bean);
+        beanDefinition.setPrimary(primary);
         registerBeanDefinition(registry, beanName, beanDefinition);
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index b1b963d0..7f9ff1d1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -16,13 +16,11 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.EmbeddedValueResolver;
 import org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.context.ApplicationStartupAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.EnvironmentAware;
@@ -34,7 +32,6 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.StringValueResolver;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,7 +43,6 @@
 import static io.microsphere.spring.util.ApplicationContextUtils.getApplicationContextAwareProcessor;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
-import static io.microsphere.util.ClassLoaderUtils.isPresent;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
@@ -576,7 +572,9 @@ static void invokeAwareInterfaces(Object bean, ApplicationContext context, @Null
 
         BeanPostProcessor beanPostProcessor = getApplicationContextAwareProcessor(beanFactory);
 
-        beanPostProcessor.postProcessBeforeInitialization(bean, "");
+        if (beanPostProcessor != null) {
+            beanPostProcessor.postProcessBeforeInitialization(bean, "");
+        }
     }
 
     /**
diff --git a/microsphere-spring-context/src/main/resources/META-INF/spring-api.json b/microsphere-spring-context/src/main/resources/META-INF/spring-api.json
new file mode 100644
index 00000000..1ee03837
--- /dev/null
+++ b/microsphere-spring-context/src/main/resources/META-INF/spring-api.json
@@ -0,0 +1,17 @@
+[
+  {
+    "org.springframework.beans.factory.SmartInitializingSingleton": {
+      "since": "4.1"
+    }
+  },
+  {
+    "org.springframework.core.metrics.ApplicationStartup": {
+      "since": "5.3"
+    }
+  },
+  {
+    "org.springframework.context.ApplicationStartupAware": {
+      "since": "5.3"
+    }
+  }
+]
\ No newline at end of file
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
index f2d0d415..ebd1cd00 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
@@ -321,7 +321,6 @@ public void testInvokeAwareInterfaces() {
         assertSame(testBean.getBeanFactory(), context.getBeanFactory());
         assertSame(testBean.getClassLoader(), context.getClassLoader());
         assertSame(testBean.getEnvironment(), context.getEnvironment());
-        assertSame(testBean.getApplicationStartup(), context.getApplicationStartup());
         assertSame(testBean.getResourceLoader(), context);
         assertNotNull(testBean.getResolver());
         context.close();
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java
index 4b3cc325..b33ce7c0 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java
@@ -17,21 +17,9 @@ public class FieldUtilsTest {
     @Test
     public void testGetField() {
 
-        String test = "test";
-
-        int hashCode = test.hashCode();
-
-        int hash = FieldUtils.getFieldValue(test, "hash", int.class);
-
-        Assert.assertEquals(hashCode, hash);
-
-        hash = FieldUtils.getFieldValue(test, "hash");
-
-        Assert.assertEquals(hashCode, hash);
-
         FieldUtilsTest instance = new FieldUtilsTest();
 
-        hash = FieldUtils.getFieldValue(instance, "data", 2);
+        int hash = FieldUtils.getFieldValue(instance, "data", 2);
 
         Assert.assertEquals(2, hash);
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
index a6b54562..db5d002d 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
@@ -49,6 +49,7 @@ public class SpringFactoriesLoaderUtilsTest {
     public void before() {
         context = new GenericApplicationContext();
         beanFactory = context.getDefaultListableBeanFactory();
+        context.refresh();
     }
 
     @Test
@@ -65,7 +66,6 @@ private void testLoadFactoriesFromBeanFactory(BeanFactory beanFactory) {
         TestBean testBean = (TestBean) beans.get(0);
         assertNull(testBean.getApplicationContext());
         assertNull(testBean.getApplicationEventPublisher());
-        assertNull(testBean.getApplicationStartup());
         assertNull(testBean.getResourceLoader());
         assertNull(testBean.getMessageSource());
         assertNull(testBean.getEnvironment());
@@ -85,7 +85,6 @@ private void testLoadFactoriesFromContext(ConfigurableBeanFactory beanFactory, A
 
         assertNotNull(testBean);
         assertNotNull(testBean.getResolver());
-        assertNotNull(testBean.getApplicationStartup());
 
         assertSame(context, testBean.getApplicationContext());
         assertSame(context, testBean.getApplicationEventPublisher());
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java
index 85304647..28130a57 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java
@@ -9,7 +9,6 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.context.ApplicationStartupAware;
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.MessageSource;
@@ -18,7 +17,6 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.metrics.ApplicationStartup;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringValueResolver;
 
@@ -34,7 +32,7 @@
 @Order(1)
 public class TestBean implements Bean, BeanFactoryAware, BeanClassLoaderAware, EnvironmentAware,
         EmbeddedValueResolverAware, ResourceLoaderAware, ApplicationEventPublisherAware, MessageSourceAware,
-        ApplicationStartupAware, ApplicationContextAware, BeanNameAware {
+        ApplicationContextAware, BeanNameAware {
 
     private ClassLoader classLoader;
 
@@ -44,8 +42,6 @@ public class TestBean implements Bean, BeanFactoryAware, BeanClassLoaderAware, E
 
     private ApplicationEventPublisher applicationEventPublisher;
 
-    private ApplicationStartup applicationStartup;
-
     private StringValueResolver resolver;
 
     private Environment environment;
@@ -76,11 +72,6 @@ public void setApplicationEventPublisher(ApplicationEventPublisher applicationEv
         this.applicationEventPublisher = applicationEventPublisher;
     }
 
-    @Override
-    public void setApplicationStartup(ApplicationStartup applicationStartup) {
-        this.applicationStartup = applicationStartup;
-    }
-
     @Override
     public void setEmbeddedValueResolver(StringValueResolver resolver) {
         this.resolver = resolver;
@@ -122,10 +113,6 @@ public ApplicationEventPublisher getApplicationEventPublisher() {
         return applicationEventPublisher;
     }
 
-    public ApplicationStartup getApplicationStartup() {
-        return applicationStartup;
-    }
-
     public StringValueResolver getResolver() {
         return resolver;
     }
@@ -155,7 +142,6 @@ public boolean equals(Object o) {
                 Objects.equals(beanFactory, testBean.beanFactory) &&
                 Objects.equals(applicationContext, testBean.applicationContext) &&
                 Objects.equals(applicationEventPublisher, testBean.applicationEventPublisher) &&
-                Objects.equals(applicationStartup, testBean.applicationStartup) &&
                 Objects.equals(resolver, testBean.resolver) &&
                 Objects.equals(environment, testBean.environment) &&
                 Objects.equals(messageSource, testBean.messageSource) &&
@@ -164,7 +150,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(classLoader, beanFactory, applicationContext, applicationEventPublisher, applicationStartup, resolver, environment, messageSource, resourceLoader);
+        return Objects.hash(classLoader, beanFactory, applicationContext, applicationEventPublisher, resolver, environment, messageSource, resourceLoader);
     }
 
 }
diff --git a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
index 2f2e3d7f..0ac8d48f 100644
--- a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
+++ b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
@@ -1,68 +1,68 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.jdbc.p6spy.annotation;
-
-import com.p6spy.engine.common.ConnectionInformation;
-import com.p6spy.engine.logging.LoggingEventListener;
-import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-/**
- * {@link EnableP6DataSource} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        EnableP6DataSourceTest.class
-})
-@EnableP6DataSource
-@EnableEmbeddedDatabase(dataSource = "testDataSource")
-public class EnableP6DataSourceTest extends LoggingEventListener {
-
-    @Autowired
-    @Qualifier("testDataSource")
-    private DataSource dataSource;
-
-    @Test
-    public void test() throws Exception {
-        Connection connection = dataSource.getConnection();
-        assertNotNull(connection);
-    }
-
-    @Override
-    public void onBeforeGetConnection(ConnectionInformation connectionInformation) {
-        try {
-            assertSame(dataSource.unwrap(DataSource.class), connectionInformation.getDataSource());
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.jdbc.p6spy.annotation;
+//
+//import com.p6spy.engine.common.ConnectionInformation;
+//import com.p6spy.engine.logging.LoggingEventListener;
+//import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import javax.sql.DataSource;
+//import java.sql.Connection;
+//import java.sql.SQLException;
+//
+//import static org.junit.Assert.assertNotNull;
+//import static org.junit.Assert.assertSame;
+//
+///**
+// * {@link EnableP6DataSource} Test
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@RunWith(SpringRunner.class)
+//@ContextConfiguration(classes = {
+//        EnableP6DataSourceTest.class
+//})
+//@EnableP6DataSource
+//@EnableEmbeddedDatabase(dataSource = "testDataSource")
+//public class EnableP6DataSourceTest extends LoggingEventListener {
+//
+//    @Autowired
+//    @Qualifier("testDataSource")
+//    private DataSource dataSource;
+//
+//    @Test
+//    public void test() throws Exception {
+//        Connection connection = dataSource.getConnection();
+//        assertNotNull(connection);
+//    }
+//
+//    @Override
+//    public void onBeforeGetConnection(ConnectionInformation connectionInformation) {
+//        try {
+//            assertSame(dataSource.unwrap(DataSource.class), connectionInformation.getDataSource());
+//        } catch (SQLException e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+//}
diff --git a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
index 20b068cc..4d79c8ae 100644
--- a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
+++ b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
@@ -1,61 +1,61 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.jdbc.p6spy.beans.factory.config;
-
-import com.p6spy.engine.spy.P6DataSource;
-import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.sql.DataSource;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * {@link P6DataSourceBeanPostProcessor} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {P6DataSourceBeanPostProcessor.class, P6DataSourceBeanPostProcessorTest.class})
-@TestPropertySource(properties = {"microsphere.jdbc.p6spy.excluded-datasource-beans=nonWrappedDataSource"})
-@EnableEmbeddedDatabase(dataSource = "nonWrappedDataSource")
-@EnableEmbeddedDatabase(dataSource = "wrappedDataSource")
-public class P6DataSourceBeanPostProcessorTest {
-
-    @Autowired
-    @Qualifier("nonWrappedDataSource")
-    private DataSource nonWrappedDataSource;
-
-    @Autowired
-    @Qualifier("wrappedDataSource")
-    private DataSource wrappedDataSource;
-
-    @Test
-    public void test() throws Exception {
-        assertEquals(DriverManagerDataSource.class, nonWrappedDataSource.getClass());
-        assertEquals(P6DataSource.class, wrappedDataSource.getClass());
-        assertEquals(DriverManagerDataSource.class, wrappedDataSource.unwrap(DataSource.class).getClass());
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.jdbc.p6spy.beans.factory.config;
+//
+//import com.p6spy.engine.spy.P6DataSource;
+//import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.jdbc.datasource.DriverManagerDataSource;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.TestPropertySource;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import javax.sql.DataSource;
+//
+//import static org.junit.Assert.assertEquals;
+//
+///**
+// * {@link P6DataSourceBeanPostProcessor} Test
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since 1.0.0
+// */
+//@RunWith(SpringRunner.class)
+//@ContextConfiguration(classes = {P6DataSourceBeanPostProcessor.class, P6DataSourceBeanPostProcessorTest.class})
+//@TestPropertySource(properties = {"microsphere.jdbc.p6spy.excluded-datasource-beans=nonWrappedDataSource"})
+//@EnableEmbeddedDatabase(dataSource = "nonWrappedDataSource")
+//@EnableEmbeddedDatabase(dataSource = "wrappedDataSource")
+//public class P6DataSourceBeanPostProcessorTest {
+//
+//    @Autowired
+//    @Qualifier("nonWrappedDataSource")
+//    private DataSource nonWrappedDataSource;
+//
+//    @Autowired
+//    @Qualifier("wrappedDataSource")
+//    private DataSource wrappedDataSource;
+//
+//    @Test
+//    public void test() throws Exception {
+//        assertEquals(DriverManagerDataSource.class, nonWrappedDataSource.getClass());
+//        assertEquals(P6DataSource.class, wrappedDataSource.getClass());
+//        assertEquals(DriverManagerDataSource.class, wrappedDataSource.unwrap(DataSource.class).getClass());
+//    }
+//}
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
index b8fd1c55..bb1cc223 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
@@ -33,7 +33,7 @@
  */
 public abstract class AbstractWebEndpointMappingFactory<E> implements WebEndpointMappingFactory<E> {
 
-    private final Logger logger = LoggerFactory.getLogger(getClass());
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Override
     public final Optional<WebEndpointMapping<E>> create(E endpoint) {
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
index f4afea07..dbfb602b 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
@@ -18,16 +18,16 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.util.UrlPathHelper;
 
 import static org.springframework.http.HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpHeaders.ORIGIN;
+import static org.springframework.util.StringUtils.hasText;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
-import static org.springframework.web.util.UrlPathHelper.PATH_ATTRIBUTE;
 
 /**
  * {@link WebRequest} Utilities class
@@ -37,6 +37,14 @@
  */
 public abstract class WebRequestUtils {
 
+    /**
+     * Name of Servlet request attribute that holds a
+     * {@link UrlPathHelper#getLookupPathForRequest resolved} lookupPath.
+     *
+     * @since Spring Framework 5.3
+     */
+    public static final String PATH_ATTRIBUTE = UrlPathHelper.class.getName() + ".PATH";
+
     public static String getMethod(NativeWebRequest request) {
         String method = request.getHeader(":METHOD:");
         return method;
@@ -60,12 +68,12 @@ public static String getContentType(NativeWebRequest request) {
     public static boolean hasBody(NativeWebRequest request) {
         String contentLength = request.getHeader(HttpHeaders.CONTENT_LENGTH);
         String transferEncoding = request.getHeader(HttpHeaders.TRANSFER_ENCODING);
-        return StringUtils.hasText(transferEncoding) ||
-                (StringUtils.hasText(contentLength) && !contentLength.trim().equals("0"));
+        return hasText(transferEncoding) ||
+                (hasText(contentLength) && !contentLength.trim().equals("0"));
     }
 
     /**
-     * Return a previously {@link #getLookupPathForRequest resolved} lookupPath.
+     * Return a previously {@link UrlPathHelper#getLookupPathForRequest resolved} lookupPath.
      *
      * @param request the current request
      * @return the previously resolved lookupPath
@@ -73,7 +81,6 @@ public static boolean hasBody(NativeWebRequest request) {
      */
     public static String getResolvedLookupPath(NativeWebRequest request) {
         String lookupPath = (String) request.getAttribute(PATH_ATTRIBUTE, SCOPE_REQUEST);
-        Assert.notNull(lookupPath, () -> "Expected lookupPath in request attribute \"" + PATH_ATTRIBUTE + "\".");
         return lookupPath;
     }
 
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/RequestMappingMetadataWebEndpointMappingFactory.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/RequestMappingMetadataWebEndpointMappingFactory.java
index 5918954b..e88a81fd 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/RequestMappingMetadataWebEndpointMappingFactory.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/RequestMappingMetadataWebEndpointMappingFactory.java
@@ -18,7 +18,6 @@
 
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.web.metadata.WebEndpointMappingFactory;
-import org.springframework.util.ClassUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.method.HandlerMethod;
@@ -28,15 +27,17 @@
 import org.springframework.web.servlet.mvc.condition.MediaTypeExpression;
 import org.springframework.web.servlet.mvc.condition.NameValueExpression;
 import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition;
-import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
 import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
 import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition;
 import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
+import java.lang.invoke.MethodHandle;
 import java.util.Collection;
 import java.util.Set;
 
+import static io.microsphere.invoke.MethodHandleUtils.NOT_FOUND_METHOD_HANDLE;
+import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static org.springframework.util.CollectionUtils.isEmpty;
 
 /**
@@ -49,9 +50,19 @@
  */
 public class RequestMappingMetadataWebEndpointMappingFactory extends HandlerMappingWebEndpointMappingFactory<HandlerMethod, RequestMappingInfo> {
 
-    private static final String CLASS_NAME = "org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition";
+    /**
+     * The method name of {@link RequestMappingInfo#getPatternValues()}
+     *
+     * @since Spring Framework 5.3
+     */
+    private static final String GET_PATTERNS_VALUES_METHOD_NAME = "getPatternValues";
 
-    private static final boolean PATH_PATTERNS_REQUEST_CONDITION_CLASS_PRESENT = ClassUtils.isPresent(CLASS_NAME, null);
+    /**
+     * The {@link MethodHandle} of {@link RequestMappingInfo#getPatternValues()}
+     *
+     * @since Spring Framework 5.3
+     */
+    private static final MethodHandle GET_PATTERNS_VALUES_METHOD_HANDLE = findVirtual(RequestMappingInfo.class, GET_PATTERNS_VALUES_METHOD_NAME);
 
     public RequestMappingMetadataWebEndpointMappingFactory(HandlerMapping handlerMapping) {
         super(handlerMapping);
@@ -87,10 +98,11 @@ protected void contribute(HandlerMethod handlerMethod, RequestMappingInfo reques
 
     private Set<String> getPatterns(RequestMappingInfo source) {
         Set<String> patterns = null;
-        if (PATH_PATTERNS_REQUEST_CONDITION_CLASS_PRESENT) {
-            PathPatternsRequestCondition pathPatternsCondition = source.getPathPatternsCondition();
-            if (pathPatternsCondition != null) {
-                patterns = pathPatternsCondition.getPatternValues();
+        if (GET_PATTERNS_VALUES_METHOD_HANDLE != NOT_FOUND_METHOD_HANDLE) {
+            try {
+                patterns = (Set<String>) GET_PATTERNS_VALUES_METHOD_HANDLE.invokeExact(source);
+            } catch (Throwable e) {
+                logger.error("RequestMappingInfo.getPatternValues() can't be invoked by {}", GET_PATTERNS_VALUES_METHOD_HANDLE, e);
             }
         }
         if (isEmpty(patterns)) {
@@ -102,5 +114,4 @@ private Set<String> getPatterns(RequestMappingInfo source) {
         return patterns;
     }
 
-
 }
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
index ab7e1930..0973562c 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/IdempotentException.java
@@ -1,30 +1,32 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *     http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package io.microsphere.spring.webmvc;
-//
-///**
-// * TODO Comment
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @since TODO
-// */
-//public class IdempotentException extends RuntimeException {
-//
-//    public IdempotentException(String s) {
-//        super(s);
-//    }
-//}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc;
+
+import io.microsphere.spring.webmvc.annotation.Idempotent;
+
+/**
+ * {@link RuntimeException} for {@link Idempotent}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @since 1.0.0
+ */
+public class IdempotentException extends RuntimeException {
+
+    public IdempotentException(String s) {
+        super(s);
+    }
+}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
index 2b7d5061..7d9ba2a3 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/annotation/Idempotent.java
@@ -1,37 +1,37 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *     http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package io.microsphere.spring.webmvc.annotation;
-//
-//import java.lang.annotation.Documented;
-//import java.lang.annotation.ElementType;
-//import java.lang.annotation.Inherited;
-//import java.lang.annotation.Retention;
-//import java.lang.annotation.RetentionPolicy;
-//import java.lang.annotation.Target;
-//
-///**
-// * Idempotent Annotation
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @since 1.0.0
-// */
-//@Target({ElementType.TYPE, ElementType.METHOD})
-//@Retention(RetentionPolicy.RUNTIME)
-//@Inherited
-//@Documented
-//public @interface Idempotent {
-//}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Idempotent Annotation
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @since 1.0.0
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+@Documented
+public @interface Idempotent {
+}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/config/IdempotentConfig.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/config/IdempotentConfig.java
new file mode 100644
index 00000000..e9c0fcc8
--- /dev/null
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/config/IdempotentConfig.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc.config;
+
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
+import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
+import io.microsphere.spring.webmvc.annotation.Idempotent;
+import org.springframework.context.event.EventListener;
+
+/**
+ * {@link Idempotent} Configuration
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see Idempotent
+ * @since 1.0.0
+ */
+public class IdempotentConfig {
+
+    private static final Logger logger = LoggerFactory.getLogger(IdempotentConfig.class);
+
+    @EventListener(WebEndpointMappingsReadyEvent.class)
+    public void onEvent(WebEndpointMappingsReadyEvent event) {
+        logger.info(event.toString());
+    }
+
+    @EventListener(HandlerMethodArgumentsResolvedEvent.class)
+    public void onEvent(HandlerMethodArgumentsResolvedEvent event) {
+        logger.info(event.toString());
+    }
+}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/controller/TestController.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/controller/TestController.java
new file mode 100644
index 00000000..a0f38ca3
--- /dev/null
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/controller/TestController.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc.controller;
+
+import io.microsphere.spring.webmvc.annotation.Idempotent;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+/**
+ * Test {@link Controller}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see TestController
+ * @since 1.0.0
+ */
+@RestController
+public class TestController {
+
+    @RequestMapping(value = "/echo/{message}", method = {GET, POST})
+    @Idempotent
+    public String echo(@PathVariable String message) {
+        return "[ECHO] : " + message;
+    }
+}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
index 7877e749..61d3325e 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
@@ -1,73 +1,73 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *     http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package io.microsphere.spring.webmvc.interceptor;
-//
-//import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
-//import io.microsphere.spring.webmvc.IdempotentException;
-//import io.microsphere.spring.webmvc.annotation.Idempotent;
-//import org.springframework.context.ApplicationListener;
-//import org.springframework.web.context.request.ServletWebRequest;
-//import org.springframework.web.context.request.WebRequest;
-//import org.springframework.web.method.HandlerMethod;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.lang.reflect.Method;
-//import java.util.Arrays;
-//
-///**
-// * {@link AnnotatedMethodHandlerInterceptor} for {@link Idempotent} annotation
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @since 1.0.0
-// */
-//public class IdempotentAnnotatedMethodHandlerInterceptor extends AnnotatedMethodHandlerInterceptor<Idempotent> implements ApplicationListener<HandlerMethodArgumentsResolvedEvent> {
-//
-//    @Override
-//    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod,
-//                                Idempotent idempotent) throws Exception {
-//
-//        System.out.println(handlerMethod);
-//        System.out.println(idempotent);
-//
-//        return true;
-//    }
-//
-//    // Handler Methods' arguments Resolved
-//    // Handler Method is not executed
-//    @Override
-//    public void onApplicationEvent(HandlerMethodArgumentsResolvedEvent event) {
-//        Method method = event.getMethod();
-//        Object[] args = event.getArguments();
-//        System.out.println("method : " + method + " , args : " + Arrays.asList(args));
-//        WebRequest webRequest = event.getWebRequest();
-//        if (webRequest instanceof ServletWebRequest) {
-//            ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
-//            HttpServletRequest request = servletWebRequest.getNativeRequest(HttpServletRequest.class);
-//            // HttpSession based on Spring Redis
-//            // Spring Session
-//            HttpSession httpSession = request.getSession();
-//            String token = request.getHeader("token");
-//            Object tokenValue = httpSession.getAttribute(token);
-//            if (tokenValue != null) {
-//                //
-//                throw new IdempotentException("");
-//            }
-//        }
-//    }
-//}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc.interceptor;
+
+import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
+import io.microsphere.spring.webmvc.IdempotentException;
+import io.microsphere.spring.webmvc.annotation.Idempotent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.web.context.request.ServletWebRequest;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.method.HandlerMethod;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+/**
+ * {@link AnnotatedMethodHandlerInterceptor} for {@link Idempotent} annotation
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @since 1.0.0
+ */
+public class IdempotentAnnotatedMethodHandlerInterceptor extends AnnotatedMethodHandlerInterceptor<Idempotent> implements ApplicationListener<HandlerMethodArgumentsResolvedEvent> {
+
+    @Override
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod,
+                                Idempotent idempotent) throws Exception {
+
+        System.out.println(handlerMethod);
+        System.out.println(idempotent);
+
+        return true;
+    }
+
+    // Handler Methods' arguments Resolved
+    // Handler Method is not executed
+    @Override
+    public void onApplicationEvent(HandlerMethodArgumentsResolvedEvent event) {
+        Method method = event.getMethod();
+        Object[] args = event.getArguments();
+        System.out.println("method : " + method + " , args : " + Arrays.asList(args));
+        WebRequest webRequest = event.getWebRequest();
+        if (webRequest instanceof ServletWebRequest) {
+            ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
+            HttpServletRequest request = servletWebRequest.getNativeRequest(HttpServletRequest.class);
+            // HttpSession based on Spring Redis
+            // Spring Session
+            HttpSession httpSession = request.getSession();
+            String token = request.getHeader("token");
+            Object tokenValue = httpSession.getAttribute(token);
+            if (tokenValue != null) {
+                //
+                throw new IdempotentException("");
+            }
+        }
+    }
+}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java
deleted file mode 100644
index 6e0a73da..00000000
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/bootstrap/IdempotentWebApplication.java
+++ /dev/null
@@ -1,75 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *     http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package io.microsphere.spring.webmvc.interceptor.bootstrap;
-//
-//import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
-//import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
-//import io.microsphere.spring.webmvc.annotation.EnableWebMvcExtension;
-//import io.microsphere.spring.webmvc.annotation.Idempotent;
-//import io.microsphere.spring.webmvc.interceptor.IdempotentAnnotatedMethodHandlerInterceptor;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-//import org.springframework.context.annotation.Import;
-//import org.springframework.context.event.EventListener;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.web.bind.annotation.RestController;
-//
-///**
-// * Idempotent Web Application
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @since 1.0.0
-// */
-//@EnableAutoConfiguration
-//@EnableWebMvcExtension(registerHandlerInterceptors = {
-//        IdempotentAnnotatedMethodHandlerInterceptor.class
-//})
-//@Import(value = {
-//        DemoController.class
-//})
-//public class IdempotentWebApplication {
-//
-//    private static final Logger logger = LoggerFactory.getLogger(IdempotentWebApplication.class);
-//
-//    public static void main(String[] args) {
-//        SpringApplication.run(IdempotentWebApplication.class, args);
-//    }
-//
-//    @EventListener(WebEndpointMappingsReadyEvent.class)
-//    public void onEvent(WebEndpointMappingsReadyEvent event) {
-//        logger.info(event.toString());
-//    }
-//
-//    @EventListener(HandlerMethodArgumentsResolvedEvent.class)
-//    public void onEvent(HandlerMethodArgumentsResolvedEvent event) {
-//        logger.info(event.toString());
-//    }
-//
-//}
-//
-//@RestController
-//class DemoController {
-//
-//    @GetMapping("/echo/{message}")
-//    @Idempotent
-//    public String echo(@PathVariable String message) {
-//        return "[ECHO] : " + message;
-//    }
-//}
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
index 65cdfd95..755631c6 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
@@ -1,79 +1,94 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *     http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package io.microsphere.spring.webmvc.metadata;
-//
-//import io.microsphere.spring.web.metadata.WebEndpointMapping;
-//import org.junit.Before;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//import org.springframework.web.method.HandlerMethod;
-//import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-//import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-//
-//import java.util.Map;
-//import java.util.Optional;
-//
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotNull;
-//import static org.junit.Assert.assertTrue;
-//
-///**
-// * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @since 1.0.0
-// */
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = {
-//        RequestMappingInfoWebEndpointMappingFactoryTest.class
-//},
-//        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-//@EnableAutoConfiguration
-//public class RequestMappingInfoWebEndpointMappingFactoryTest {
-//
-//    private Map<RequestMappingInfo, HandlerMethod> handlerMethods;
-//
-//    private RequestMappingMetadataWebEndpointMappingFactory factory;
-//
-//    @Autowired
-//    private RequestMappingInfoHandlerMapping requestMappingInfoHandlerMapping;
-//
-//    @Before
-//    public void init() {
-//        factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
-//        this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();
-//    }
-//
-//    @Test
-//    public void test() {
-//        assertNotNull(handlerMethods);
-//        for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : handlerMethods.entrySet()) {
-//            RequestMappingMetadata metadata = new RequestMappingMetadata(entry.getKey(), entry.getValue());
-//            Optional<WebEndpointMapping<HandlerMetadata<HandlerMethod, RequestMappingInfo>>> webEndpointMapping = factory.create(metadata);
-//            assertTrue(webEndpointMapping.isPresent());
-//            webEndpointMapping.ifPresent(mapping -> {
-//                assertEquals(this.requestMappingInfoHandlerMapping, mapping.getSource());
-//                assertNotNull(webEndpointMapping.get().toJSON());
-//            });
-//        }
-//    }
-//
-//}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.webmvc.metadata;
+
+import io.microsphere.spring.web.metadata.WebEndpointMapping;
+import io.microsphere.spring.webmvc.controller.TestController;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @since 1.0.0
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = {
+        TestController.class,
+        RequestMappingInfoWebEndpointMappingFactoryTest.class,
+        RequestMappingInfoWebEndpointMappingFactoryTest.Config.class
+})
+public class RequestMappingInfoWebEndpointMappingFactoryTest {
+
+    private Map<RequestMappingInfo, HandlerMethod> handlerMethods;
+
+    private RequestMappingMetadataWebEndpointMappingFactory factory;
+
+    @Autowired
+    private RequestMappingInfoHandlerMapping requestMappingInfoHandlerMapping;
+
+    @Autowired
+    private TestController testController;
+
+    static class Config {
+
+        @Bean
+        public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+            return new RequestMappingHandlerMapping();
+        }
+    }
+
+    @Before
+    public void init() {
+        factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
+        this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(handlerMethods);
+        for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : handlerMethods.entrySet()) {
+            RequestMappingMetadata metadata = new RequestMappingMetadata(entry.getKey(), entry.getValue());
+            Optional<WebEndpointMapping<HandlerMetadata<HandlerMethod, RequestMappingInfo>>> webEndpointMapping = factory.create(metadata);
+            assertTrue(webEndpointMapping.isPresent());
+            webEndpointMapping.ifPresent(mapping -> {
+                assertEquals(this.requestMappingInfoHandlerMapping, mapping.getSource());
+                assertNotNull(webEndpointMapping.get().toJSON());
+            });
+        }
+    }
+
+}

From 5064352270cfbd5fc53db429344bf1c0a1e4c178 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 17 Dec 2024 21:14:33 +0800
Subject: [PATCH 049/157] Polish #34 compatible with Spring Framework 5.1

---
 .../ListenableAutowireCandidateResolver.java  | 33 +++++++++++++++++--
 .../handler/ReversedProxyHandlerMapping.java  |  3 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index a85ca384..ddef93ac 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -17,8 +17,10 @@
 package io.microsphere.spring.beans.factory.support;
 
 import io.microsphere.constants.PropertyConstants;
+import io.microsphere.lang.function.ThrowableAction;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanNameAware;
@@ -34,15 +36,19 @@
 import org.springframework.core.env.Environment;
 import org.springframework.lang.Nullable;
 
+import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 import java.util.List;
 
+import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
+import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.spring.beans.factory.support.AutowireCandidateResolvingListener.loadListeners;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.util.ArrayUtils.combine;
+import static org.springframework.beans.BeanUtils.instantiateClass;
 
 /**
  * The decorator class of {@link AutowireCandidateResolver} to listen to the resolving process of autowire candidate by
@@ -61,6 +67,20 @@ public class ListenableAutowireCandidateResolver implements AutowireCandidateRes
 
     private static final Logger logger = LoggerFactory.getLogger(ListenableAutowireCandidateResolver.class);
 
+    /**
+     * The name of the method name of {@link AutowireCandidateResolver#cloneIfNecessary()}
+     *
+     * @since Spring Framework 5.2.7
+     */
+    private static final String CLONE_IF_NECESSARY_METHOD_NAME = "cloneIfNecessary";
+
+    /**
+     * The {@link MethodHandle} of {@link AutowireCandidateResolver#cloneIfNecessary()}
+     *
+     * @since Spring Framework 5.2.7
+     */
+    private static final MethodHandle CLONE_IF_NECESSARY_METHOD_HANDLE = findVirtual(AutowireCandidateResolver.class, CLONE_IF_NECESSARY_METHOD_NAME);
+
     /**
      * The prefix of the property name of {@link ListenableAutowireCandidateResolver}
      */
@@ -127,9 +147,18 @@ public Object getLazyResolutionProxyIfNecessary(DependencyDescriptor descriptor,
         return proxy;
     }
 
-    @Override
+    /**
+     * Clone the delegate {@link AutowireCandidateResolver} if necessary
+     * No {@link Override} was marked in order to be compatible with the Spring 4.x
+     *
+     * @return {@link AutowireCandidateResolver}
+     * @since Spring Framework 5.2.7
+     */
     public AutowireCandidateResolver cloneIfNecessary() {
-        return delegate.cloneIfNecessary();
+        if (CLONE_IF_NECESSARY_METHOD_HANDLE != null) {
+            return execute(() -> (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invoke(delegate));
+        }
+        return instantiateClass(delegate.getClass());
     }
 
     @Override
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
index 4f8882ac..3fea37e2 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
@@ -28,7 +28,6 @@
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.function.HandlerFunction;
 import org.springframework.web.servlet.handler.AbstractHandlerMapping;
 import org.springframework.web.servlet.handler.AbstractHandlerMethodMapping;
 import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
@@ -52,7 +51,7 @@
  * The request must have a header named {@link WebEndpointMapping#ID_HEADER_NAME "microsphere_wem_id"},
  * which is a string presenting {@link WebEndpointMapping#getId() the id of endpoint}, used to
  * locate the actual {@link WebEndpointMapping#getEndpoint() endpoint} easily, such as {@link HandlerMethod},
- * {@link HandlerFunction} and {@link Controller}.
+ * {@link org.springframework.web.servlet.function.HandlerFunction} and {@link Controller}.
  * <p>
  * As a result, {@link ReversedProxyHandlerMapping} has the higher precedence than others, which ensures that it
  * prioritizes {@link HandlerMapping#getHandler(HttpServletRequest) getting the handler} and avoid the duplication

From 5eb706b16a94ad3834f224a4345c6dc732652d2f Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 18 Dec 2024 13:50:56 +0800
Subject: [PATCH 050/157] Polish #37

---
 .../AbstractInjectionPointDependencyResolver.java |  4 ++--
 .../factory/DefaultBeanDependencyResolver.java    |  4 ++--
 .../ListenableAutowireCandidateResolver.java      |  7 ++++---
 .../spring/cache/intereptor/TTLCacheResolver.java |  4 ++--
 .../annotation/AnnotatedPropertySourceLoader.java |  4 ++--
 .../annotation/BeanCapableImportCandidate.java    |  4 ++--
 .../context/event/BeanFactoryListeners.java       |  6 ++----
 .../spring/context/event/BeanListeners.java       |  6 ++----
 .../DependencyAnalysisBeanFactoryListener.java    |  4 ++--
 .../context/event/LoggingBeanFactoryListener.java |  4 ++--
 .../spring/context/event/LoggingBeanListener.java |  4 ++--
 ...nstantiationSingletonsBeanFactoryListener.java |  4 ++--
 .../spring/util/ApplicationContextUtils.java      |  1 -
 .../io/microsphere/spring/util/BeanRegistrar.java |  4 ++--
 .../microsphere/spring/util/EnvironmentUtils.java |  4 ++--
 .../spring/util/PropertySourcesUtils.java         |  4 ++--
 .../spring/util/SpringFactoriesLoaderUtils.java   |  4 ++--
 .../ListenableAutowireCandidateResolverTest.java  |  7 +++++++
 .../annotation/EnableEventExtensionTest.java      |  4 ++--
 .../context/event/BeanTimeStatisticsTest.java     |  4 ++--
 .../src/test/resources/logback.xml                | 15 +++++++++++++++
 .../config/P6DataSourceBeanPostProcessor.java     |  4 ++--
 microsphere-spring-parent/pom.xml                 |  3 ++-
 .../AbstractWebEndpointMappingFactory.java        |  4 ++--
 .../metadata/SmartWebEndpointMappingFactory.java  |  4 ++--
 .../support/DelegatingHandlerMethodAdvice.java    |  4 ++--
 .../src/test/resources/logback.xml                | 15 +++++++++++++++
 .../web/servlet/filter/ContentCachingFilter.java  |  4 ++--
 .../handler/ReversedProxyHandlerMapping.java      |  4 ++--
 .../metadata/WebEndpointMappingRegistrar.java     |  4 ++--
 .../InterceptingHandlerMethodProcessor.java       |  4 ++--
 .../src/test/resources/logback.xml                | 15 +++++++++++++++
 32 files changed, 108 insertions(+), 59 deletions(-)
 create mode 100644 microsphere-spring-context/src/test/resources/logback.xml
 create mode 100644 microsphere-spring-web/src/test/resources/logback.xml
 create mode 100644 microsphere-spring-webmvc/src/test/resources/logback.xml

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
index 4da09756..9c0c38c1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.beans.factory;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.filter.ResolvableDependencyTypeFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index a0129e5c..d6cc70c1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -19,9 +19,9 @@
 import io.microsphere.collection.CollectionUtils;
 import io.microsphere.collection.SetUtils;
 import io.microsphere.lang.function.ThrowableAction;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.filter.ResolvableDependencyTypeFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.BeanFactory;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index ddef93ac..859ef27f 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -17,10 +17,8 @@
 package io.microsphere.spring.beans.factory.support;
 
 import io.microsphere.constants.PropertyConstants;
-import io.microsphere.lang.function.ThrowableAction;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanNameAware;
@@ -156,7 +154,10 @@ public Object getLazyResolutionProxyIfNecessary(DependencyDescriptor descriptor,
      */
     public AutowireCandidateResolver cloneIfNecessary() {
         if (CLONE_IF_NECESSARY_METHOD_HANDLE != null) {
-            return execute(() -> (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invoke(delegate));
+            return execute(() -> (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invokeExact(delegate));
+        }
+        if (logger.isTraceEnabled()) {
+            logger.trace("The method AutowireCandidateResolver#cloneIfNecessary() was not found, the clone instance will be created on default way.");
         }
         return instantiateClass(delegate.getClass());
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
index f7420139..30737100 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
@@ -17,13 +17,13 @@
 package io.microsphere.spring.cache.intereptor;
 
 import io.microsphere.collection.MapUtils;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.cache.TTLContext;
 import io.microsphere.spring.cache.annotation.TTLCachePut;
 import io.microsphere.spring.cache.annotation.TTLCacheable;
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import io.microsphere.util.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.interceptor.CacheOperation;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
index f15ce97e..5405cf59 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.config.context.annotation;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.annotation.BeanCapableImportCandidate;
 import io.microsphere.spring.core.annotation.ResolvablePlaceholderAnnotationAttributes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportSelector;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
index 169e66b3..eac9cd48 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.annotation;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
index f5118135..2444f511 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
@@ -16,13 +16,12 @@
  */
 package io.microsphere.spring.context.event;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.config.NamedBeanHolderComparator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.NamedBeanHolder;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 
 import java.util.ArrayList;
@@ -32,7 +31,6 @@
 
 import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
 /**
  * The Composite {@link BeanFactoryListener}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
index c6ef4617..cba23116 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
@@ -16,14 +16,13 @@
  */
 package io.microsphere.spring.context.event;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.config.NamedBeanHolderComparator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.PropertyValues;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.NamedBeanHolder;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
@@ -39,7 +38,6 @@
 
 import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
 /**
  * The composite {@link BeanListener}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index 3329b31f..4edad933 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -17,9 +17,9 @@
 package io.microsphere.spring.context.event;
 
 import io.microsphere.filter.Filter;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.filter.ResolvableDependencyTypeFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanFactoryListener.java
index 67b1fd3f..d947bab6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanFactoryListener.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanListener.java
index 70898193..48e05a68 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/LoggingBeanListener.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.PropertyValues;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
index caeb9774..fa9cc535 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.context.event;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.BeanDependencyResolver;
 import io.microsphere.spring.beans.factory.DefaultBeanDependencyResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
index 06cdb0fb..a09f65ac 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import static io.microsphere.spring.util.BeanFactoryUtils.getBeanPostProcessors;
-import static io.microsphere.text.FormatUtils.format;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static io.microsphere.util.ClassUtils.cast;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
index ab3f0687..9863d9ee 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.DelegatingFactoryBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java
index 3d0135ff..05232a24 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.ConfigurablePropertyResolver;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
index 5b112dd3..aa6828ba 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index c339af4a..cbf13d6c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index 18fc1d05..ed0aa97e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -4,6 +4,7 @@
 import io.microsphere.spring.util.TestBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -48,6 +49,9 @@ public class ListenableAutowireCandidateResolverTest implements AutowireCandidat
     @Lazy
     private TestBean testBean;
 
+    @Autowired
+    private ObjectProvider<ListenableAutowireCandidateResolver> resolverProvider;
+
     private Environment environment;
 
     private static Object resolvedTestName;
@@ -56,6 +60,9 @@ public class ListenableAutowireCandidateResolverTest implements AutowireCandidat
     public void test() {
         assertEquals(testName, resolvedTestName);
         assertNotNull(testBean.getResolver());
+
+        ListenableAutowireCandidateResolver resolver = resolverProvider.getIfAvailable();
+        assertNotNull(resolver.cloneIfNecessary());
     }
 
     @Override
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
index fcf10007..4a56ef0f 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
@@ -21,8 +21,8 @@
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
index 115509f1..c426fbe8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
@@ -19,8 +19,8 @@
 import io.microsphere.util.StopWatch;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/microsphere-spring-context/src/test/resources/logback.xml b/microsphere-spring-context/src/test/resources/logback.xml
new file mode 100644
index 00000000..e3375b74
--- /dev/null
+++ b/microsphere-spring-context/src/test/resources/logback.xml
@@ -0,0 +1,15 @@
+<configuration>
+
+    <property name="ENCODER_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} %level %logger{0} [%t] %m%n"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${ENCODER_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessor.java b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessor.java
index 06d103b7..49bf53c9 100644
--- a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessor.java
+++ b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessor.java
@@ -18,8 +18,8 @@
 
 import com.p6spy.engine.spy.P6DataSource;
 import io.microsphere.spring.beans.factory.config.GenericBeanPostProcessorAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.EnvironmentAware;
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 2f80b617..ec21990a 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -24,7 +24,8 @@
         <jackson.version>2.18.2</jackson.version>
         <snakeyaml.version>2.3</snakeyaml.version>
         <lettuce.version>6.1.10.RELEASE</lettuce.version>
-        <logback.version>1.5.12</logback.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <logback.version>1.2.12</logback.version>
         <junit.version>4.13.2</junit.version>
         <mockito.version>5.14.2</mockito.version>
     </properties>
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
index bb1cc223..691d39c3 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.lang.Nullable;
 
 import java.util.Optional;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
index e26b975a..2547f5f6 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.web.metadata;
 
 import io.microsphere.spring.util.SpringFactoriesLoaderUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.lang.Nullable;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
index 4cf4cefb..c5f400c2 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.web.method.support;
 
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.MethodParameter;
diff --git a/microsphere-spring-web/src/test/resources/logback.xml b/microsphere-spring-web/src/test/resources/logback.xml
new file mode 100644
index 00000000..e3375b74
--- /dev/null
+++ b/microsphere-spring-web/src/test/resources/logback.xml
@@ -0,0 +1,15 @@
+<configuration>
+
+    <property name="ENCODER_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} %level %logger{0} [%t] %m%n"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${ENCODER_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
index 63ff81bc..c95f377d 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.web.servlet.filter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingResponseWrapper;
 
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
index 3fea37e2..6a2fbcda 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
@@ -21,8 +21,8 @@
 import io.microsphere.spring.webmvc.metadata.HandlerMetadataWebEndpointMappingFactory;
 import io.microsphere.spring.webmvc.metadata.RequestMappingMetadataWebEndpointMappingFactory;
 import io.microsphere.util.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.lang.Nullable;
 import org.springframework.web.method.HandlerMethod;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
index 0bcfdc07..72d7aef8 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
@@ -24,8 +24,8 @@
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.web.metadata.WebEndpointMappingRegistry;
 import io.microsphere.util.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerMapping;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
index 6dfa79f7..36b4b4f2 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
@@ -22,8 +22,8 @@
 import io.microsphere.spring.web.method.support.HandlerMethodAdvice;
 import io.microsphere.spring.web.method.support.HandlerMethodArgumentInterceptor;
 import io.microsphere.spring.web.method.support.HandlerMethodInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/microsphere-spring-webmvc/src/test/resources/logback.xml b/microsphere-spring-webmvc/src/test/resources/logback.xml
new file mode 100644
index 00000000..e3375b74
--- /dev/null
+++ b/microsphere-spring-webmvc/src/test/resources/logback.xml
@@ -0,0 +1,15 @@
+<configuration>
+
+    <property name="ENCODER_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} %level %logger{0} [%t] %m%n"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${ENCODER_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file

From 74c0ca3cda820aab4d4706d0ebd77482585aba74 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 18 Dec 2024 18:14:35 +0800
Subject: [PATCH 051/157] Create package-info.java

---
 .../org/springframework/package-info.java     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 microsphere-spring-context/src/main/java/org/springframework/package-info.java

diff --git a/microsphere-spring-context/src/main/java/org/springframework/package-info.java b/microsphere-spring-context/src/main/java/org/springframework/package-info.java
new file mode 100644
index 00000000..1e6729d7
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/org/springframework/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * The classes in this package or sub-packages are used to be compatible with the different versions of Spring Framework
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @since 1.0.0
+ */
+package org.springframework;
\ No newline at end of file

From 81576727576514ad7a92b70d861b0d7b24c7d307 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 18 Dec 2024 18:14:38 +0800
Subject: [PATCH 052/157] Create Profiles.java

---
 .../springframework/core/env/Profiles.java    | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java

diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java b/microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java
new file mode 100644
index 00000000..97b47eba
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env;
+
+import java.util.function.Predicate;
+
+/**
+ * Profile predicate that may be {@linkplain Environment#acceptsProfiles(Profiles)
+ * accepted} by an {@link Environment}.
+ *
+ * <p>May be implemented directly or, more usually, created using the
+ * {@link #of(String...) of(...)} factory method.
+ *
+ * @author Phillip Webb
+ * @author Sam Brannen
+ * @since 5.1
+ */
+@FunctionalInterface
+public interface Profiles {
+
+    /**
+     * Test if this {@code Profiles} instance <em>matches</em> against the given
+     * active profiles predicate.
+     * @param activeProfiles a predicate that tests whether a given profile is
+     * currently active
+     */
+    boolean matches(Predicate<String> activeProfiles);
+
+
+    /**
+     * Create a new {@link Profiles} instance that checks for matches against
+     * the given <em>profile expressions</em>.
+     * <p>The returned instance will {@linkplain Profiles#matches(Predicate) match}
+     * if any one of the given profile expressions matches.
+     * <p>A profile expression may contain a simple profile name (for example
+     * {@code "production"}) or a compound expression. A compound expression allows
+     * for more complicated profile logic to be expressed, for example
+     * {@code "production & cloud"}.
+     * <p>The following operators are supported in profile expressions.
+     * <ul>
+     * <li>{@code !} - A logical <em>NOT</em> of the profile name or compound expression</li>
+     * <li>{@code &} - A logical <em>AND</em> of the profile names or compound expressions</li>
+     * <li>{@code |} - A logical <em>OR</em> of the profile names or compound expressions</li>
+     * </ul>
+     * <p>Please note that the {@code &} and {@code |} operators may not be mixed
+     * without using parentheses. For example, {@code "a & b | c"} is not a valid
+     * expression: it must be expressed as {@code "(a & b) | c"} or
+     * {@code "a & (b | c)"}.
+     * <p>As of Spring Framework 5.1.17, two {@code Profiles} instances returned
+     * by this method are considered equivalent to each other (in terms of
+     * {@code equals()} and {@code hashCode()} semantics) if they are created
+     * with identical <em>profile expressions</em>.
+     * @param profileExpressions the <em>profile expressions</em> to include
+     * @return a new {@link Profiles} instance
+     */
+    static Profiles of(String... profileExpressions) {
+        return ProfilesParser.parse(profileExpressions);
+    }
+
+}

From 79cd19707d77e05b4ec50404ecf76543fc59c721 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 18 Dec 2024 18:14:42 +0800
Subject: [PATCH 053/157] Update ListenableConfigurableEnvironment.java

---
 .../spring/core/env/ListenableConfigurableEnvironment.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index fc92be1d..3d8849bd 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -198,7 +198,6 @@ public boolean acceptsProfiles(String... profiles) {
         return delegate.acceptsProfiles(profiles);
     }
 
-    @Override
     public boolean acceptsProfiles(Profiles profiles) {
         return delegate.acceptsProfiles(profiles);
     }

From ba0521ef6e2ee763b57f0c2c5af857057e0606fb Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 18 Dec 2024 18:16:23 +0800
Subject: [PATCH 054/157] Update ListenableConfigurableEnvironment.java

---
 .../core/env/ListenableConfigurableEnvironment.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 3d8849bd..2513ab85 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -184,6 +184,11 @@ public String[] getDefaultProfiles() {
         return defaultProfiles;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 5.3.28
+     */
     public boolean matchesProfiles(String... profileExpressions) {
         if (matchesProfilesMethod != null) {
             Object arg = profileExpressions;
@@ -198,6 +203,11 @@ public boolean acceptsProfiles(String... profiles) {
         return delegate.acceptsProfiles(profiles);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 5.1
+     */
     public boolean acceptsProfiles(Profiles profiles) {
         return delegate.acceptsProfiles(profiles);
     }

From 7f59f33b9ad7942efe9824a4ea19955c8a33efb0 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 11:43:56 +0800
Subject: [PATCH 055/157] Create ProfilesParser.java

---
 .../core/env/ProfilesParser.java              | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java

diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
new file mode 100644
index 00000000..e2c4785a
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.function.Predicate;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Internal parser used by {@link Profiles#of}.
+ *
+ * @author Phillip Webb
+ * @author Sam Brannen
+ * @since 5.1
+ */
+final class ProfilesParser {
+
+ private ProfilesParser() {
+ }
+
+
+ static Profiles parse(String... expressions) {
+  Assert.notEmpty(expressions, "Must specify at least one profile expression");
+  Profiles[] parsed = new Profiles[expressions.length];
+  for (int i = 0; i < expressions.length; i++) {
+   parsed[i] = parseExpression(expressions[i]);
+  }
+  return new ParsedProfiles(expressions, parsed);
+ }
+
+ private static Profiles parseExpression(String expression) {
+  Assert.hasText(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
+  StringTokenizer tokens = new StringTokenizer(expression, "()&|!", true);
+  return parseTokens(expression, tokens);
+ }
+
+ private static Profiles parseTokens(String expression, StringTokenizer tokens) {
+  return parseTokens(expression, tokens, Context.NONE);
+ }
+
+ private static Profiles parseTokens(String expression, StringTokenizer tokens, Context context) {
+  List<Profiles> elements = new ArrayList<>();
+  Operator operator = null;
+  while (tokens.hasMoreTokens()) {
+   String token = tokens.nextToken().trim();
+   if (token.isEmpty()) {
+    continue;
+   }
+   switch (token) {
+    case "(":
+     Profiles contents = parseTokens(expression, tokens, Context.PARENTHESIS);
+     if (context == Context.NEGATE) {
+      return contents;
+     }
+     elements.add(contents);
+     break;
+    case "&":
+     assertWellFormed(expression, operator == null || operator == Operator.AND);
+     operator = Operator.AND;
+     break;
+    case "|":
+     assertWellFormed(expression, operator == null || operator == Operator.OR);
+     operator = Operator.OR;
+     break;
+    case "!":
+     elements.add(not(parseTokens(expression, tokens, Context.NEGATE)));
+     break;
+    case ")":
+     Profiles merged = merge(expression, elements, operator);
+     if (context == Context.PARENTHESIS) {
+      return merged;
+     }
+     elements.clear();
+     elements.add(merged);
+     operator = null;
+     break;
+    default:
+     Profiles value = equals(token);
+     if (context == Context.NEGATE) {
+      return value;
+     }
+     elements.add(value);
+   }
+  }
+  return merge(expression, elements, operator);
+ }
+
+ private static Profiles merge(String expression, List<Profiles> elements, @Nullable Operator operator) {
+  assertWellFormed(expression, !elements.isEmpty());
+  if (elements.size() == 1) {
+   return elements.get(0);
+  }
+  Profiles[] profiles = elements.toArray(new Profiles[0]);
+  return (operator == Operator.AND ? and(profiles) : or(profiles));
+ }
+
+ private static void assertWellFormed(String expression, boolean wellFormed) {
+  Assert.isTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
+ }
+
+ private static Profiles or(Profiles... profiles) {
+  return activeProfile -> Arrays.stream(profiles).anyMatch(isMatch(activeProfile));
+ }
+
+ private static Profiles and(Profiles... profiles) {
+  return activeProfile -> Arrays.stream(profiles).allMatch(isMatch(activeProfile));
+ }
+
+ private static Profiles not(Profiles profiles) {
+  return activeProfile -> !profiles.matches(activeProfile);
+ }
+
+ private static Profiles equals(String profile) {
+  return activeProfile -> activeProfile.test(profile);
+ }
+
+ private static Predicate<Profiles> isMatch(Predicate<String> activeProfiles) {
+  return profiles -> profiles.matches(activeProfiles);
+ }
+
+
+ private enum Operator { AND, OR }
+
+ private enum Context { NONE, NEGATE, PARENTHESIS }
+
+
+ private static class ParsedProfiles implements Profiles {
+
+  private final Set<String> expressions = new LinkedHashSet<>();
+
+  private final Profiles[] parsed;
+
+  ParsedProfiles(String[] expressions, Profiles[] parsed) {
+   Collections.addAll(this.expressions, expressions);
+   this.parsed = parsed;
+  }
+
+  @Override
+  public boolean matches(Predicate<String> activeProfiles) {
+   for (Profiles candidate : this.parsed) {
+    if (candidate.matches(activeProfiles)) {
+     return true;
+    }
+   }
+   return false;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+   if (this == obj) {
+    return true;
+   }
+   if (obj == null || getClass() != obj.getClass()) {
+    return false;
+   }
+   ParsedProfiles that = (ParsedProfiles) obj;
+   return this.expressions.equals(that.expressions);
+  }
+
+  @Override
+  public int hashCode() {
+   return this.expressions.hashCode();
+  }
+
+  @Override
+  public String toString() {
+   return StringUtils.collectionToDelimitedString(this.expressions, " or ");
+  }
+ }
+
+}

From 2de7192fdb535c18e2e9fd484104b5e3f1a4b05e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 12:01:10 +0800
Subject: [PATCH 056/157] Update pom.xml

---
 microsphere-spring-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index ec21990a..4002a0da 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -19,7 +19,7 @@
     <description>Microsphere Spring Parent</description>
 
     <properties>
-        <microsphere-java.version>0.0.8</microsphere-java.version>
+        <microsphere-java.version>0.0.9</microsphere-java.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <jackson.version>2.18.2</jackson.version>
         <snakeyaml.version>2.3</snakeyaml.version>

From f58b322f0fddc64ded70ee22b8c150a8f4b55329 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 12:50:34 +0800
Subject: [PATCH 057/157] Polish #34

---
 .../DefaultBeanDependencyResolver.java        |  3 +-
 .../ListenableAutowireCandidateResolver.java  |  9 ++-
 .../EventPublishingBeanAfterProcessor.java    |  9 ++-
 .../GenericApplicationListenerAdapter.java    | 65 +++++++++++++++++
 .../InterceptingApplicationListener.java      |  5 +-
 .../spring/core/SpringVersion.java            | 40 +++++------
 .../ListenableConfigurableEnvironment.java    | 38 +++++++---
 .../spring/util/BeanDefinitionUtils.java      | 70 +++++++++++++++++++
 .../spring/core/SpringVersionTest.java        |  2 +-
 ...ListenableConfigurableEnvironmentTest.java |  9 ++-
 10 files changed, 211 insertions(+), 39 deletions(-)
 create mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index d6cc70c1..1935a893 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -58,6 +58,7 @@
 import static io.microsphere.collection.MapUtils.ofEntry;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.reflect.MemberUtils.isStatic;
+import static io.microsphere.spring.util.BeanDefinitionUtils.getResolvableType;
 import static io.microsphere.spring.util.BeanDefinitionUtils.resolveBeanType;
 import static io.microsphere.util.ClassLoaderUtils.loadClass;
 import static java.lang.InheritableThreadLocal.withInitial;
@@ -325,7 +326,7 @@ private void resolveInjectionPointsDependentBeanNames(String beanName, RootBeanD
 
         Class beanClass = resolveBeanClass(beanDefinition, classLoader);
         if (beanClass == null) {
-            ResolvableType resolvableType = beanDefinition.getResolvableType();
+            ResolvableType resolvableType = getResolvableType(beanDefinition);
             beanClass = resolvableType.resolve();
         }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 859ef27f..c5e1de2b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -40,6 +40,7 @@
 
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
+import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.beans.factory.support.AutowireCandidateResolvingListener.loadListeners;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
@@ -124,9 +125,13 @@ public boolean isRequired(DependencyDescriptor descriptor) {
         return delegate.isRequired(descriptor);
     }
 
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 5.1
+     */
     public boolean hasQualifier(DependencyDescriptor descriptor) {
-        return delegate.hasQualifier(descriptor);
+        return invokeMethod(descriptor, "hasQualifier", descriptor);
     }
 
     @Nullable
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java
index e78c185b..3dd25432 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java
@@ -27,7 +27,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.SmartApplicationListener;
+import org.springframework.core.ResolvableType;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
@@ -45,7 +45,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-class EventPublishingBeanAfterProcessor extends InstantiationAwareBeanPostProcessorAdapter implements SmartApplicationListener {
+class EventPublishingBeanAfterProcessor extends InstantiationAwareBeanPostProcessorAdapter implements GenericApplicationListenerAdapter {
 
     private static final Class<?> DISPOSABLE_BEAN_ADAPTER_CLASS = ClassUtils.resolveClassName("org.springframework.beans.factory.support.DisposableBeanAdapter", null);
 
@@ -69,6 +69,11 @@ public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
         return ContextRefreshedEvent.class.isAssignableFrom(eventType) || ContextClosedEvent.class.isAssignableFrom(eventType);
     }
 
+    @Override
+    public boolean supportsEventType(ResolvableType eventType) {
+        return eventType.isAssignableFrom(ContextRefreshedEvent.class) || eventType.isAssignableFrom(ContextClosedEvent.class);
+    }
+
     @Override
     public void onApplicationEvent(ApplicationEvent event) {
         if (!Objects.equals(context, event.getSource())) {
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
new file mode 100644
index 00000000..222c04b7
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.context.event;
+
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.GenericApplicationListener;
+import org.springframework.context.event.SmartApplicationListener;
+import org.springframework.lang.Nullable;
+
+import static org.springframework.core.ResolvableType.forClass;
+
+/**
+ * The adapter interface of {@link GenericApplicationListener} and {@link SmartApplicationListener}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see GenericApplicationListener
+ * @see SmartApplicationListener
+ * @since 1.0.0
+ */
+public interface GenericApplicationListenerAdapter extends GenericApplicationListener, SmartApplicationListener {
+
+    /**
+     * {@inheritDoc}
+     */
+    default boolean supportsSourceType(@Nullable Class<?> sourceType) {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    default boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+        return supportsEventType(forClass(eventType));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    default int getOrder() {
+        return LOWEST_PRECEDENCE;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 5.3.5
+     */
+    default String getListenerId() {
+        return "";
+    }
+}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationListener.java
index cc623f30..eedc7f67 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationListener.java
@@ -19,7 +19,6 @@
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.GenericApplicationListener;
-import org.springframework.context.event.GenericApplicationListenerAdapter;
 import org.springframework.core.ResolvableType;
 
 import java.util.List;
@@ -31,7 +30,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-class InterceptingApplicationListener implements GenericApplicationListener {
+class InterceptingApplicationListener implements GenericApplicationListenerAdapter {
 
     private final ApplicationListener<?> delegate;
 
@@ -42,7 +41,7 @@ class InterceptingApplicationListener implements GenericApplicationListener {
     InterceptingApplicationListener(ApplicationListener<?> delegate, List<ApplicationListenerInterceptor> interceptors) {
         this.delegate = delegate;
         this.smartListener = (delegate instanceof GenericApplicationListener ?
-                (GenericApplicationListener) delegate : new GenericApplicationListenerAdapter(delegate));
+                (GenericApplicationListener) delegate : new org.springframework.context.event.GenericApplicationListenerAdapter(delegate));
         this.interceptors = interceptors;
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
index fc1bdbf9..60f0c7e1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java
@@ -464,43 +464,43 @@ public int getPatch() {
         return version.getPatch();
     }
 
-    public boolean gt(Version that) {
-        return version.gt(that);
+    public boolean gt(SpringVersion that) {
+        return version.gt(that.version);
     }
 
-    public boolean isGreaterThan(Version that) {
-        return version.isGreaterThan(that);
+    public boolean isGreaterThan(SpringVersion that) {
+        return version.isGreaterThan(that.version);
     }
 
-    public boolean ge(Version that) {
-        return version.ge(that);
+    public boolean ge(SpringVersion that) {
+        return version.ge(that.version);
     }
 
-    public boolean isGreaterOrEqual(Version that) {
-        return version.isGreaterOrEqual(that);
+    public boolean isGreaterOrEqual(SpringVersion that) {
+        return version.isGreaterOrEqual(that.version);
     }
 
-    public boolean lt(Version that) {
-        return version.lt(that);
+    public boolean lt(SpringVersion that) {
+        return version.lt(that.version);
     }
 
-    public boolean isLessThan(Version that) {
-        return version.isLessThan(that);
+    public boolean isLessThan(SpringVersion that) {
+        return version.isLessThan(that.version);
     }
 
-    public boolean le(Version that) {
-        return version.le(that);
+    public boolean le(SpringVersion that) {
+        return version.le(that.version);
     }
 
-    public boolean isLessOrEqual(Version that) {
-        return version.isLessOrEqual(that);
+    public boolean isLessOrEqual(SpringVersion that) {
+        return version.isLessOrEqual(that.version);
     }
 
-    public boolean eq(Version that) {
-        return version.eq(that);
+    public boolean eq(SpringVersion that) {
+        return version.eq(that.version);
     }
 
-    public boolean equals(Version that) {
-        return version.equals(that);
+    public boolean equals(SpringVersion that) {
+        return version.equals(that.version);
     }
 }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 2513ab85..ef1bc9c1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -29,14 +29,14 @@
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
-import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static io.microsphere.reflect.MethodUtils.findMethod;
-import static io.microsphere.reflect.MethodUtils.invokeMethod;
+import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
@@ -69,10 +69,16 @@ public class ListenableConfigurableEnvironment implements ConfigurableEnvironmen
     public static final boolean ENABLED_PROPERTY_VALUE = false;
 
     /**
-     * The {@link Method} of {@link Environment#matchesProfiles(String...)} since Spring Framework 5.3.8
+     * The {@link MethodHandle} of {@link Environment#acceptsProfiles(Profiles)} since Spring Framework 5.1
      */
     @Nullable
-    private static final Method matchesProfilesMethod = findMethod(Environment.class, "matchesProfiles", String[].class);
+    private static final MethodHandle acceptsProfilesMethodHandle = findVirtual(Environment.class, "acceptsProfiles", Profiles.class);
+
+    /**
+     * The {@link MethodHandle} of {@link Environment#matchesProfiles(String...)} since Spring Framework 5.3.8
+     */
+    @Nullable
+    private static final MethodHandle matchesProfilesMethodHandle = findVirtual(Environment.class, "matchesProfiles", String[].class);
 
     private final ConfigurableEnvironment delegate;
 
@@ -190,9 +196,14 @@ public String[] getDefaultProfiles() {
      * @since Spring Framework 5.3.28
      */
     public boolean matchesProfiles(String... profileExpressions) {
-        if (matchesProfilesMethod != null) {
-            Object arg = profileExpressions;
-            return invokeMethod(delegate, matchesProfilesMethod, arg);
+        if (matchesProfilesMethodHandle != null) {
+            try {
+                return (boolean) matchesProfilesMethodHandle.invokeExact((Environment) delegate, profileExpressions);
+            } catch (Throwable e) {
+                if (logger.isWarnEnabled()) {
+                    logger.warn("Failed to invoke {} with args : '{}'", matchesProfilesMethodHandle, Arrays.toString(profileExpressions), e);
+                }
+            }
         }
         return acceptsProfiles(profileExpressions);
     }
@@ -209,7 +220,16 @@ public boolean acceptsProfiles(String... profiles) {
      * @since Spring Framework 5.1
      */
     public boolean acceptsProfiles(Profiles profiles) {
-        return delegate.acceptsProfiles(profiles);
+        if (acceptsProfilesMethodHandle != null) {
+            try {
+                return (boolean) acceptsProfilesMethodHandle.invokeExact((Environment) delegate, profiles);
+            } catch (Throwable e) {
+                if (logger.isWarnEnabled()) {
+                    logger.warn("Failed to invoke {} with args : '{}'", acceptsProfilesMethodHandle, profiles, e);
+                }
+            }
+        }
+        throw new UnsupportedOperationException("The method acceptsProfiles(Profiles) is not supported before Spring Framework 5.1");
     }
 
     @Override
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
index 5b9c8475..8f30dbfa 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
@@ -21,14 +21,18 @@
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
+import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.function.Predicate;
 
+import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
+import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.util.ArrayUtils.EMPTY_OBJECT_ARRAY;
 import static io.microsphere.util.ArrayUtils.length;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
@@ -37,6 +41,8 @@
 import static java.util.Collections.unmodifiableSet;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
+import static org.springframework.core.ResolvableType.forClass;
+import static org.springframework.core.ResolvableType.forMethodReturnType;
 
 /**
  * {@link BeanDefinition} Utilities class
@@ -49,6 +55,18 @@
  */
 public abstract class BeanDefinitionUtils {
 
+    /**
+     * The name of getResolvableType() method.
+     *
+     * <ul>
+     *     <li>{@link RootBeanDefinition#getResolvableType()} since Spring Framework 5.1</li>
+     *     <li>{@link AbstractBeanDefinition#getResolvableType()} Spring Framework 5.2</li>
+     * </ul>
+     */
+    private static final String GET_RESOLVABLE_TYPE_METHOD_NAME = "getResolvableType";
+
+    private static final MethodHandle GET_RESOLVABLE_TYPE_METHOD_HANDLE = findVirtual(RootBeanDefinition.class, GET_RESOLVABLE_TYPE_METHOD_NAME);
+
     /**
      * Build a generic instance of {@link AbstractBeanDefinition}
      *
@@ -148,4 +166,56 @@ public static Set<String> findBeanNames(ConfigurableListableBeanFactory beanFact
     public static boolean isInfrastructureBean(BeanDefinition beanDefinition) {
         return beanDefinition != null && ROLE_INFRASTRUCTURE == beanDefinition.getRole();
     }
+
+    /**
+     * Get {@link ResolvableType} from {@link RootBeanDefinition}
+     *
+     * @param rootBeanDefinition {@link RootBeanDefinition}
+     * @return non-null
+     * @see RootBeanDefinition#getResolvableType()
+     */
+    public static ResolvableType getResolvableType(RootBeanDefinition rootBeanDefinition) {
+        if (GET_RESOLVABLE_TYPE_METHOD_HANDLE == null) {
+            return doGetResolvableType(rootBeanDefinition);
+        }
+        return execute(() -> (ResolvableType) GET_RESOLVABLE_TYPE_METHOD_HANDLE.invokeExact(rootBeanDefinition));
+    }
+
+    /**
+     * Get {@link ResolvableType} from {@link AbstractBeanDefinition}
+     *
+     * @param beanDefinition {@link AbstractBeanDefinition}
+     * @return {@link ResolvableType#NONE} if can't be resolved
+     * @see AbstractBeanDefinition#getResolvableType()
+     */
+    public static ResolvableType getResolvableType(AbstractBeanDefinition beanDefinition) {
+        if (beanDefinition instanceof RootBeanDefinition) {
+            return getResolvableType((RootBeanDefinition) beanDefinition);
+        }
+        return doGetResolvableType(beanDefinition);
+    }
+
+    /**
+     * Compatible with {@link RootBeanDefinition#getResolvableType()) since Spring Framework 5.1
+     *
+     * @param rootBeanDefinition {@link RootBeanDefinition}
+     * @return
+     */
+    protected static ResolvableType doGetResolvableType(RootBeanDefinition rootBeanDefinition) {
+        Method factoryMethod = rootBeanDefinition.getResolvedFactoryMethod();
+        if (factoryMethod != null) {
+            return forMethodReturnType(factoryMethod);
+        }
+        return doGetResolvableType((AbstractBeanDefinition) rootBeanDefinition);
+    }
+
+    /**
+     * Compatible with {@link AbstractBeanDefinition#getResolvableType()) since Spring Framework 5.2
+     *
+     * @param beanDefinition {@link AbstractBeanDefinition}
+     * @return {@link ResolvableType#NONE} if can't be resolved
+     */
+    protected static ResolvableType doGetResolvableType(AbstractBeanDefinition beanDefinition) {
+        return beanDefinition.hasBeanClass() ? forClass(beanDefinition.getBeanClass()) : ResolvableType.NONE;
+    }
 }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
index ed6c048e..405934b4 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
@@ -39,7 +39,7 @@ public void testGetVersion() {
             }
             Version version = resolveVersion(springVersion.name());
             assertEquals(springVersion.getVersion(), version);
-            assertTrue(springVersion.eq(version));
+            assertTrue(springVersion.getVersion().eq(version));
         }
     }
 }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
index a0ae9505..635f84a5 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
@@ -28,6 +28,10 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static io.microsphere.spring.core.SpringVersion.CURRENT;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_3_28;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_3_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -144,6 +148,7 @@ public void testGetDefaultProfiles() {
     public void testMatchesProfiles() {
         assertTrue(environment.matchesProfiles("test"));
         assertFalse(environment.matchesProfiles("!test"));
+
     }
 
     /**
@@ -156,7 +161,9 @@ public void testMatchesProfiles() {
     @Test
     public void testAcceptsProfiles() {
         assertTrue(environment.acceptsProfiles("test"));
-        assertTrue(environment.acceptsProfiles(profile -> true));
+        if (CURRENT.ge(SPRING_5_1)) {
+            assertTrue(environment.acceptsProfiles(profile -> true));
+        }
     }
 
     /**

From 5e9c4e6fcfd0a05a50d9d4b8f9766fac91234ad9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 13:32:26 +0800
Subject: [PATCH 058/157] Polish #38

---
 .../AnnotatedInjectionBeanPostProcessor.java       |  5 +++--
 ...otationBeanDefinitionRegistryPostProcessor.java |  6 +++---
 .../AnnotationInjectedBeanPostProcessor.java       |  6 +++---
 .../ConfigurationBeanBindingPostProcessor.java     | 14 +++++++-------
 .../ConfigurationBeanBindingRegistrar.java         | 10 +++++-----
 .../event/OnceApplicationContextEventListener.java | 10 +++++-----
 .../convert/support/ConversionServiceResolver.java |  6 +++---
 .../util/AnnotatedBeanDefinitionRegistryUtils.java |  6 +++---
 .../java/io/microsphere/spring/util/BeanUtils.java |  6 +++---
 9 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index 9bc91622..74b1fae7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -17,7 +17,8 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
-import org.apache.commons.logging.Log;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
@@ -107,7 +108,7 @@ public class AnnotatedInjectionBeanPostProcessor extends InstantiationAwareBeanP
 
     private final static int CACHE_SIZE = Integer.getInteger("microsphere.spring.injection.metadata.cache.size", 32);
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final Collection<Class<? extends Annotation>> annotationTypes;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index a259e0e9..887a7f18 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.context.annotation.ExposingClassPathBeanDefinitionScanner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
@@ -79,7 +79,7 @@
 public abstract class AnnotationBeanDefinitionRegistryPostProcessor implements BeanDefinitionRegistryPostProcessor,
         BeanFactoryAware, EnvironmentAware, ResourceLoaderAware, BeanClassLoaderAware {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final Set<Class<? extends Annotation>> supportedAnnotationTypes;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
index 14393908..e40caa82 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
@@ -80,7 +80,7 @@ public abstract class AnnotationInjectedBeanPostProcessor<A extends Annotation>
 
     private final static PropertyDescriptor[] EMPTY_PROPERTY_DESCRIPTOR_ARRAY = new PropertyDescriptor[0];
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final Class<A> annotationType;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
index e89cb217..94708867 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
@@ -20,8 +20,8 @@
 import io.microsphere.spring.context.config.ConfigurationBeanCustomizer;
 import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.core.convert.support.ConversionServiceResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -65,7 +65,7 @@ public class ConfigurationBeanBindingPostProcessor implements BeanPostProcessor,
 
     static final String IGNORE_INVALID_FIELDS_ATTRIBUTE_NAME = "ignoreInvalidFields";
 
-    private final Log log = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private ConfigurableListableBeanFactory beanFactory = null;
 
@@ -154,8 +154,8 @@ private void bindConfigurationBean(Object configurationBean, BeanDefinition bean
 
         getConfigurationBeanBinder().bind(configurationProperties, ignoreUnknownFields, ignoreInvalidFields, configurationBean);
 
-        if (log.isInfoEnabled()) {
-            log.info("The configuration bean [" + configurationBean + "] have been binding by the " + "configuration properties [" + configurationProperties + "]");
+        if (logger.isInfoEnabled()) {
+            logger.info("The configuration bean [" + configurationBean + "] have been binding by the " + "configuration properties [" + configurationProperties + "]");
         }
     }
 
@@ -165,8 +165,8 @@ private void initConfigurationBeanBinder() {
             try {
                 configurationBeanBinder = beanFactory.getBean(ConfigurationBeanBinder.class);
             } catch (BeansException ignored) {
-                if (log.isInfoEnabled()) {
-                    log.info("configurationBeanBinder Bean can't be found in ApplicationContext.");
+                if (logger.isInfoEnabled()) {
+                    logger.info("configurationBeanBinder Bean can't be found in ApplicationContext.");
                 }
                 // Use Default implementation
                 configurationBeanBinder = defaultConfigurationBeanBinder();
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index af21ec43..7827af32 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -18,8 +18,8 @@
 
 import io.microsphere.spring.beans.factory.support.ConfigurationBeanAliasGenerator;
 import io.microsphere.spring.util.PropertySourcesUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -69,7 +69,7 @@ public class ConfigurationBeanBindingRegistrar implements ImportBeanDefinitionRe
 
     private final static String ENABLE_CONFIGURATION_BINDING_CLASS_NAME = ENABLE_CONFIGURATION_BINDING_CLASS.getName();
 
-    private final Log log = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private ConfigurableEnvironment environment;
     private BeanFactory beanFactory;
@@ -145,8 +145,8 @@ private void registerConfigurationBean(String beanName, Class<?> configClass, bo
 
         registry.registerBeanDefinition(beanName, beanDefinition);
 
-        if (log.isInfoEnabled()) {
-            log.info("The configuration bean definition [name : " + beanName + ", content : " + beanDefinition
+        if (logger.isInfoEnabled()) {
+            logger.info("The configuration bean definition [name : " + beanName + ", content : " + beanDefinition
                     + "] has been registered.");
         }
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/OnceApplicationContextEventListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/OnceApplicationContextEventListener.java
index f8b6d848..cd6bea86 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/OnceApplicationContextEventListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/OnceApplicationContextEventListener.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -37,7 +37,7 @@
 public abstract class OnceApplicationContextEventListener<E extends ApplicationContextEvent> implements ApplicationListener<E>,
         ApplicationContextAware {
 
-    protected final Log log = LogFactory.getLog(getClass());
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     private ApplicationContext applicationContext;
 
@@ -72,8 +72,8 @@ private boolean isOriginalEventSource(ApplicationEvent event) {
         boolean originalEventSource = nullSafeEquals(getApplicationContext(), event.getSource());
 
         if (!originalEventSource) {
-            if (log.isDebugEnabled()) {
-                log.debug("The source of event[" + event.getSource() + "] is not original!");
+            if (logger.isDebugEnabled()) {
+                logger.debug("The source of event[" + event.getSource() + "] is not original!");
             }
         }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
index 9592cb3b..b6397cf1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
@@ -15,8 +15,8 @@
  */
 package io.microsphere.spring.core.convert.support;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.SingletonBeanRegistry;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -46,7 +46,7 @@ public class ConversionServiceResolver {
      */
     public static final String RESOLVED_CONVERSION_SERVICE_BEAN_NAME = "resolved-" + CONVERSION_SERVICE_BEAN_NAME;
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final ConfigurableBeanFactory beanFactory;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
index 6a27ff62..b3a09b0d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -41,7 +41,7 @@
  */
 public abstract class AnnotatedBeanDefinitionRegistryUtils {
 
-    private static final Log logger = LogFactory.getLog(AnnotatedBeanDefinitionRegistryUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(AnnotatedBeanDefinitionRegistryUtils.class);
 
     /**
      * Is present bean that was registered by the specified {@link Annotation annotated} {@link Class class}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index 7f9ff1d1..d44dd2a2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.Aware;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -60,7 +60,7 @@
  */
 public abstract class BeanUtils {
 
-    private static final Log logger = LogFactory.getLog(BeanUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(BeanUtils.class);
 
     private static final String[] EMPTY_BEAN_NAMES = new String[0];
 

From 55d4033228b51fa6e22c033127ad8dd9f7338ca3 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 14:05:20 +0800
Subject: [PATCH 059/157] Polish #39

---
 .../spring/util/MimeTypeUtils.java            | 116 ++++++++++++++++++
 .../spring/util/MimeTypeUtilsTest.java        |  83 +++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
 create mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
new file mode 100644
index 00000000..955a9f56
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.util;
+
+import io.microsphere.util.BaseUtils;
+import org.springframework.lang.Nullable;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeType;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static io.microsphere.collection.CollectionUtils.isEmpty;
+
+/**
+ * The utility class for MIME Type
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see MimeType
+ * @see org.springframework.util.MimeTypeUtils
+ * @since 1.0.0
+ */
+public abstract class MimeTypeUtils extends BaseUtils {
+
+    /**
+     * Public constant mime type for {@code application/graphql+json}.
+     *
+     * @see <a href="https://github.com/graphql/graphql-over-http">GraphQL over HTTP spec</a>
+     * @since Spring Framework 5.3.19
+     */
+    public static final MimeType APPLICATION_GRAPHQL = new MimeType("application", "graphql+json");
+
+    /**
+     * A String equivalent of {@link org.springframework.util.MimeTypeUtils#APPLICATION_GRAPHQL}.
+     *
+     * @since Spring Framework 5.3.19
+     */
+    public static final String APPLICATION_GRAPHQL_VALUE = "application/graphql+json";
+
+    /**
+     * Unlike {@link Collection#contains(Object)} which relies on
+     * {@link MimeType#equals(Object)}, this method only checks the type and the
+     * subtype, but otherwise ignores parameters.
+     *
+     * @param targetMimeType the mime type to check
+     * @param mimeTypes      the list of mime types to perform the check against
+     * @return whether the list contains the given mime type
+     * @since Spring Framework 5.1.4
+     */
+    public static boolean isPresentIn(MimeType targetMimeType, Collection<? extends MimeType> mimeTypes) {
+        if (isEmpty(mimeTypes)) {
+            return false;
+        }
+        for (MimeType mimeType : mimeTypes) {
+            if (equalsTypeAndSubtype(mimeType, targetMimeType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Similar to {@link MimeType#equals(Object)} but based on the type and subtype
+     * only, i.e. ignoring parameters.
+     *
+     * @param one   the mime type to compare
+     * @param other the other mime type to compare to
+     * @return whether the two mime types have the same type and subtype
+     * @since Spring Framework 5.1.4
+     */
+    public static boolean equalsTypeAndSubtype(MimeType one, MimeType other) {
+        if (one == other) {
+            return true;
+        }
+        if (one == null || other == null) {
+            return false;
+        }
+        return one.getType().equalsIgnoreCase(other.getType()) && one.getSubtype().equalsIgnoreCase(other.getSubtype());
+    }
+
+    /**
+     * Return the subtype suffix as defined in RFC 6839.
+     *
+     * @since Spring Framework 5.3
+     */
+    @Nullable
+    public static String getSubtypeSuffix(MimeType one) {
+        if (one == null) {
+            return null;
+        }
+        String subtype = one.getSubtype();
+        int suffixIndex = subtype.lastIndexOf('+');
+        if (suffixIndex != -1 && subtype.length() > suffixIndex) {
+            return subtype.substring(suffixIndex + 1);
+        }
+        return null;
+    }
+
+}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
new file mode 100644
index 00000000..0f808198
--- /dev/null
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.util;
+
+import org.junit.Test;
+import org.springframework.util.MimeType;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static io.microsphere.spring.util.MimeTypeUtils.APPLICATION_GRAPHQL;
+import static io.microsphere.spring.util.MimeTypeUtils.APPLICATION_GRAPHQL_VALUE;
+import static io.microsphere.spring.util.MimeTypeUtils.equalsTypeAndSubtype;
+import static io.microsphere.spring.util.MimeTypeUtils.getSubtypeSuffix;
+import static io.microsphere.spring.util.MimeTypeUtils.isPresentIn;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * {@link MimeTypeUtils} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see MimeTypeUtils
+ * @since 1.0.0
+ */
+public class MimeTypeUtilsTest {
+
+    private static final MimeType APPLICATION_TEXT = new MimeType("application", "text");
+
+    @Test
+    public void testConstants() {
+        assertEquals("application", APPLICATION_GRAPHQL.getType());
+        assertEquals("graphql+json", APPLICATION_GRAPHQL.getSubtype());
+        assertEquals("application/graphql+json", APPLICATION_GRAPHQL_VALUE);
+    }
+
+    @Test
+    public void testEqualsTypeAndSubtype() {
+        assertTrue(equalsTypeAndSubtype(APPLICATION_GRAPHQL, APPLICATION_GRAPHQL));
+        assertTrue(equalsTypeAndSubtype(APPLICATION_GRAPHQL, new MimeType("application", "graphql+json")));
+        assertTrue(equalsTypeAndSubtype(new MimeType("application", "graphql+json"), APPLICATION_GRAPHQL));
+        assertFalse(equalsTypeAndSubtype(null, APPLICATION_GRAPHQL));
+        assertFalse(equalsTypeAndSubtype(APPLICATION_GRAPHQL, null));
+        assertFalse(equalsTypeAndSubtype(APPLICATION_GRAPHQL, APPLICATION_TEXT));
+        assertFalse(equalsTypeAndSubtype(APPLICATION_TEXT, APPLICATION_GRAPHQL));
+    }
+
+    @Test
+    public void testGetSubtypeSuffix() {
+        assertNull(getSubtypeSuffix(null));
+        assertNull(getSubtypeSuffix(new MimeType("application")));
+        assertNull(getSubtypeSuffix(new MimeType("application", "json")));
+        assertEquals("json", getSubtypeSuffix(APPLICATION_GRAPHQL));
+        assertEquals("xml", getSubtypeSuffix(new MimeType("application", "text+xml")));
+    }
+
+    @Test
+    public void testIsPresentIn() {
+        assertFalse(isPresentIn(APPLICATION_GRAPHQL, null));
+        assertFalse(isPresentIn(APPLICATION_GRAPHQL, emptyList()));
+        assertFalse(isPresentIn(APPLICATION_GRAPHQL, asList(APPLICATION_TEXT)));
+        assertTrue(isPresentIn(APPLICATION_GRAPHQL, asList(APPLICATION_TEXT, APPLICATION_GRAPHQL)));
+        assertTrue(isPresentIn(APPLICATION_GRAPHQL, asList(APPLICATION_GRAPHQL)));
+    }
+}

From 4d9b2a458ac6dc332d12f85a456a7a9349fec7c6 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 14:06:23 +0800
Subject: [PATCH 060/157] Polish #34

---
 .../microsphere/spring/web/rule/WebRequestProducesRule.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
index ebb9b4fa..b0264fb3 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
@@ -19,6 +19,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeType;
 import org.springframework.web.HttpMediaTypeException;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -30,6 +31,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static io.microsphere.spring.util.MimeTypeUtils.isPresentIn;
 import static io.microsphere.spring.web.rule.ProduceMediaTypeExpression.parseExpressions;
 import static io.microsphere.spring.web.util.WebRequestUtils.isPreFlightRequest;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
@@ -111,7 +113,7 @@ public boolean matches(NativeWebRequest request) {
         List<ProduceMediaTypeExpression> result = getMatchingExpressions(acceptedMediaTypes);
         if (!CollectionUtils.isEmpty(result)) {
             return false;
-        } else if (MediaType.ALL.isPresentIn(acceptedMediaTypes)) {
+        } else if (isPresentIn(MediaType.ALL, acceptedMediaTypes)) {
             return false;
         }
         return true;

From 32f21413884b9102bf5c9596a2cd99a1d6a582f8 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 14:06:28 +0800
Subject: [PATCH 061/157] Update WebMvcExtensionConfiguration.java

---
 .../spring/webmvc/annotation/WebMvcExtensionConfiguration.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
index a008055c..e9727088 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
@@ -38,7 +38,8 @@ public class WebMvcExtensionConfiguration extends WebMvcConfigurerAdapter {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        for (LazyCompositeHandlerInterceptor lazyCompositeHandlerInterceptor : lazyCompositeHandlerInterceptorProvider) {
+        LazyCompositeHandlerInterceptor lazyCompositeHandlerInterceptor = lazyCompositeHandlerInterceptorProvider.getIfAvailable();
+        if (lazyCompositeHandlerInterceptor != null) {
             registry.addInterceptor(lazyCompositeHandlerInterceptor);
         }
     }

From 8edbad28da5a4955717fac239bbf55e3027486c2 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 14:12:51 +0800
Subject: [PATCH 062/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index a1f59d28..db59cf44 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -22,8 +22,8 @@ jobs:
         java: [ '8', '11' , '17' , '21' ]
         maven-profile-spring-boot: [
           'spring-framework-5.3' , 'spring-framework-5.2', 'spring-framework-5.1' , 'spring-framework-5.0' ,
-          'spring-framework-4.3' , 'spring-framework-4.2' , 'spring-framework-4.1', 'spring-framework-4.0' ,
-          'spring-framework-3.2'
+#          'spring-framework-4.3' , 'spring-framework-4.2' , 'spring-framework-4.1', 'spring-framework-4.0' ,
+#          'spring-framework-3.2'
         ]
     steps:
       - name: Checkout Source

From 51bdf839fcfc9c01278721ee0582e00423d3bb0d Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 20 Dec 2024 16:13:43 +0800
Subject: [PATCH 063/157] Update pom.xml

---
 microsphere-spring-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 4002a0da..893f2a07 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -27,7 +27,7 @@
         <slf4j.version>1.7.36</slf4j.version>
         <logback.version>1.2.12</logback.version>
         <junit.version>4.13.2</junit.version>
-        <mockito.version>5.14.2</mockito.version>
+        <mockito.version>4.11.0</mockito.version>
     </properties>
 
     <dependencyManagement>

From 7a0d45db58b35cfe04cfdd9d5c73d79666c137be Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 24 Dec 2024 10:48:32 +0800
Subject: [PATCH 064/157] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bdac80e1..5f91adec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.microsphere-projects</groupId>
         <artifactId>microsphere-build</artifactId>
-        <version>0.0.21</version>
+        <version>0.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 34dfe881af44fddfbeb8a7fe0e18521342f7d663 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 24 Dec 2024 10:48:36 +0800
Subject: [PATCH 065/157] Update maven-build.yml

---
 .github/workflows/maven-build.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index db59cf44..f85569ae 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -42,6 +42,11 @@ jobs:
           --update-snapshots
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
-          -DargLine="${{ matrix.java >= 16 && '--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED' || '' }}"
-          -P${{ matrix.maven-profile-spring-boot }}
-          test
\ No newline at end of file
+          test
+          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-boot }}
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: microsphere-projects/microsphere-spring
\ No newline at end of file

From 089e9f8cb84cf4d32b2e9caf190d48112ecfa7fe Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 24 Dec 2024 10:57:14 +0800
Subject: [PATCH 066/157] Update maven-publish.yml

---
 .github/workflows/maven-publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 41ed517f..0a0e69e9 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -41,11 +41,10 @@ jobs:
           --batch-mode
           --update-snapshots
           --file pom.xml
-          -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
           -Drevision=${{ inputs.revision }} 
           -Dgpg.skip=true 
-          -Prelease,ci 
           deploy
+          --activate-profiles release,ci
         env:
           MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}

From 1d02f595df53204b343c26c5aff223b86fd4924a Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Tue, 24 Dec 2024 11:04:23 +0800
Subject: [PATCH 067/157] Update README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 216d6189..47f951e6 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
 # microsphere-spring
-Microsphere Projects for Spring 
+> Microsphere Projects for Spring
+
+[![Maven Build](https://github.com/microsphere-projects/microsphere-spring/actions/workflows/maven-build.yml/badge.svg)](https://github.com/microsphere-projects/microsphere-spring/actions/workflows/maven-build.yml)
+[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-spring/branch/dev-1.x/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-spring)
+![Maven](https://img.shields.io/maven-central/v/io.github.microsphere-projects/microsphere-spring.svg)
+![License](https://img.shields.io/github/license/microsphere-projects/microsphere-spring.svg)
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/microsphere-projects/microsphere-spring.svg)](http://isitmaintained.com/project/microsphere-projects/microsphere-spring "Average time to resolve an issue")
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/microsphere-projects/microsphere-spring.svg)](http://isitmaintained.com/project/microsphere-projects/microsphere-spring "Percentage of issues still open")
\ No newline at end of file

From a3773888dbf7705d60673429dc12442c794ffba1 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 08:41:46 +0800
Subject: [PATCH 068/157] Polish. #40

---
 microsphere-spring-context/pom.xml            | 10 +++++--
 .../beans/factory/BeanDependencyResolver.java |  6 ++--
 .../DefaultBeanDependencyResolver.java        |  2 +-
 .../spring/beans/factory/Dependency.java      |  2 +-
 .../AnnotatedInjectionBeanPostProcessor.java  |  2 +-
 ...ntiationAwareBeanPostProcessorAdapter.java |  2 +-
 .../AutowireCandidateResolvingListener.java   |  2 +-
 .../ListenableAutowireCandidateResolver.java  |  2 +-
 .../redis/TTLRedisCacheWriterWrapper.java     |  2 +-
 .../spring/config/ConfigurationProperty.java  | 18 +++++------
 .../AnnotatedPropertySourceLoader.java        | 10 +++----
 .../PropertySourceExtensionAttributes.java    |  2 +-
 .../PropertySourceExtensionLoader.java        |  8 ++---
 .../annotation/ResourcePropertySources.java   |  4 +--
 .../env/event/PropertySourceChangedEvent.java | 10 +++----
 .../event/PropertySourcesChangedEvent.java    |  8 ++---
 .../BeanCapableImportCandidate.java           | 10 +++----
 .../annotation/EventExtensionRegistrar.java   |  2 +-
 .../config/ConfigurationBeanBinder.java       |  2 +-
 ...DependencyAnalysisBeanFactoryListener.java |  2 +-
 .../GenericApplicationListenerAdapter.java    |  2 +-
 ...terceptingApplicationEventMulticaster.java |  2 +-
 ...ptingApplicationEventMulticasterProxy.java |  2 +-
 .../io/microsphere/spring/core/SpringAPI.java |  2 +-
 .../GenericAnnotationAttributes.java          | 14 ++++-----
 ...lvablePlaceholderAnnotationAttributes.java | 16 +++++-----
 .../ListenableConfigurableEnvironment.java    |  6 ++--
 .../core/env/PropertyResolverListener.java    |  2 +-
 .../spring/util/AnnotationUtils.java          |  2 +-
 .../spring/util/ApplicationContextUtils.java  |  6 ++--
 .../spring/util/BeanDefinitionUtils.java      |  2 +-
 .../spring/util/BeanFactoryUtils.java         |  2 +-
 .../io/microsphere/spring/util/BeanUtils.java |  2 +-
 .../spring/util/MimeTypeUtils.java            |  2 +-
 .../spring/util/PropertySourcesUtils.java     |  6 ++--
 .../spring/util/ResourceLoaderUtils.java      | 12 ++++----
 .../util/SpringFactoriesLoaderUtils.java      |  2 +-
 .../spring/util/SpringVersionUtils.java       | 12 ++++----
 .../core/env/ProfilesParser.java              |  2 +-
 microsphere-spring-parent/pom.xml             |  4 +--
 microsphere-spring-web/pom.xml                |  7 +++++
 .../AbstractWebEndpointMappingFactory.java    |  2 +-
 ...RegistrationWebEndpointMappingFactory.java |  6 ++--
 .../SmartWebEndpointMappingFactory.java       |  2 +-
 .../web/metadata/WebEndpointMapping.java      | 22 +++++++-------
 .../metadata/WebEndpointMappingFactory.java   |  4 +--
 .../metadata/WebEndpointMappingRegistry.java  |  4 +--
 .../method/support/HandlerMethodAdvice.java   |  2 +-
 .../support/HandlerMethodInterceptor.java     |  2 +-
 .../web/rule/AbstractNameValueExpression.java |  2 +-
 .../web/rule/AbstractWebRequestRule.java      |  2 +-
 .../web/rule/ConsumeMediaTypeExpression.java  |  2 +-
 .../web/rule/GenericMediaTypeExpression.java  |  2 +-
 .../spring/web/rule/NameValueExpression.java  |  2 +-
 .../web/rule/ProduceMediaTypeExpression.java  |  2 +-
 .../web/rule/StringNameValueExpression.java   |  2 +-
 .../web/rule/WebRequestPattensRule.java       |  2 +-
 .../web/rule/WebRequestProducesRule.java      |  2 +-
 .../spring/web/rule/WebRequestRule.java       |  2 +-
 .../web/servlet/TestServletContext.java       |  2 +-
 microsphere-spring-webflux/pom.xml            | 30 +++++++++++++++++++
 microsphere-spring-webmvc/pom.xml             |  7 +++++
 .../handler/ReversedProxyHandlerMapping.java  |  2 +-
 .../interceptor/MethodHandlerInterceptor.java |  2 +-
 .../HandlerMethodArgumentResolverAdvice.java  |  2 +-
 .../InterceptingHandlerMethodProcessor.java   |  2 +-
 66 files changed, 185 insertions(+), 139 deletions(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index 85b893ca..910c01fc 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -27,6 +27,13 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- JSR 305 -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- MicroSphere Core -->
         <dependency>
             <groupId>io.github.microsphere-projects</groupId>
@@ -155,9 +162,6 @@
 
         <profile>
             <id>spring-framework-5.3</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework</groupId>
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
index d79a0048..b4737b6d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
@@ -19,7 +19,7 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.util.Map;
 import java.util.Set;
@@ -41,7 +41,7 @@ public interface BeanDependencyResolver {
      * @param beanFactory {@link ConfigurableListableBeanFactory}
      * @return non-null read-only {@link Map}
      */
-    @NonNull
+    @Nonnull
     Map<String, Set<String>> resolve(ConfigurableListableBeanFactory beanFactory);
 
     /**
@@ -52,6 +52,6 @@ public interface BeanDependencyResolver {
      * @param beanFactory          {@link ConfigurableListableBeanFactory}
      * @return non-null read-only {@link Set}
      */
-    @NonNull
+    @Nonnull
     Set<String> resolve(String beanName, RootBeanDefinition mergedBeanDefinition, ConfigurableListableBeanFactory beanFactory);
 }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index 1935a893..b1fb70ef 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -35,7 +35,7 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.StopWatch;
 
 import java.lang.reflect.Constructor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
index 97b4ed22..4687ce36 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
@@ -18,7 +18,7 @@
 
 import io.microsphere.collection.CollectionUtils;
 import io.microsphere.util.ArrayUtils;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.Assert;
 
 import java.util.Arrays;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index 74b1fae7..e3a98333 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -47,7 +47,7 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
index 29e4ce7d..9df2aeba 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
index e8c87a45..b06f7b59 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index c5e1de2b..50a76a94 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -32,7 +32,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
index 47529159..8dd6d59b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/redis/TTLRedisCacheWriterWrapper.java
@@ -19,7 +19,7 @@
 //import org.springframework.data.redis.cache.CacheStatistics;
 //import org.springframework.data.redis.cache.CacheStatisticsCollector;
 //import org.springframework.data.redis.cache.RedisCacheWriter;
-//import org.springframework.lang.Nullable;
+//import javax.annotation.Nullable;
 //
 //import java.time.Duration;
 //import java.util.concurrent.CompletableFuture;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
index bbbf7af0..13f2e8ea 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
@@ -18,8 +18,8 @@
 
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
@@ -39,13 +39,13 @@ public class ConfigurationProperty {
     /**
      * The name of the property
      */
-    @NonNull
+    @Nonnull
     private final String name;
 
     /**
      * The type of the property
      */
-    @NonNull
+    @Nonnull
     private Class<?> type;
 
     /**
@@ -68,7 +68,7 @@ public class ConfigurationProperty {
     /**
      * The metadata of the property
      */
-    @NonNull
+    @Nonnull
     private final Metadata metadata;
 
     public ConfigurationProperty(String name) {
@@ -82,17 +82,17 @@ public ConfigurationProperty(String name, Class<?> type) {
         this.metadata = new Metadata();
     }
 
-    @NonNull
+    @Nonnull
     public String getName() {
         return name;
     }
 
-    @NonNull
+    @Nonnull
     public Class<?> getType() {
         return type;
     }
 
-    public void setType(@NonNull Class<?> type) {
+    public void setType(@Nonnull Class<?> type) {
         notNull(type, () -> "the property type must not null");
         this.type = type;
     }
@@ -123,7 +123,7 @@ public void setRequired(boolean required) {
         this.required = required;
     }
 
-    @NonNull
+    @Nonnull
     public Metadata getMetadata() {
         return metadata;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
index 5405cf59..9e68c60d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
@@ -28,8 +28,8 @@
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -97,7 +97,7 @@ public final String[] selectImports(AnnotationMetadata metadata) {
      * @param metadata   {@link AnnotationMetadata}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     protected final String resolvePropertySourceName(AnnotationAttributes attributes, AnnotationMetadata metadata) {
         String name = buildPropertySourceName(attributes, metadata);
         if (!hasText(name)) {
@@ -129,7 +129,7 @@ protected String buildPropertySourceName(AnnotationAttributes attributes, Annota
      * @param metadata   {@link AnnotationMetadata}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     protected String buildDefaultPropertySourceName(AnnotationAttributes attributes, AnnotationMetadata metadata) {
         String annotationClassName = annotationType.getName();
         String introspectedClassName = metadata.getClassName();
@@ -154,7 +154,7 @@ protected abstract void loadPropertySource(AnnotationAttributes attributes, Anno
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public final Class<A> getAnnotationType() {
         return annotationType;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
index 8a2ef001..8e8aa5ad 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
@@ -21,7 +21,7 @@
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PropertySourceFactory;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.util.Comparator;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
index 7a4ae76e..681a4c3d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
@@ -36,8 +36,8 @@
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PropertySourceFactory;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -441,7 +441,7 @@ private MutablePropertySources getPropertySources() {
      * @see PropertySourceExtension#factory()
      * @see PropertySourceFactory
      */
-    @NonNull
+    @Nonnull
     protected PropertySourceFactory createPropertySourceFactory(EA extensionAttributes) {
         return createInstance(extensionAttributes, PropertySourceExtensionAttributes::getPropertySourceFactoryClass);
     }
@@ -455,7 +455,7 @@ protected PropertySourceFactory createPropertySourceFactory(EA extensionAttribut
      * @see PropertySourceExtension#resourceComparator()
      * @see Comparator
      */
-    @NonNull
+    @Nonnull
     protected Comparator<Resource> createResourceComparator(EA extensionAttributes, String propertySourceName) {
         return createInstance(extensionAttributes, PropertySourceExtensionAttributes::getResourceComparatorClass);
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
index 07983fdb..45875db2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.config.context.annotation;
 
 import org.springframework.context.annotation.Import;
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -43,6 +43,6 @@
     /**
      * The several {@link ResourcePropertySource} annotations.
      */
-    @NonNull
+    @Nonnull
     ResourcePropertySource[] value();
 }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
index 85c3d085..3d887f6c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
@@ -21,8 +21,8 @@
 import org.springframework.context.event.ApplicationContextEvent;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import static org.springframework.util.Assert.notNull;
 
@@ -83,7 +83,7 @@ public Kind getKind() {
      * @param newPropertySource the new {@link PropertySource}
      * @return non-null
      */
-    public static PropertySourceChangedEvent added(ApplicationContext source, @NonNull PropertySource newPropertySource) {
+    public static PropertySourceChangedEvent added(ApplicationContext source, @Nonnull PropertySource newPropertySource) {
         notNull(newPropertySource, "The 'newPropertySource' must not be null!");
         return new PropertySourceChangedEvent(source, Kind.ADDED, newPropertySource);
     }
@@ -96,7 +96,7 @@ public static PropertySourceChangedEvent added(ApplicationContext source, @NonNu
      * @param oldPropertySource the old {@link PropertySource}
      * @return non-null
      */
-    public static PropertySourceChangedEvent replaced(ApplicationContext source, @NonNull PropertySource newPropertySource, @NonNull PropertySource oldPropertySource) {
+    public static PropertySourceChangedEvent replaced(ApplicationContext source, @Nonnull PropertySource newPropertySource, @Nonnull PropertySource oldPropertySource) {
         notNull(newPropertySource, "The 'newPropertySource' must not be null!");
         notNull(oldPropertySource, "The 'oldPropertySource' must not be null!");
         return new PropertySourceChangedEvent(source, Kind.REPLACED, newPropertySource, oldPropertySource);
@@ -109,7 +109,7 @@ public static PropertySourceChangedEvent replaced(ApplicationContext source, @No
      * @param oldPropertySource the old {@link PropertySource}
      * @return non-null
      */
-    public static PropertySourceChangedEvent removed(ApplicationContext source, @NonNull PropertySource oldPropertySource) {
+    public static PropertySourceChangedEvent removed(ApplicationContext source, @Nonnull PropertySource oldPropertySource) {
         notNull(oldPropertySource, "The 'oldPropertySource' must not be null!");
         return new PropertySourceChangedEvent(source, Kind.REMOVED, null, oldPropertySource);
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
index df2dcd68..fff3e181 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
@@ -22,7 +22,7 @@
 import org.springframework.context.event.ApplicationContextEvent;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -66,7 +66,7 @@ public List<PropertySourceChangedEvent> getSubEvents() {
     /**
      * @return Get the changed properties
      */
-    @NonNull
+    @Nonnull
     public Map<String, Object> getChangedProperties() {
         return getProperties(PropertySourceChangedEvent::getNewPropertySource, PropertySourcesUtils::getProperties,
                 PropertySourceChangedEvent.Kind.ADDED, PropertySourceChangedEvent.Kind.REPLACED);
@@ -75,7 +75,7 @@ public Map<String, Object> getChangedProperties() {
     /**
      * @return Get the added properties
      */
-    @NonNull
+    @Nonnull
     public Map<String, Object> getAddedProperties() {
         return getProperties(PropertySourceChangedEvent::getNewPropertySource, PropertySourcesUtils::getProperties,
                 PropertySourceChangedEvent.Kind.ADDED);
@@ -84,7 +84,7 @@ public Map<String, Object> getAddedProperties() {
     /**
      * @return Get the removed properties
      */
-    @NonNull
+    @Nonnull
     public Map<String, Object> getRemovedProperties() {
         return getProperties(PropertySourceChangedEvent::getOldPropertySource, PropertySourcesUtils::getProperties,
                 PropertySourceChangedEvent.Kind.REMOVED);
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
index eac9cd48..711fae9a 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
@@ -34,7 +34,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 import org.springframework.util.Assert;
 
 import static io.microsphere.text.FormatUtils.format;
@@ -115,7 +115,7 @@ public final void setResourceLoader(ResourceLoader resourceLoader) {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public final ClassLoader getClassLoader() {
         return classLoader;
     }
@@ -125,7 +125,7 @@ public final ClassLoader getClassLoader() {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public final ConfigurableListableBeanFactory getBeanFactory() {
         return beanFactory;
     }
@@ -136,7 +136,7 @@ public final ConfigurableListableBeanFactory getBeanFactory() {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public final ConfigurableEnvironment getEnvironment() {
         return environment;
     }
@@ -146,7 +146,7 @@ public final ConfigurableEnvironment getEnvironment() {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public final ResourceLoader getResourceLoader() {
         return resourceLoader;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
index d766be08..647b55b9 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
@@ -31,7 +31,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.Map;
 import java.util.concurrent.Executor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
index ede70162..6fcb31c5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
@@ -19,7 +19,7 @@
 import io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.Environment;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.Map;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index 4edad933..d87daebd 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
index 222c04b7..29c0cd0d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
@@ -19,7 +19,7 @@
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.event.GenericApplicationListener;
 import org.springframework.context.event.SmartApplicationListener;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import static org.springframework.core.ResolvableType.forClass;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
index 27acbaac..af3764b4 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
@@ -23,7 +23,7 @@
 import org.springframework.context.event.ApplicationEventMulticaster;
 import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.core.ResolvableType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.List;
 import java.util.concurrent.Executor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
index d4fce891..b5e454ac 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
@@ -27,7 +27,7 @@
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.env.Environment;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.lang.reflect.Method;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
index 9b6f47d8..6b45f79c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringAPI.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.core;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import static io.microsphere.spring.core.SpringVersion.SPRING_4_1;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_3;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
index dc7be6ed..be7d0710 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.core.annotation;
 
 import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
@@ -117,8 +117,8 @@ public int hashCode() {
      * @param <A>        the {@link Class class} of {@link Annotation annotation}
      * @return non-null
      */
-    @NonNull
-    public static <A extends Annotation> GenericAnnotationAttributes<A> of(@NonNull A annotation) {
+    @Nonnull
+    public static <A extends Annotation> GenericAnnotationAttributes<A> of(@Nonnull A annotation) {
         return new GenericAnnotationAttributes(annotation);
     }
 
@@ -129,8 +129,8 @@ public static <A extends Annotation> GenericAnnotationAttributes<A> of(@NonNull
      * @param <A>        the {@link Class class} of {@link Annotation annotation}
      * @return non-null
      */
-    @NonNull
-    public static <A extends Annotation> GenericAnnotationAttributes<A> of(@NonNull AnnotationAttributes attributes) {
+    @Nonnull
+    public static <A extends Annotation> GenericAnnotationAttributes<A> of(@Nonnull AnnotationAttributes attributes) {
         if (attributes instanceof GenericAnnotationAttributes) {
             return (GenericAnnotationAttributes) attributes;
         }
@@ -143,7 +143,7 @@ public static <A extends Annotation> GenericAnnotationAttributes<A> of(@NonNull
      * @param attributesArray
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static Set<AnnotationAttributes> ofSet(@Nullable AnnotationAttributes... attributesArray) {
         int length = attributesArray == null ? 0 : attributesArray.length;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
index 5d77a89c..30dc2c09 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
@@ -18,8 +18,8 @@
 
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.PropertyResolver;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
@@ -89,8 +89,8 @@ private static String resolvePlaceholder(String value, @Nullable PropertyResolve
      * @param <A>              the {@link Class class} of {@link Annotation annotation}
      * @return non-null
      */
-    @NonNull
-    public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A> of(@NonNull AnnotationAttributes attributes,
+    @Nonnull
+    public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A> of(@Nonnull AnnotationAttributes attributes,
                                                                                          @Nullable PropertyResolver propertyResolver) {
         if (attributes instanceof ResolvablePlaceholderAnnotationAttributes) {
             return (ResolvablePlaceholderAnnotationAttributes) attributes;
@@ -106,8 +106,8 @@ public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A
      * @param <A>              the {@link Class class} of {@link Annotation annotation}
      * @return non-null
      */
-    @NonNull
-    public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A> of(@NonNull A annotation,
+    @Nonnull
+    public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A> of(@Nonnull A annotation,
                                                                                          @Nullable PropertyResolver propertyResolver) {
         return new ResolvablePlaceholderAnnotationAttributes(annotation, propertyResolver);
     }
@@ -120,7 +120,7 @@ public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A
      * @param <A>              the {@link Class class} of {@link Annotation annotation}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A> of(Map<String, Object> attributes,
                                                                                          Class<A> annotationType,
                                                                                          @Nullable PropertyResolver propertyResolver) {
@@ -134,7 +134,7 @@ public static <A extends Annotation> ResolvablePlaceholderAnnotationAttributes<A
      * @param propertyResolver
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static Set<AnnotationAttributes> ofSet(@Nullable AnnotationAttributes[] attributesArray, @Nullable PropertyResolver propertyResolver) {
         int length = attributesArray == null ? 0 : attributesArray.length;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index ef1bc9c1..4d68d2b5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -26,8 +26,8 @@
 import org.springframework.core.env.MissingRequiredPropertiesException;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.Profiles;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
@@ -365,7 +365,7 @@ public void validateRequiredProperties() throws MissingRequiredPropertiesExcepti
      *
      * @return {@link ConfigurableEnvironment the underlying ConfigurableEnvironment}
      */
-    @NonNull
+    @Nonnull
     public ConfigurableEnvironment getDelegate() {
         return this.delegate;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
index ebef4acc..7fc783db 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
@@ -19,7 +19,7 @@
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.PropertyResolver;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * The interface listens the manipulation of {@link ConfigurablePropertyResolver PropertyResolvers'} profiles including:
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java
index 3a256134..7dc7a7c2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java
@@ -6,7 +6,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ReflectionUtils;
 
 import java.lang.annotation.Annotation;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
index a09f65ac..a3f692f6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
@@ -24,8 +24,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.SpringVersion;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.List;
 
@@ -69,7 +69,7 @@ public static ApplicationContext asApplicationContext(BeanFactory beanFactory) {
      *
      * @return the {@link org.springframework.context.support.ApplicationContextAwareProcessor}
      */
-    @NonNull
+    @Nonnull
     public static BeanPostProcessor getApplicationContextAwareProcessor(ConfigurableApplicationContext context) {
         ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
         return getApplicationContextAwareProcessor(beanFactory);
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
index 8f30dbfa..ca9777a7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.StringUtils;
 
 import java.lang.invoke.MethodHandle;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
index 1621252f..e8d6fa52 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index d44dd2a2..73be59c5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -28,7 +28,7 @@
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
index 955a9f56..28f8a35b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.util;
 
 import io.microsphere.util.BaseUtils;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
 import org.springframework.util.StringUtils;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
index aa6828ba..e55efa28 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
@@ -11,7 +11,7 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
 import org.springframework.core.env.PropertySourcesPropertyResolver;
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -250,7 +250,7 @@ public static Map<String, Object> getSubProperties(PropertySources propertySourc
      * @return non-null
      * @since 1.0.0
      */
-    @NonNull
+    @Nonnull
     public static String[] getPropertyNames(PropertySource propertySource) {
         String[] propertyNames = propertySource instanceof EnumerablePropertySource ? ((EnumerablePropertySource) propertySource).getPropertyNames() : null;
 
@@ -267,7 +267,7 @@ public static String[] getPropertyNames(PropertySource propertySource) {
      * @param propertySource the specified {@link PropertySource}
      * @return non-null read-only {@link Map}
      */
-    @NonNull
+    @Nonnull
     public static Map<String, Object> getProperties(PropertySource propertySource) {
         String[] propertyNames = getPropertyNames(propertySource);
         int length = propertyNames.length;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
index 8826e2c2..b742ac27 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
@@ -22,8 +22,8 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -51,7 +51,7 @@ public abstract class ResourceLoaderUtils extends BaseUtils {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static ResourceLoader getResourceLoader() {
         return getResourceLoader(getDefaultClassLoader());
     }
@@ -62,7 +62,7 @@ public static ResourceLoader getResourceLoader() {
      * @param classLoader nullable {@link ClassLoader}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static ResourceLoader getResourceLoader(@Nullable ClassLoader classLoader) {
         ClassLoader targetClassLoader = classLoader == null ? getDefaultClassLoader() : classLoader;
         return resourceLoadersCache.computeIfAbsent(targetClassLoader, DefaultResourceLoader::new);
@@ -73,7 +73,7 @@ public static ResourceLoader getResourceLoader(@Nullable ClassLoader classLoader
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static ResourcePatternResolver getResourcePatternResolver() {
         return getResourcePatternResolver(null);
     }
@@ -84,7 +84,7 @@ public static ResourcePatternResolver getResourcePatternResolver() {
      * @param resourceLoader nullable {@link ResourceLoader}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static ResourcePatternResolver getResourcePatternResolver(@Nullable ResourceLoader resourceLoader) {
         ClassLoader classLoader = getClassLoader(resourceLoader);
         return (ResourcePatternResolver) resourceLoadersCache.computeIfAbsent(classLoader, cl -> {
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index cbf13d6c..759f6891 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -25,7 +25,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
index 9eae6fe9..e0757ac0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
@@ -21,8 +21,8 @@
 import io.microsphere.util.Version;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.springframework.util.StringUtils;
 
 import static io.microsphere.text.FormatUtils.format;
@@ -47,7 +47,7 @@ public abstract class SpringVersionUtils extends BaseUtils {
     /**
      * The version of "spring-core" module
      */
-    @NonNull
+    @Nonnull
     public static final Version SPRING_CORE_VERSION = getSpringVersion(StringUtils.class);
 
     /**
@@ -59,13 +59,13 @@ public abstract class SpringVersionUtils extends BaseUtils {
     /**
      * The version of "spring-beans" module
      */
-    @NonNull
+    @Nonnull
     public static final Version SPRING_BEANS_VERSION = getSpringVersion(BeanFactory.class);
 
     /**
      * The version of "spring-context" module
      */
-    @NonNull
+    @Nonnull
     public static final Version SPRING_CONTEXT_VERSION = getSpringVersion(ApplicationContext.class);
 
     /**
@@ -99,7 +99,7 @@ public static Version getSpringVersion(String springClassName) throws NullPointe
      * @throws IllegalArgumentException if the package name of <code>springClass</code> does not start with "org.springframework"
      * @throws IllegalStateException    if the "Implementation-Version" attribute is absent in the "META-INF/MANIFEST.MF" resource
      */
-    @NonNull
+    @Nonnull
     public static Version getSpringVersion(Class<?> springClass) throws NullPointerException, IllegalArgumentException {
         Package classPackage = springClass.getPackage();
         String classPackageName = classPackage.getName();
diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
index e2c4785a..bfaa80d3 100644
--- a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -25,7 +25,7 @@
 import java.util.StringTokenizer;
 import java.util.function.Predicate;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 893f2a07..73683646 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,6 +20,7 @@
 
     <properties>
         <microsphere-java.version>0.0.9</microsphere-java.version>
+        <spring.version>5.3.39</spring.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <jackson.version>2.18.2</jackson.version>
         <snakeyaml.version>2.3</snakeyaml.version>
@@ -166,9 +167,6 @@
 
         <profile>
             <id>spring-framework-5.3</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <spring.version>5.3.39</spring.version>
             </properties>
diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index 399045b6..0e861569 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -20,6 +20,13 @@
 
     <dependencies>
 
+        <!-- JSR 305 -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- MicroSphere Spring Context -->
         <dependency>
             <groupId>io.github.microsphere-projects</groupId>
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
index 691d39c3..4e1efbce 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
@@ -18,7 +18,7 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.Optional;
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
index a634b906..0f16bda9 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import javax.servlet.Registration;
 import javax.servlet.ServletContext;
@@ -61,7 +61,7 @@ protected final WebEndpointMapping<String> doCreate(String endpoint) throws Thro
      * @param servletContext {@link ServletContext}
      * @return The {@link R Registration}
      */
-    @NonNull
+    @Nonnull
     protected abstract R getRegistration(String name, ServletContext servletContext);
 
     /**
@@ -70,7 +70,7 @@ protected final WebEndpointMapping<String> doCreate(String endpoint) throws Thro
      * @param registration {@link R Registration}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     protected abstract Collection<String> getPatterns(R registration);
 
     /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
index 2547f5f6..17d64a12 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
@@ -21,7 +21,7 @@
 import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
index cefaf0cb..413f8a2f 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.web.metadata;
 
 import io.microsphere.util.ArrayUtils;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;
 
@@ -326,7 +326,7 @@ private WebEndpointMapping() {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public Kind getKind() {
         return kind;
     }
@@ -355,7 +355,7 @@ public Kind getKind() {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public E getEndpoint() {
         return endpoint;
     }
@@ -378,17 +378,17 @@ public int getId() {
      * </ul>, or it's {@link #NON_SOURCE non-source}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public Object getSource() {
         return this.source;
     }
 
-    @NonNull
+    @Nonnull
     public String[] getPatterns() {
         return patterns;
     }
 
-    @NonNull
+    @Nonnull
 
     public String[] getMethods() {
         if (methods == null) {
@@ -397,7 +397,7 @@ public String[] getMethods() {
         return methods;
     }
 
-    @NonNull
+    @Nonnull
 
     public String[] getParams() {
         if (params == null) {
@@ -406,7 +406,7 @@ public String[] getParams() {
         return params;
     }
 
-    @NonNull
+    @Nonnull
     public String[] getHeaders() {
         if (headers == null) {
             return EMPTY_STRING_ARRAY;
@@ -414,7 +414,7 @@ public String[] getHeaders() {
         return headers;
     }
 
-    @NonNull
+    @Nonnull
     public String[] getConsumes() {
         if (consumes == null) {
             return EMPTY_STRING_ARRAY;
@@ -422,7 +422,7 @@ public String[] getConsumes() {
         return consumes;
     }
 
-    @NonNull
+    @Nonnull
     public String[] getProduces() {
         if (produces == null) {
             return EMPTY_STRING_ARRAY;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
index f6ebbde6..c6b48b17 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.util.Optional;
 
@@ -66,7 +66,7 @@ default boolean supports(E endpoint) {
      *
      * @return the type of source
      */
-    @NonNull
+    @Nonnull
     default Class<E> getSourceType() {
         return (Class<E>) forClass(getClass()).as(WebEndpointMappingFactory.class).resolveGeneric(0);
     }
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
index 6772d9f3..f88b8358 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -79,6 +79,6 @@ default int register(Iterable<WebEndpointMapping> webEndpointMappings) {
      *
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     Collection<WebEndpointMapping> getWebEndpointMappings();
 }
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
index 5b3ae1ea..78eafb53 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.web.method.support;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.HandlerMethod;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
index fb62e345..01b712dd 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
@@ -1,6 +1,6 @@
 package io.microsphere.spring.web.method.support;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.HandlerMethod;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
index 90e510a2..d3d3da6d 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
@@ -16,7 +16,7 @@
 
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
index 3f467e02..2b59c8f2 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.StringJoiner;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
index ac062f15..97c4b121 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
index f353312b..063017ef 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
index a7698d24..b006a656 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
@@ -16,7 +16,7 @@
 
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
index d8e8a0c9..e8b1059a 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
index a8a759a4..2e9047e5 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
@@ -16,7 +16,7 @@
 
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
index dfae6b5a..a239f9dc 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PathMatcher;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
index b0264fb3..d73ef344 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
 import org.springframework.web.HttpMediaTypeException;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
index 48bd5efc..58fd6133 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
index d0a74759..463bf079 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.servlet;
 
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.mock.web.MockServletContext;
 
 import javax.servlet.Servlet;
diff --git a/microsphere-spring-webflux/pom.xml b/microsphere-spring-webflux/pom.xml
index 756dec75..9aba58b4 100644
--- a/microsphere-spring-webflux/pom.xml
+++ b/microsphere-spring-webflux/pom.xml
@@ -49,4 +49,34 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>spring-framework-4.0</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.1</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.2</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.3</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/microsphere-spring-webmvc/pom.xml b/microsphere-spring-webmvc/pom.xml
index 61470cfd..ae7b62be 100644
--- a/microsphere-spring-webmvc/pom.xml
+++ b/microsphere-spring-webmvc/pom.xml
@@ -20,6 +20,13 @@
 
     <dependencies>
 
+        <!-- JSR 305 -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Microsphere Spring Web -->
         <dependency>
             <groupId>io.github.microsphere-projects</groupId>
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
index 6a2fbcda..ad2f10ad 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
@@ -24,7 +24,7 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import org.springframework.context.ApplicationListener;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
index f9686978..07027d22 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.webmvc.interceptor;
 
 import io.microsphere.spring.webmvc.util.WebMvcUtils;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
index 0783e699..392ce258 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.webmvc.method.support;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
index 36b4b4f2..12b757fa 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
@@ -26,7 +26,7 @@
 import io.microsphere.logging.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.MethodParameter;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nullable;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;

From 99a09f475a984942c68c8240cb6364baddafcf81 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:02:03 +0800
Subject: [PATCH 069/157] Polish #41

---
 .../microsphere/spring/{util => beans}/PropertyValuesUtils.java | 2 +-
 .../spring/{util => beans}/PropertyValuesUtilsTest.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans}/PropertyValuesUtils.java (96%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => beans}/PropertyValuesUtilsTest.java (96%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertyValuesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
similarity index 96%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertyValuesUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
index 27c2a6e1..73ae45f2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertyValuesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValues;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertyValuesUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
similarity index 96%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertyValuesUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
index fe3cc206..4fe2a53a 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertyValuesUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans;
 
 import org.junit.Assert;
 import org.junit.Test;

From 096f5426cb0bef04b1ab43933b75e46c26c42c0c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:04:37 +0800
Subject: [PATCH 070/157] Polish #41

---
 .../AnnotatedInjectionBeanPostProcessor.java           |  3 +--
 .../AnnotationBeanDefinitionRegistryPostProcessor.java |  2 +-
 .../annotation/ConfigurationBeanBindingRegistrar.java  |  4 ++--
 .../annotation/ConfigurationBeanBindingsRegister.java  |  2 +-
 .../spring/cache/intereptor/TTLCacheResolver.java      |  2 +-
 .../DefaultPropertiesPropertySourceLoader.java         |  2 +-
 .../DefaultPropertiesPropertySourcesLoader.java        |  2 +-
 .../{util => core/annotation}/AnnotationUtils.java     |  3 +--
 .../core/annotation/GenericAnnotationAttributes.java   |  4 ++--
 .../ResolvablePlaceholderAnnotationAttributes.java     |  4 ++--
 .../{util => core/annotation}/AnnotationUtilsTest.java | 10 +++++-----
 .../WebExtensionBeanDefinitionRegistrar.java           |  2 +-
 .../WebMvcExtensionBeanDefinitionRegistrar.java        |  2 +-
 13 files changed, 20 insertions(+), 22 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => core/annotation}/AnnotationUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => core/annotation}/AnnotationUtilsTest.java (96%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index e3a98333..c783e7f5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -19,7 +19,6 @@
 import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
@@ -73,7 +72,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static java.util.Collections.singleton;
 import static java.util.Collections.unmodifiableCollection;
 import static org.springframework.core.BridgeMethodResolver.findBridgedMethod;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index 887a7f18..c8a16921 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -49,7 +49,7 @@
 import java.util.Set;
 
 import static io.microsphere.spring.util.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
-import static io.microsphere.spring.util.AnnotationUtils.tryGetMergedAnnotation;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.tryGetMergedAnnotation;
 import static io.microsphere.spring.util.WrapperUtils.unwrap;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index 7827af32..e472453a 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -46,8 +46,8 @@
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_IGNORE_INVALID_FIELDS;
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_IGNORE_UNKNOWN_FIELDS;
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_MULTIPLE;
-import static io.microsphere.spring.util.AnnotationUtils.getAttribute;
-import static io.microsphere.spring.util.AnnotationUtils.getRequiredAttribute;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttribute;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getRequiredAttribute;
 import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
 import static io.microsphere.spring.util.PropertySourcesUtils.normalizePrefix;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
index 8031e8bb..6ecc4ebe 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
@@ -25,7 +25,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.Assert;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 
 /**
  * The {@link ImportBeanDefinitionRegistrar Registrar class} for {@link EnableConfigurationBeanBindings}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
index 30737100..a0f2fb10 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java
@@ -47,7 +47,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static java.time.Duration.ofMillis;
 import static java.util.Collections.emptyList;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
index c5d95a5b..d911971d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
@@ -27,7 +27,7 @@
 
 import java.util.Map;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
 import static io.microsphere.spring.util.PropertySourcesUtils.getDefaultProperties;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
index c3edccda..dd91de99 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 import static io.microsphere.spring.core.annotation.GenericAnnotationAttributes.ofSet;
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 
 /**
  * The loader of {@link PropertySource} for {@link DefaultPropertiesPropertySources}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
index 7dc7a7c2..b3584d61 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotationUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
@@ -1,6 +1,5 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.annotation;
 
-import io.microsphere.spring.core.annotation.GenericAnnotationAttributes;
 import io.microsphere.util.ClassLoaderUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
index be7d0710..5d099e08 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
@@ -27,8 +27,8 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static io.microsphere.spring.util.AnnotationUtils.findAnnotationType;
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.findAnnotationType;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static java.util.Collections.emptySet;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
index 30dc2c09..949c7b0b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
@@ -27,8 +27,8 @@
 import java.util.Set;
 
 import static io.microsphere.collection.MapUtils.shallowCloneMap;
-import static io.microsphere.spring.util.AnnotationUtils.findAnnotationType;
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.findAnnotationType;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static java.util.Collections.emptySet;
 
 /**
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotationUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
similarity index 96%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotationUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
index 4c2dc5a1..d352375e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotationUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.annotation;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.spring.util.AnnotationUtils.findAnnotations;
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
-import static io.microsphere.spring.util.AnnotationUtils.getAttribute;
-import static io.microsphere.spring.util.AnnotationUtils.getAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.findAnnotations;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttribute;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttributes;
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CONTEXT_VERSION;
 import static io.microsphere.util.ArrayUtils.of;
 import static junit.framework.TestCase.assertNull;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
index ff484fa4..9248ebac 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
@@ -24,7 +24,7 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
 
 /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
index ba72b667..22fc06e1 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
@@ -31,7 +31,7 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import static io.microsphere.spring.util.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.webmvc.interceptor.LazyCompositeHandlerInterceptor.BEAN_NAME;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;

From 7d8127756f86cceca78b2bef713ab720785ca21d Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:07:56 +0800
Subject: [PATCH 071/157] Reimport

---
 .../spring/beans/factory/BeanDependencyResolver.java       | 2 +-
 .../beans/factory/DefaultBeanDependencyResolver.java       | 2 +-
 .../io/microsphere/spring/beans/factory/Dependency.java    | 2 +-
 .../annotation/AnnotatedInjectionBeanPostProcessor.java    | 4 ++--
 .../AnnotationBeanDefinitionRegistryPostProcessor.java     | 4 ++--
 .../annotation/AnnotationInjectedBeanPostProcessor.java    | 2 +-
 .../annotation/ConfigurationBeanBindingPostProcessor.java  | 4 ++--
 .../annotation/ConfigurationBeanBindingRegistrar.java      | 4 ++--
 .../config/InstantiationAwareBeanPostProcessorAdapter.java | 2 +-
 .../support/AutowireCandidateResolvingListener.java        | 2 +-
 .../support/ListenableAutowireCandidateResolver.java       | 2 +-
 .../microsphere/spring/config/ConfigurationProperty.java   | 2 +-
 .../context/annotation/AnnotatedPropertySourceLoader.java  | 2 +-
 .../annotation/DefaultPropertiesPropertySourcesLoader.java | 2 +-
 .../annotation/PropertySourceExtensionAttributes.java      | 2 +-
 .../context/annotation/PropertySourceExtensionLoader.java  | 4 ++--
 .../config/context/annotation/ResourcePropertySources.java | 2 +-
 .../config/env/event/PropertySourceChangedEvent.java       | 1 +
 .../config/env/event/PropertySourcesChangedEvent.java      | 2 +-
 .../context/annotation/BeanCapableImportCandidate.java     | 3 ++-
 .../spring/context/annotation/EventExtensionRegistrar.java | 2 +-
 .../spring/context/config/ConfigurationBeanBinder.java     | 2 +-
 .../event/DependencyAnalysisBeanFactoryListener.java       | 2 +-
 .../context/event/GenericApplicationListenerAdapter.java   | 1 +
 .../event/InterceptingApplicationEventMulticaster.java     | 2 +-
 .../InterceptingApplicationEventMulticasterProxy.java      | 2 +-
 .../spring/core/annotation/AnnotationUtils.java            | 2 +-
 .../core/annotation/GenericAnnotationAttributes.java       | 2 +-
 .../ResolvablePlaceholderAnnotationAttributes.java         | 2 +-
 .../spring/core/env/ListenableConfigurableEnvironment.java | 2 +-
 .../spring/core/env/PropertyResolverListener.java          | 1 +
 .../microsphere/spring/util/ApplicationContextUtils.java   | 2 +-
 .../io/microsphere/spring/util/BeanDefinitionUtils.java    | 2 +-
 .../java/io/microsphere/spring/util/BeanFactoryUtils.java  | 2 +-
 .../main/java/io/microsphere/spring/util/BeanUtils.java    | 2 +-
 .../java/io/microsphere/spring/util/MimeTypeUtils.java     | 7 +------
 .../io/microsphere/spring/util/PropertySourcesUtils.java   | 2 +-
 .../io/microsphere/spring/util/ResourceLoaderUtils.java    | 2 +-
 .../spring/util/SpringFactoriesLoaderUtils.java            | 2 +-
 .../io/microsphere/spring/util/SpringVersionUtils.java     | 3 ++-
 .../context/annotation/EnableEventExtensionTest.java       | 4 ++--
 .../spring/context/event/BeanTimeStatisticsTest.java       | 4 ++--
 .../core/env/ListenableConfigurableEnvironmentTest.java    | 2 --
 .../java/io/microsphere/spring/util/MimeTypeUtilsTest.java | 3 ---
 44 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
index b4737b6d..2ecc193d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanDependencyResolver.java
@@ -19,8 +19,8 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.Map;
 import java.util.Set;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index b1fb70ef..1b3c6677 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -35,9 +35,9 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
-import javax.annotation.Nullable;
 import org.springframework.util.StopWatch;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
index 4687ce36..5032c894 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
@@ -18,9 +18,9 @@
 
 import io.microsphere.collection.CollectionUtils;
 import io.microsphere.util.ArrayUtils;
-import javax.annotation.Nullable;
 import org.springframework.util.Assert;
 
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index c783e7f5..93076a0e 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
-import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
@@ -46,12 +46,12 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
-import javax.annotation.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Nullable;
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index c8a16921..3e0b8fd2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
-import io.microsphere.spring.context.annotation.ExposingClassPathBeanDefinitionScanner;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.context.annotation.ExposingClassPathBeanDefinitionScanner;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
@@ -48,8 +48,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.microsphere.spring.util.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.tryGetMergedAnnotation;
+import static io.microsphere.spring.util.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.util.WrapperUtils.unwrap;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
index e40caa82..c5bec6a9 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
-import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
index 94708867..5e6624b1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
@@ -16,12 +16,12 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.config.ConfigurationBeanBinder;
 import io.microsphere.spring.context.config.ConfigurationBeanCustomizer;
 import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.core.convert.support.ConversionServiceResolver;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index e472453a..334f8bb8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
-import io.microsphere.spring.beans.factory.support.ConfigurationBeanAliasGenerator;
-import io.microsphere.spring.util.PropertySourcesUtils;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.beans.factory.support.ConfigurationBeanAliasGenerator;
+import io.microsphere.spring.util.PropertySourcesUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
index 9df2aeba..88d383f6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
@@ -22,8 +22,8 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
index b06f7b59..da969ae2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
@@ -22,8 +22,8 @@
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.LinkedList;
 import java.util.List;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 50a76a94..05db08a6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -32,8 +32,8 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
index 13f2e8ea..58fba958 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
@@ -18,9 +18,9 @@
 
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Objects;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
index 9e68c60d..d3c4e583 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/AnnotatedPropertySourceLoader.java
@@ -28,9 +28,9 @@
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.type.AnnotationMetadata;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
index dd91de99..a8679784 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesLoader.java
@@ -25,8 +25,8 @@
 
 import java.util.Set;
 
-import static io.microsphere.spring.core.annotation.GenericAnnotationAttributes.ofSet;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.annotation.GenericAnnotationAttributes.ofSet;
 
 /**
  * The loader of {@link PropertySource} for {@link DefaultPropertiesPropertySources}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
index 8e8aa5ad..65cad89c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionAttributes.java
@@ -21,8 +21,8 @@
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PropertySourceFactory;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
 import java.util.Comparator;
 import java.util.Map;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
index 681a4c3d..e8b8101f 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
@@ -36,13 +36,13 @@
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PropertySourceFactory;
 import org.springframework.core.type.AnnotationMetadata;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PathMatcher;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
index 45875db2..101d7392 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySources.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.config.context.annotation;
 
 import org.springframework.context.annotation.Import;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
index 3d887f6c..3594d624 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourceChangedEvent.java
@@ -21,6 +21,7 @@
 import org.springframework.context.event.ApplicationContextEvent;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
index fff3e181..b2c10541 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
@@ -22,8 +22,8 @@
 import org.springframework.context.event.ApplicationContextEvent;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
index 711fae9a..fe85a2eb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
@@ -34,9 +34,10 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import javax.annotation.Nonnull;
 import org.springframework.util.Assert;
 
+import javax.annotation.Nonnull;
+
 import static io.microsphere.text.FormatUtils.format;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
index 647b55b9..58f3b0c2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/EventExtensionRegistrar.java
@@ -31,8 +31,8 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.type.AnnotationMetadata;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
index 6fcb31c5..32f1d147 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/config/ConfigurationBeanBinder.java
@@ -19,8 +19,8 @@
 import io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.Environment;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.Map;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index d87daebd..dc5a3b10 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -33,8 +33,8 @@
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
index 29c0cd0d..ba01ca52 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/GenericApplicationListenerAdapter.java
@@ -19,6 +19,7 @@
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.event.GenericApplicationListener;
 import org.springframework.context.event.SmartApplicationListener;
+
 import javax.annotation.Nullable;
 
 import static org.springframework.core.ResolvableType.forClass;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
index af3764b4..1f35f43e 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
@@ -23,8 +23,8 @@
 import org.springframework.context.event.ApplicationEventMulticaster;
 import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.core.ResolvableType;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.concurrent.Executor;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
index b5e454ac..72f5838e 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
@@ -27,8 +27,8 @@
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.env.Environment;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.concurrent.Executor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
index b3584d61..dfb7b4c7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
@@ -5,9 +5,9 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.type.AnnotationMetadata;
-import javax.annotation.Nullable;
 import org.springframework.util.ReflectionUtils;
 
+import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
index 5d099e08..5e4addb5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributes.java
@@ -17,9 +17,9 @@
 package io.microsphere.spring.core.annotation;
 
 import org.springframework.core.annotation.AnnotationAttributes;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
index 949c7b0b..9274cec0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributes.java
@@ -18,9 +18,9 @@
 
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.PropertyResolver;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
 import java.util.Map;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 4d68d2b5..1b627815 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -26,9 +26,9 @@
 import org.springframework.core.env.MissingRequiredPropertiesException;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.Profiles;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
index 7fc783db..60451cb8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertyResolverListener.java
@@ -19,6 +19,7 @@
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.PropertyResolver;
+
 import javax.annotation.Nullable;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
index a3f692f6..04ef8a48 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
@@ -24,9 +24,9 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.SpringVersion;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.List;
 
 import static io.microsphere.spring.util.BeanFactoryUtils.getBeanPostProcessors;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
index ca9777a7..2640da11 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
@@ -22,9 +22,9 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
-import javax.annotation.Nullable;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
index e8d6fa52..fc2fe2ff 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
@@ -26,8 +26,8 @@
 import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index 73be59c5..cb89b7d1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -28,11 +28,11 @@
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import javax.annotation.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
index 28f8a35b..eb1e2365 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java
@@ -17,15 +17,10 @@
 package io.microsphere.spring.util;
 
 import io.microsphere.util.BaseUtils;
-import javax.annotation.Nullable;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
-import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
+import javax.annotation.Nullable;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 
 import static io.microsphere.collection.CollectionUtils.isEmpty;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
index e55efa28..7f5b4d6c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
@@ -11,8 +11,8 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
 import org.springframework.core.env.PropertySourcesPropertyResolver;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
index b742ac27..4e8e1891 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
@@ -22,9 +22,9 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index 759f6891..27f0b769 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -25,8 +25,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.support.SpringFactoriesLoader;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
index e0757ac0..890565e8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringVersionUtils.java
@@ -21,9 +21,10 @@
 import io.microsphere.util.Version;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.util.StringUtils;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.springframework.util.StringUtils;
 
 import static io.microsphere.text.FormatUtils.format;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
index 4a56ef0f..9e8b64c3 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
@@ -16,13 +16,13 @@
  */
 package io.microsphere.spring.context.annotation;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.event.ApplicationEventInterceptor;
 import io.microsphere.spring.context.event.ApplicationListenerInterceptor;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
index c426fbe8..22802650 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
@@ -16,11 +16,11 @@
  */
 package io.microsphere.spring.context.event;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.util.StopWatch;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
index 635f84a5..8c70a045 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
@@ -30,8 +30,6 @@
 
 import static io.microsphere.spring.core.SpringVersion.CURRENT;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
-import static io.microsphere.spring.core.SpringVersion.SPRING_5_3_28;
-import static io.microsphere.spring.core.SpringVersion.SPRING_5_3_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
index 0f808198..7aeac2d1 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
@@ -19,9 +19,6 @@
 import org.junit.Test;
 import org.springframework.util.MimeType;
 
-import java.util.Arrays;
-import java.util.Collections;
-
 import static io.microsphere.spring.util.MimeTypeUtils.APPLICATION_GRAPHQL;
 import static io.microsphere.spring.util.MimeTypeUtils.APPLICATION_GRAPHQL_VALUE;
 import static io.microsphere.spring.util.MimeTypeUtils.equalsTypeAndSubtype;

From 41fbfd32fac2a74f000a03191fb8765792dc74d9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:12:48 +0800
Subject: [PATCH 072/157] Polish #40 : EnvironmentUtils

---
 .../{util => core/env}/EnvironmentUtils.java  |  4 +--
 .../spring/core/env/EnvironmentUtilsTest.java | 27 +++++++++++++++++++
 .../spring/util/PropertySourcesUtilsTest.java |  4 +--
 3 files changed, 31 insertions(+), 4 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => core/env}/EnvironmentUtils.java (98%)
 create mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
similarity index 98%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
index 05232a24..6280f825 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.env;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
@@ -42,7 +42,7 @@
 import static org.springframework.util.StringUtils.hasText;
 
 /**
- * {@link Environment} 工具类
+ * {@link Environment} Utilities class
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
  * @since 1.0.0
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
new file mode 100644
index 00000000..4c349a2a
--- /dev/null
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.core.env;
+
+/**
+ * {@link EnvironmentUtils} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see EnvironmentUtils
+ * @since 1.0.0
+ */
+public class EnvironmentUtilsTest {
+}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java
index 08eda92d..cd99b177 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.microsphere.spring.util.EnvironmentUtils.getConversionService;
-import static io.microsphere.spring.util.EnvironmentUtils.resolveCommaDelimitedValueToList;
+import static io.microsphere.spring.core.env.EnvironmentUtils.getConversionService;
+import static io.microsphere.spring.core.env.EnvironmentUtils.resolveCommaDelimitedValueToList;
 import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
 import static io.microsphere.spring.util.PropertySourcesUtils.addDefaultProperties;
 import static io.microsphere.spring.util.PropertySourcesUtils.findConfiguredPropertySource;

From 83fc670518f04f523964ba1874afdbeead1d7e19 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:15:32 +0800
Subject: [PATCH 073/157] Polish #41 : EnvironmentUtils

---
 .../io/microsphere/spring/core/env/EnvironmentUtils.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
index 6280f825..f6fdd1c4 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
@@ -18,6 +18,7 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.ConfigurablePropertyResolver;
@@ -47,14 +48,10 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
  * @since 1.0.0
  */
-public abstract class EnvironmentUtils {
+public abstract class EnvironmentUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(EnvironmentUtils.class);
 
-    private EnvironmentUtils() throws InstantiationException {
-        throw new InstantiationException();
-    }
-
     public static Map<String, String> getProperties(Environment environment, String... propertyNames) {
         int length = propertyNames == null ? 0 : propertyNames.length;
         if (length < 1) {

From 7c1aca9196d4eb1d3e63ec90907146777f30e711 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:39:36 +0800
Subject: [PATCH 074/157] Polish #41 : EnvironmentUtils & EnvironmentUtilsTest

---
 .../spring/core/env/EnvironmentUtils.java     | 62 +++++++++++++++
 .../spring/core/env/EnvironmentUtilsTest.java | 79 +++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
index f6fdd1c4..4c26c99a 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
@@ -25,6 +25,8 @@
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -52,6 +54,14 @@ public abstract class EnvironmentUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(EnvironmentUtils.class);
 
+    /**
+     * Get the properties from the specified {@link Environment} and property names
+     *
+     * @param environment   {@link Environment}
+     * @param propertyNames the property names
+     * @return non-null
+     */
+    @Nonnull
     public static Map<String, String> getProperties(Environment environment, String... propertyNames) {
         int length = propertyNames == null ? 0 : propertyNames.length;
         if (length < 1) {
@@ -63,6 +73,14 @@ public static Map<String, String> getProperties(Environment environment, String.
         return getProperties(environment, asList(propertyNames));
     }
 
+    /**
+     * Get the properties from the specified {@link Environment} and property names
+     *
+     * @param environment   {@link Environment}
+     * @param propertyNames the property names
+     * @return non-null
+     */
+    @Nonnull
     public static Map<String, String> getProperties(Environment environment, Iterable<String> propertyNames) {
         Set<String> propertyNamesSet = propertyNames instanceof Set ? (Set) propertyNames :
                 propertyNames instanceof Collection ? new HashSet<>((Collection) propertyNames) :
@@ -70,6 +88,14 @@ public static Map<String, String> getProperties(Environment environment, Iterabl
         return getProperties(environment, propertyNamesSet);
     }
 
+    /**
+     * Get the properties from the specified {@link Environment} and property names
+     *
+     * @param environment   {@link Environment}
+     * @param propertyNames the property names
+     * @return non-null
+     */
+    @Nonnull
     public static Map<String, String> getProperties(Environment environment, Set<String> propertyNames) {
         Map<String, String> properties = new HashMap<>(propertyNames.size());
         propertyNames.stream().filter(StringUtils::hasText).forEach(name -> {
@@ -78,6 +104,13 @@ public static Map<String, String> getProperties(Environment environment, Set<Str
         return unmodifiableMap(properties);
     }
 
+    /**
+     * Get the {@link ConversionService} from the specified {@link Environment}
+     *
+     * @param environment {@link Environment}
+     * @return {@link ConversionService} if found, or <code>null</code>
+     */
+    @Nullable
     public static ConversionService getConversionService(Environment environment) {
         ConversionService conversionService = null;
         if (environment instanceof ConfigurablePropertyResolver) {
@@ -91,15 +124,44 @@ public static ConversionService getConversionService(Environment environment) {
         return conversionService;
     }
 
+    /**
+     * Resolve the comma delimited value to {@link List}
+     *
+     * @param environment         {@link Environment}
+     * @param commaDelimitedValue the comma delimited value
+     * @return non-null
+     */
+    @Nonnull
     public static List<String> resolveCommaDelimitedValueToList(Environment environment, String commaDelimitedValue) {
         List<String> values = resolvePlaceholders(environment, commaDelimitedValue, List.class);
         return values == null ? emptyList() : unmodifiableList(values);
     }
 
+    /**
+     * Resolve the placeholders
+     *
+     * @param environment   {@link Environment}
+     * @param propertyValue the property value
+     * @param targetType    the target type
+     * @param <T>           the target type
+     * @return the resolved value
+     */
+    @Nullable
     public static <T> T resolvePlaceholders(Environment environment, String propertyValue, Class<T> targetType) {
         return resolvePlaceholders(environment, propertyValue, targetType, null);
     }
 
+    /**
+     * Resolve the placeholders
+     *
+     * @param environment   {@link Environment}
+     * @param propertyValue the property value
+     * @param targetType    the target type
+     * @param defaultValue  the default value
+     * @param <T>           the target type
+     * @return the resolved value
+     */
+    @Nullable
     public static <T> T resolvePlaceholders(Environment environment, String propertyValue, Class<T> targetType, T defaultValue) {
         if (propertyValue == null) {
             return defaultValue;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
index 4c349a2a..91d0afb8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
@@ -16,6 +16,22 @@
  */
 package io.microsphere.spring.core.env;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.mock.env.MockEnvironment;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.microsphere.spring.core.env.EnvironmentUtils.getConversionService;
+import static io.microsphere.spring.core.env.EnvironmentUtils.getProperties;
+import static io.microsphere.spring.core.env.EnvironmentUtils.resolveCommaDelimitedValueToList;
+import static io.microsphere.spring.core.env.EnvironmentUtils.resolvePlaceholders;
+import static java.util.Collections.emptyMap;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 /**
  * {@link EnvironmentUtils} Test
  *
@@ -24,4 +40,67 @@
  * @since 1.0.0
  */
 public class EnvironmentUtilsTest {
+
+    private ConfigurableEnvironment environment;
+
+    @Before
+    public void init() throws Exception {
+        MockEnvironment mockEnvironment = new MockEnvironment();
+        mockEnvironment.setProperty("a", "1");
+        mockEnvironment.setProperty("b", "2");
+        mockEnvironment.setProperty("c", "3");
+        this.environment = mockEnvironment;
+    }
+
+    @Test
+    public void testGetProperties() {
+        Map<String, String> properties = getProperties(environment);
+        assertEquals(emptyMap(), properties);
+
+        properties = getProperties(environment, "a");
+        assertEquals(1, properties.size());
+        assertEquals("1", properties.get("a"));
+        assertNull(properties.get("b"));
+        assertNull(properties.get("c"));
+
+        properties = getProperties(environment, "a", "b");
+        assertEquals(2, properties.size());
+        assertEquals("1", properties.get("a"));
+        assertEquals("2", properties.get("b"));
+        assertNull(properties.get("c"));
+
+        properties = getProperties(environment, "a", "b", "c");
+        assertEquals(3, properties.size());
+        assertEquals("1", properties.get("a"));
+        assertEquals("2", properties.get("b"));
+        assertEquals("3", properties.get("c"));
+    }
+
+    @Test
+    public void testGetConversionService() {
+        assertEquals(environment.getConversionService(), getConversionService(environment));
+    }
+
+    @Test
+    public void testResolveCommaDelimitedValueToList() {
+        List<String> list = resolveCommaDelimitedValueToList(environment, "${a},${b},${c}");
+        assertEquals(3, list.size());
+        assertEquals("1", list.get(0));
+        assertEquals("2", list.get(1));
+        assertEquals("3", list.get(2));
+    }
+
+    @Test
+    public void testResolvePlaceholders() {
+        Object value = resolvePlaceholders(environment, null, Integer.class);
+        assertNull(value);
+
+        value = resolvePlaceholders(environment, "${a}", Integer.class);
+        assertEquals(Integer.valueOf(1), value);
+
+        value = resolvePlaceholders(environment, "${d}", String.class, "default-value");
+        assertEquals("${d}", value);
+    }
 }
+
+

From 67c5c4d04878f53838e9dc66203f4b640682a4c6 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:39:48 +0800
Subject: [PATCH 075/157] Polish #41 : ProfilesParser

---
 .../java/org/springframework/core/env/ProfilesParser.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
index bfaa80d3..527201e9 100644
--- a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -16,6 +16,10 @@
 
 package org.springframework.core.env;
 
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -25,10 +29,6 @@
 import java.util.StringTokenizer;
 import java.util.function.Predicate;
 
-import javax.annotation.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
 /**
  * Internal parser used by {@link Profiles#of}.
  *

From f9131c8b2f9814fa16b22c7d439e4b1a345a9417 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:44:34 +0800
Subject: [PATCH 076/157] Polish #41 : AnnotatedBeanDefinitionRegistryUtils

---
 .../AnnotationBeanDefinitionRegistryPostProcessor.java       | 2 +-
 .../annotation}/AnnotatedBeanDefinitionRegistryUtils.java    | 5 +++--
 .../AnnotatedBeanDefinitionRegistryUtilsTest.java            | 4 +++-
 .../test/java/io/microsphere/spring/util/BeanUtilsTest.java  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => context/annotation}/AnnotatedBeanDefinitionRegistryUtils.java (98%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => context/annotation}/AnnotatedBeanDefinitionRegistryUtilsTest.java (93%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index 3e0b8fd2..fda5bba8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -48,8 +48,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.tryGetMergedAnnotation;
-import static io.microsphere.spring.util.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.util.WrapperUtils.unwrap;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtils.java
similarity index 98%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtils.java
index b3a09b0d..89d23f7c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtils.java
@@ -1,7 +1,8 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.context.annotation;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -39,7 +40,7 @@
  * @see BeanDefinition
  * @since 2017.01.09
  */
-public abstract class AnnotatedBeanDefinitionRegistryUtils {
+public abstract class AnnotatedBeanDefinitionRegistryUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(AnnotatedBeanDefinitionRegistryUtils.class);
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
similarity index 93%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
index 517bea2c..adf4d0eb 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
@@ -1,5 +1,7 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.context.annotation;
 
+import io.microsphere.spring.util.TestBean;
+import io.microsphere.spring.util.TestBean2;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
index ebd1cd00..794d91a3 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static io.microsphere.spring.util.BeanUtils.getBeanIfAvailable;
 import static io.microsphere.spring.util.BeanUtils.getBeanNames;
 import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;

From 3fa3a37ae98e0513622bf8f79ee89e218dc4115e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:52:01 +0800
Subject: [PATCH 077/157] Polish #41 : test

---
 .../GenericBeanPostProcessorAdapterTest.java  |  4 +--
 ...stenableAutowireCandidateResolverTest.java |  2 +-
 ...otatedBeanDefinitionRegistryUtilsTest.java | 36 ++++++++++---------
 .../spring/{util => test}/Bean.java           |  2 +-
 .../spring/{util => test}/TestBean.java       |  2 +-
 .../spring/{util => test}/TestBean2.java      |  2 +-
 .../spring/util/BeanInitializerTest.java      |  3 ++
 .../spring/util/BeanUtilsTest.java            | 10 +++---
 .../util/SpringFactoriesLoaderUtilsTest.java  |  6 ++--
 .../test/resources/META-INF/spring.factories  |  6 ++--
 10 files changed, 42 insertions(+), 31 deletions(-)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => test}/Bean.java (79%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => test}/TestBean.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => test}/TestBean2.java (90%)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
index 0e331a56..d4615e21 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.beans.factory.config;
 
-import io.microsphere.spring.util.Bean;
-import io.microsphere.spring.util.TestBean;
+import io.microsphere.spring.test.Bean;
+import io.microsphere.spring.test.TestBean;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.BeansException;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index ed0aa97e..fef2745b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.beans.factory.support;
 
 
-import io.microsphere.spring.util.TestBean;
+import io.microsphere.spring.test.TestBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.ObjectProvider;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
index adf4d0eb..5a731093 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
@@ -1,13 +1,17 @@
 package io.microsphere.spring.context.annotation;
 
-import io.microsphere.spring.util.TestBean;
-import io.microsphere.spring.util.TestBean2;
+import io.microsphere.spring.test.TestBean;
+import io.microsphere.spring.test.TestBean2;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.context.annotation.AnnotationConfigUtils;
-import org.springframework.util.ObjectUtils;
+
+import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.scanBasePackages;
+import static org.junit.Assert.assertEquals;
+import static org.springframework.context.annotation.AnnotationConfigUtils.registerAnnotationConfigProcessors;
+import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**
  * {@link AnnotatedBeanDefinitionRegistryUtils} Test
@@ -24,46 +28,46 @@ public class AnnotatedBeanDefinitionRegistryUtilsTest {
     public void init() {
         registry = new DefaultListableBeanFactory();
         registry.setAllowBeanDefinitionOverriding(false);
-        AnnotationConfigUtils.registerAnnotationConfigProcessors(registry);
+        registerAnnotationConfigProcessors(registry);
     }
 
     @Test
     public void testRegisterBeans() {
 
-        for(int i=0;i<100;i++) {
-            AnnotatedBeanDefinitionRegistryUtils.registerBeans(registry, this.getClass());
+        for (int i = 0; i < 100; i++) {
+            registerBeans(registry, this.getClass());
         }
 
         String[] beanNames = registry.getBeanNamesForType(this.getClass());
 
-        Assert.assertEquals(1, beanNames.length);
+        assertEquals(1, beanNames.length);
 
         beanNames = registry.getBeanNamesForType(AnnotatedBeanDefinitionRegistryUtils.class);
 
-        Assert.assertTrue(ObjectUtils.isEmpty(beanNames));
+        Assert.assertTrue(isEmpty(beanNames));
 
-        AnnotatedBeanDefinitionRegistryUtils.registerBeans(registry);
+        registerBeans(registry);
 
     }
 
     @Test
     public void testScanBasePackages() {
 
-        int count = AnnotatedBeanDefinitionRegistryUtils.scanBasePackages(registry, getClass().getPackage().getName());
+        int count = scanBasePackages(registry, TestBean.class.getPackage().getName());
 
-        Assert.assertEquals(5, count);
+        assertEquals(2, count);
 
         String[] beanNames = registry.getBeanNamesForType(TestBean.class);
 
-        Assert.assertEquals(1, beanNames.length);
+        assertEquals(1, beanNames.length);
 
         beanNames = registry.getBeanNamesForType(TestBean2.class);
 
-        Assert.assertEquals(1, beanNames.length);
+        assertEquals(1, beanNames.length);
 
-        count = AnnotatedBeanDefinitionRegistryUtils.scanBasePackages(registry);
+        count = scanBasePackages(registry);
 
-        Assert.assertEquals(0, count);
+        assertEquals(0, count);
     }
 
 }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/Bean.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/Bean.java
similarity index 79%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/Bean.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/test/Bean.java
index c74d4b70..6aa42731 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/Bean.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/Bean.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.test;
 
 /**
  * Bean Interface
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean.java
similarity index 99%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean.java
index 28130a57..14587e23 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.test;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean2.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean2.java
similarity index 90%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean2.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean2.java
index 2dab7e41..5d2a2688 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/TestBean2.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/test/TestBean2.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.test;
 
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
index d4ba36f6..0c4e8e60 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
@@ -16,6 +16,9 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.spring.test.Bean;
+import io.microsphere.spring.test.TestBean;
+import io.microsphere.spring.test.TestBean2;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
index 794d91a3..82acb40a 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
@@ -1,5 +1,7 @@
 package io.microsphere.spring.util;
 
+import io.microsphere.spring.test.TestBean;
+import io.microsphere.spring.test.TestBean2;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
@@ -157,7 +159,7 @@ public void testGetBeanNames() {
 
         assertEquals("testBean2", beanName);
 
-        beanNames = getBeanNames(listableBeanFactory, io.microsphere.spring.util.Bean.class, true);
+        beanNames = getBeanNames(listableBeanFactory, io.microsphere.spring.test.Bean.class, true);
 
         assertEquals(2, beanNames.length);
 
@@ -170,7 +172,7 @@ public void testGetBeanNames() {
         assertEquals("testBean", beanName);
 
 
-        beanNames = getBeanNames(beanFactory, io.microsphere.spring.util.Bean.class, true);
+        beanNames = getBeanNames(beanFactory, io.microsphere.spring.test.Bean.class, true);
 
         assertEquals(2, beanNames.length);
 
@@ -182,7 +184,7 @@ public void testGetBeanNames() {
 
         assertEquals("testBean", beanName);
 
-        beanNames = getBeanNames(beanFactory, io.microsphere.spring.util.Bean.class);
+        beanNames = getBeanNames(beanFactory, io.microsphere.spring.test.Bean.class);
 
         assertEquals(1, beanNames.length);
 
@@ -257,7 +259,7 @@ public void testGetOptionalBeanExcludingAncestors() {
 
         registerBeans(registry, TestBean.class, TestBean2.class);
 
-        List<io.microsphere.spring.util.Bean> beans = BeanUtils.getSortedBeans(registry, io.microsphere.spring.util.Bean.class);
+        List<io.microsphere.spring.test.Bean> beans = BeanUtils.getSortedBeans(registry, io.microsphere.spring.test.Bean.class);
 
         assertEquals(2, beans.size());
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
index db5d002d..e4484df2 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
@@ -16,6 +16,8 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.spring.test.Bean;
+import io.microsphere.spring.test.TestBean;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
@@ -73,7 +75,7 @@ private void testLoadFactoriesFromBeanFactory(BeanFactory beanFactory) {
 
         assertSame(beanFactory, testBean.getBeanFactory());
 
-        assertEquals("io.microsphere.spring.util.TestBean#0", testBean.getBeanName());
+        assertEquals("io.microsphere.spring.test.TestBean#0", testBean.getBeanName());
     }
 
     private void testLoadFactoriesFromContext(ConfigurableBeanFactory beanFactory, ApplicationContext context) {
@@ -95,6 +97,6 @@ private void testLoadFactoriesFromContext(ConfigurableBeanFactory beanFactory, A
         assertSame(beanFactory, testBean.getBeanFactory());
         assertSame(beanFactory.getBeanClassLoader(), testBean.getClassLoader());
 
-        assertEquals("io.microsphere.spring.util.TestBean#0", testBean.getBeanName());
+        assertEquals("io.microsphere.spring.test.TestBean#0", testBean.getBeanName());
     }
 }
diff --git a/microsphere-spring-context/src/test/resources/META-INF/spring.factories b/microsphere-spring-context/src/test/resources/META-INF/spring.factories
index ddd9e7ac..3820ad42 100644
--- a/microsphere-spring-context/src/test/resources/META-INF/spring.factories
+++ b/microsphere-spring-context/src/test/resources/META-INF/spring.factories
@@ -1,6 +1,6 @@
-io.microsphere.spring.util.Bean=\
-io.microsphere.spring.util.TestBean,\
-io.microsphere.spring.util.TestBean2
+io.microsphere.spring.test.Bean=\
+io.microsphere.spring.test.TestBean,\
+io.microsphere.spring.test.TestBean2
 
 io.microsphere.spring.beans.factory.support.ConfigurationBeanAliasGenerator=\
 io.microsphere.spring.beans.factory.support.DefaultConfigurationBeanAliasGenerator,\

From bfde338844abb9c34c9e5e1b805a4eb75a31640a Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 09:55:55 +0800
Subject: [PATCH 078/157] Polish #41 : ApplicationContextUtils

---
 .../spring/{util => context}/ApplicationContextUtils.java    | 5 +++--
 .../src/main/java/io/microsphere/spring/util/BeanUtils.java  | 4 ++--
 .../microsphere/spring/util/SpringFactoriesLoaderUtils.java  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => context}/ApplicationContextUtils.java (97%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
similarity index 97%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
index 04ef8a48..ca2e50f8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.context;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -39,7 +40,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-public abstract class ApplicationContextUtils {
+public abstract class ApplicationContextUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(ApplicationContextUtils.class);
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index cb89b7d1..b8e2e95c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -39,8 +39,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.spring.util.ApplicationContextUtils.asConfigurableApplicationContext;
-import static io.microsphere.spring.util.ApplicationContextUtils.getApplicationContextAwareProcessor;
+import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
+import static io.microsphere.spring.context.ApplicationContextUtils.getApplicationContextAwareProcessor;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index 27f0b769..b17cc2cd 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -31,8 +31,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static io.microsphere.spring.util.ApplicationContextUtils.asApplicationContext;
-import static io.microsphere.spring.util.ApplicationContextUtils.asConfigurableApplicationContext;
+import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
+import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
 import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableListableBeanFactory;

From ef0b2fde0266cfbe59f04ca191a61d3646fae286 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:04:55 +0800
Subject: [PATCH 079/157] Polish #41 : BeanDefinitionUtils

---
 .../spring/beans/factory/DefaultBeanDependencyResolver.java  | 4 ++--
 .../{util => beans/factory/config}/BeanDefinitionUtils.java  | 2 +-
 .../main/java/io/microsphere/spring/util/BeanRegistrar.java  | 2 +-
 .../factory/config}/BeanDefinitionUtilsTest.java             | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans/factory/config}/BeanDefinitionUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => beans/factory/config}/BeanDefinitionUtilsTest.java (94%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index 1b3c6677..e456d037 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -58,8 +58,8 @@
 import static io.microsphere.collection.MapUtils.ofEntry;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.reflect.MemberUtils.isStatic;
-import static io.microsphere.spring.util.BeanDefinitionUtils.getResolvableType;
-import static io.microsphere.spring.util.BeanDefinitionUtils.resolveBeanType;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getResolvableType;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.resolveBeanType;
 import static io.microsphere.util.ClassLoaderUtils.loadClass;
 import static java.lang.InheritableThreadLocal.withInitial;
 import static java.util.Arrays.asList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index 2640da11..de600fe1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory.config;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
index 9863d9ee..05c00906 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
@@ -30,7 +30,7 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanDefinitionUtils.genericBeanDefinition;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.genericBeanDefinition;
 import static java.beans.Introspector.decapitalize;
 import static java.lang.String.format;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
similarity index 94%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index 760de1fd..493ad013 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory.config;
 
+import io.microsphere.spring.util.User;
 import org.junit.Test;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 
-import static io.microsphere.spring.util.BeanDefinitionUtils.genericBeanDefinition;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.genericBeanDefinition;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;

From 7b644cccbd2de70359dde1c09947c9ab6e65a893 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:13:23 +0800
Subject: [PATCH 080/157] Polish #41 : + ApplicationContextUtilsTest

---
 .../context/ApplicationContextUtils.java      |  3 +-
 .../context/ApplicationContextUtilsTest.java  | 67 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
index ca2e50f8..9a3ac189 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
@@ -50,12 +50,13 @@ public abstract class ApplicationContextUtils extends BaseUtils {
      * @see org.springframework.context.support.ApplicationContextAwareProcessor
      */
     public static final String APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME = "org.springframework.context.support.ApplicationContextAwareProcessor";
+
     /**
      * The {@link org.springframework.context.support.ApplicationContextAwareProcessor} Class (Internal).
      *
      * @see org.springframework.context.support.ApplicationContextAwareProcessor
      */
-    private static final Class<?> APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS = resolveClass(APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME);
+    public static final Class<?> APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS = resolveClass(APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS_NAME);
 
     public static ConfigurableApplicationContext asConfigurableApplicationContext(ApplicationContext context) {
         return cast(context, ConfigurableApplicationContext.class);
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
new file mode 100644
index 00000000..9e32107a
--- /dev/null
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.context;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import static io.microsphere.spring.context.ApplicationContextUtils.APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS;
+import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
+import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
+import static io.microsphere.spring.context.ApplicationContextUtils.getApplicationContextAwareProcessor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+/**
+ * {@link ApplicationContextUtils} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see ApplicationContextUtils
+ * @since 1.0.0
+ */
+public class ApplicationContextUtilsTest {
+
+    private GenericApplicationContext context;
+
+    @Before
+    public void init() {
+        context = new GenericApplicationContext();
+        context.refresh();
+    }
+
+    @Test
+    public void testAsConfigurableApplicationContext() {
+        ConfigurableApplicationContext applicationContext = asConfigurableApplicationContext(context);
+        assertSame(context, applicationContext);
+    }
+
+    @Test
+    public void testAsApplicationContext() {
+        ApplicationContext applicationContext = asApplicationContext(context);
+        assertSame(context, applicationContext);
+    }
+
+    @Test
+    public void testGetApplicationContextAwareProcessor() {
+        BeanPostProcessor beanPostProcessor = getApplicationContextAwareProcessor(context);
+        assertEquals(APPLICATION_CONTEXT_AWARE_PROCESSOR_CLASS, beanPostProcessor.getClass());
+    }
+}

From d85d3188e9adba313d955be071fd0777e21a4534 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:15:56 +0800
Subject: [PATCH 081/157] Polish #41 : BeanFactoryUtils

---
 .../factory/AbstractInjectionPointDependencyResolver.java   | 2 +-
 .../spring/{util => beans/factory}/BeanFactoryUtils.java    | 2 +-
 ...rallelPreInstantiationSingletonsBeanFactoryListener.java | 2 +-
 .../{util => beans/factory}/BeanFactoryUtilsTest.java       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans/factory}/BeanFactoryUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => beans/factory}/BeanFactoryUtilsTest.java (94%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
index 9c0c38c1..e40f2ce5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
@@ -39,7 +39,7 @@
 import static io.microsphere.reflect.TypeUtils.asClass;
 import static io.microsphere.reflect.TypeUtils.isParameterizedType;
 import static io.microsphere.reflect.TypeUtils.resolveActualTypeArguments;
-import static io.microsphere.spring.util.BeanFactoryUtils.asDefaultListableBeanFactory;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static org.springframework.core.MethodParameter.forParameter;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
index fc2fe2ff..438795ae 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
index fa9cc535..778cf360 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/ParallelPreInstantiationSingletonsBeanFactoryListener.java
@@ -40,7 +40,7 @@
 import static io.microsphere.collection.ListUtils.newArrayList;
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
-import static io.microsphere.spring.util.BeanFactoryUtils.asDefaultListableBeanFactory;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static java.util.Collections.emptySet;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.springframework.util.CollectionUtils.containsAny;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanFactoryUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
similarity index 94%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanFactoryUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
index 6d131fdc..445999ae 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanFactoryUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -25,8 +25,8 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanFactoryUtils.getBeans;
-import static io.microsphere.spring.util.BeanFactoryUtils.getOptionalBean;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getBeans;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getOptionalBean;
 import static io.microsphere.util.ArrayUtils.of;
 import static org.junit.Assert.assertEquals;
 

From 1026ef065ddf7c257dc6643d1d5e6495a84bc00e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:17:05 +0800
Subject: [PATCH 082/157] Polish #41 : BeanFactoryUtils

---
 .../factory/filter/ResolvableDependencyTypeFilter.java      | 2 +-
 .../support/ListenableAutowireCandidateResolver.java        | 4 ++--
 .../config/CollectingConfigurationPropertyListener.java     | 2 +-
 .../microsphere/spring/context/ApplicationContextUtils.java | 2 +-
 .../src/main/java/io/microsphere/spring/util/BeanUtils.java | 4 ++--
 .../microsphere/spring/util/SpringFactoriesLoaderUtils.java | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
index 8520ee6b..0421c158 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
@@ -24,7 +24,7 @@
 
 import java.util.Set;
 
-import static io.microsphere.spring.util.BeanFactoryUtils.getResolvableDependencyTypes;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getResolvableDependencyTypes;
 import static io.microsphere.spring.util.BeanRegistrar.registerSingleton;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 05db08a6..686163ed 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -41,10 +41,10 @@
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.reflect.MethodUtils.invokeMethod;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static io.microsphere.spring.beans.factory.support.AutowireCandidateResolvingListener.loadListeners;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
-import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
-import static io.microsphere.spring.util.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.util.ArrayUtils.combine;
 import static org.springframework.beans.BeanUtils.instantiateClass;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
index 318a05a3..115a0bc4 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 
-import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.util.BeanRegistrar.registerBean;
 import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_PREFIX;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
index 9a3ac189..737473c7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/ApplicationContextUtils.java
@@ -30,7 +30,7 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanFactoryUtils.getBeanPostProcessors;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getBeanPostProcessors;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static io.microsphere.util.ClassUtils.cast;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
index b8e2e95c..906f2be8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
@@ -39,10 +39,10 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.getApplicationContextAwareProcessor;
-import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
-import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index b17cc2cd..9649346d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -31,11 +31,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableBeanFactory;
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
-import static io.microsphere.spring.util.BeanFactoryUtils.asBeanDefinitionRegistry;
-import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableBeanFactory;
-import static io.microsphere.spring.util.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;
 import static io.microsphere.spring.util.BeanUtils.invokeBeanInterfaces;

From a900c0cf38eaa18330ce4e5c76d84cdc8f9d0f05 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:17:38 +0800
Subject: [PATCH 083/157] Update PropertyValuesUtils.java

---
 .../java/io/microsphere/spring/beans/PropertyValuesUtils.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
index 73ae45f2..772bd865 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
@@ -1,5 +1,6 @@
 package io.microsphere.spring.beans;
 
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValues;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -15,7 +16,7 @@
  * @see PropertyValues
  * @since 2017.01.19
  */
-public abstract class PropertyValuesUtils {
+public abstract class PropertyValuesUtils extends BaseUtils {
 
     /**
      * Get Sub {@link PropertyValues} from {@link ConfigurableEnvironment}

From 124a50a5a33f89262ce5c4d67f5ecc35f6f4e887 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:19:05 +0800
Subject: [PATCH 084/157] Polish #41 : BeanRegistrar

---
 .../annotation/ConfigurationBeanBindingRegistrar.java      | 2 +-
 .../{util => beans/factory/support}/BeanRegistrar.java     | 2 +-
 .../{util => beans/factory/support}/BeanRegistrarTest.java | 7 ++++---
 .../annotation/WebExtensionBeanDefinitionRegistrar.java    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans/factory/support}/BeanRegistrar.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => beans/factory/support}/BeanRegistrarTest.java (91%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index 334f8bb8..5a113dda 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -46,9 +46,9 @@
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_IGNORE_INVALID_FIELDS;
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_IGNORE_UNKNOWN_FIELDS;
 import static io.microsphere.spring.beans.factory.annotation.EnableConfigurationBeanBinding.DEFAULT_MULTIPLE;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttribute;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getRequiredAttribute;
-import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
 import static io.microsphere.spring.util.PropertySourcesUtils.normalizePrefix;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
index 05c00906..20732511 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory.support;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanRegistrarTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
similarity index 91%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanRegistrarTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
index 23fffe0b..99ed146b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanRegistrarTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory.support;
 
+import io.microsphere.spring.util.User;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -23,8 +24,8 @@
 
 import java.util.function.Supplier;
 
-import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
-import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
index 9248ebac..f2226b94 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
@@ -25,7 +25,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
-import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 
 /**
  * {@link ImportBeanDefinitionRegistrar} for Spring Web Extension

From f256198d904212587e0d7dc5edbafab6b3df0fb7 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:19:38 +0800
Subject: [PATCH 085/157] Polish #41 : BeanRegistrar

---
 .../factory/filter/ResolvableDependencyTypeFilter.java     | 2 +-
 .../support/ListenableAutowireCandidateResolver.java       | 2 +-
 .../config/CollectingConfigurationPropertyListener.java    | 4 ++--
 .../spring/context/event/BeanFactoryListeners.java         | 2 +-
 .../io/microsphere/spring/context/event/BeanListeners.java | 2 +-
 .../context/event/EventPublishingBeanBeforeProcessor.java  | 2 +-
 .../spring/util/SpringFactoriesLoaderUtils.java            | 2 +-
 .../io/microsphere/spring/util/BeanInitializerTest.java    | 7 ++++---
 .../annotation/P6DataSourceBeanDefinitionRegistrar.java    | 2 +-
 .../annotation/WebMvcExtensionBeanDefinitionRegistrar.java | 2 +-
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
index 0421c158..4a8a8533 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/filter/ResolvableDependencyTypeFilter.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getResolvableDependencyTypes;
-import static io.microsphere.spring.util.BeanRegistrar.registerSingleton;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSingleton;
 
 /**
  * A class to filter {@link ConfigurableListableBeanFactory#registerResolvableDependency(Class, Object) Resolvable Dependency Type}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 686163ed..f06db078 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -44,8 +44,8 @@
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static io.microsphere.spring.beans.factory.support.AutowireCandidateResolvingListener.loadListeners;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
-import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.util.ArrayUtils.combine;
 import static org.springframework.beans.BeanUtils.instantiateClass;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
index 115a0bc4..c0e01147 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
@@ -27,8 +27,8 @@
 import org.springframework.core.env.ConfigurablePropertyResolver;
 
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
-import static io.microsphere.spring.util.BeanRegistrar.registerBean;
-import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_PREFIX;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_SUFFIX;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
index 2444f511..3d60a55d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
index cba23116..22507b71 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
@@ -36,7 +36,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
-import static io.microsphere.spring.util.BeanRegistrar.registerFactoryBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
index 47d76c32..ec48ad87 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.context.event;
 
 import io.microsphere.spring.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
-import io.microsphere.spring.util.BeanRegistrar;
+import io.microsphere.spring.beans.factory.support.BeanRegistrar;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
 import org.springframework.beans.factory.BeanFactory;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index 9649346d..b56ab4ba 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -34,9 +34,9 @@
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
-import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;
 import static io.microsphere.spring.util.BeanUtils.invokeBeanInterfaces;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
index 0c4e8e60..82669646 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.spring.beans.factory.support.BeanRegistrar;
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
@@ -24,9 +25,9 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
-import static io.microsphere.spring.util.BeanRegistrar.hasAlias;
-import static io.microsphere.spring.util.BeanRegistrar.registerInfrastructureBean;
-import static io.microsphere.spring.util.BeanRegistrar.registerSpringFactoriesBeans;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.hasAlias;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSpringFactoriesBeans;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
index e4fa2b46..e6c77e49 100644
--- a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
+++ b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
@@ -21,7 +21,7 @@
 import com.p6spy.engine.spy.option.P6OptionChangedListener;
 import io.microsphere.spring.jdbc.p6spy.beans.factory.CompoundJdbcEventListenerFactory;
 import io.microsphere.spring.jdbc.p6spy.beans.factory.config.P6DataSourceBeanPostProcessor;
-import io.microsphere.spring.util.BeanRegistrar;
+import io.microsphere.spring.beans.factory.support.BeanRegistrar;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
index 22fc06e1..ee6e8abf 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
@@ -32,7 +32,7 @@
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
-import static io.microsphere.spring.util.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.webmvc.interceptor.LazyCompositeHandlerInterceptor.BEAN_NAME;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 

From ad423d99ca21b5d524c9a0588077a1ea5d3ecfce Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:21:48 +0800
Subject: [PATCH 086/157] Update ApplicationContextUtilsTest.java

---
 .../spring/context/ApplicationContextUtilsTest.java         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
index 9e32107a..2e3f17bb 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.context;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -47,6 +48,11 @@ public void init() {
         context.refresh();
     }
 
+    @After
+    public void destroy() {
+        context.close();
+    }
+
     @Test
     public void testAsConfigurableApplicationContext() {
         ConfigurableApplicationContext applicationContext = asConfigurableApplicationContext(context);

From 80b09f99682e374bb63ead352d83922ea4e02f43 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:22:06 +0800
Subject: [PATCH 087/157] Polish #41 : BeanUtils

---
 .../microsphere/spring/{util => beans}/BeanUtils.java |  2 +-
 .../spring/beans/factory/DelegatingFactoryBean.java   |  6 +++---
 .../support/AutowireCandidateResolvingListener.java   |  2 +-
 .../InterceptingApplicationEventMulticaster.java      |  2 +-
 .../InterceptingApplicationEventMulticasterProxy.java |  2 +-
 ...ingDelegatingBeanProtocolURLConnectionFactory.java |  2 +-
 .../spring/util/SpringFactoriesLoaderUtils.java       |  4 ++--
 .../spring/{util => beans}/BeanUtilsTest.java         | 11 ++++++-----
 ...onfigurationBeanBindingTestForMultipleBinding.java |  2 +-
 .../factory/CompoundJdbcEventListenerFactory.java     |  2 +-
 .../method/support/DelegatingHandlerMethodAdvice.java |  2 +-
 .../support/InterceptingHandlerMethodProcessor.java   |  4 ++--
 12 files changed, 21 insertions(+), 20 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans}/BeanUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => beans}/BeanUtilsTest.java (96%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index 906f2be8..f8c85a0d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
index d2ea7dc1..aad63a8b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
@@ -24,9 +24,9 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;
-import static io.microsphere.spring.util.BeanUtils.invokeBeanNameAware;
-import static io.microsphere.spring.util.BeanUtils.invokeInitializingBean;
+import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
+import static io.microsphere.spring.beans.BeanUtils.invokeBeanNameAware;
+import static io.microsphere.spring.beans.BeanUtils.invokeInitializingBean;
 
 /**
  * {@link FactoryBean} implementation based on delegate object that was instantiated
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
index da969ae2..483e80be 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
@@ -27,7 +27,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
 import static java.util.Collections.unmodifiableList;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
index 1f35f43e..069f2740 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticaster.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.concurrent.Executor;
 
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 
 /**
  * Intercepting {@link ApplicationEventMulticaster} based on {@link SimpleApplicationEventMulticaster}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
index 72f5838e..ec7c3a39 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
@@ -37,7 +37,7 @@
 import static io.microsphere.reflect.MethodUtils.findDeclaredMethod;
 import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.context.event.InterceptingApplicationEventMulticaster.resolveEventType;
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
 
 /**
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringDelegatingBeanProtocolURLConnectionFactory.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringDelegatingBeanProtocolURLConnectionFactory.java
index d62dd4e4..d21f3413 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringDelegatingBeanProtocolURLConnectionFactory.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringDelegatingBeanProtocolURLConnectionFactory.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.net;
 
 import io.microsphere.net.SubProtocolURLConnectionFactory;
-import io.microsphere.spring.util.BeanUtils;
+import io.microsphere.spring.beans.BeanUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 
 import java.io.IOException;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
index b56ab4ba..f930f058 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
@@ -37,8 +37,8 @@
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
-import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;
-import static io.microsphere.spring.util.BeanUtils.invokeBeanInterfaces;
+import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
+import static io.microsphere.spring.beans.BeanUtils.invokeBeanInterfaces;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Collections.emptyList;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
similarity index 96%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
index 82acb40a..b417f08e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
@@ -1,7 +1,8 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans;
 
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
+import io.microsphere.spring.util.User;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
@@ -22,10 +23,10 @@
 import java.util.Map;
 
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
-import static io.microsphere.spring.util.BeanUtils.getBeanIfAvailable;
-import static io.microsphere.spring.util.BeanUtils.getBeanNames;
-import static io.microsphere.spring.util.BeanUtils.invokeAwareInterfaces;
-import static io.microsphere.spring.util.BeanUtils.isBeanPresent;
+import static io.microsphere.spring.beans.BeanUtils.getBeanIfAvailable;
+import static io.microsphere.spring.beans.BeanUtils.getBeanNames;
+import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
+import static io.microsphere.spring.beans.BeanUtils.isBeanPresent;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
index 136cf5de..e658229c 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
@@ -24,7 +24,7 @@
  */
 
 import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
-import io.microsphere.spring.util.BeanUtils;
+import io.microsphere.spring.beans.BeanUtils;
 import io.microsphere.spring.util.User;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/CompoundJdbcEventListenerFactory.java b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/CompoundJdbcEventListenerFactory.java
index 062bc913..ee184b2d 100644
--- a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/CompoundJdbcEventListenerFactory.java
+++ b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/beans/factory/CompoundJdbcEventListenerFactory.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 
 /**
  * The {@link P6Factory} class to create {@link CompoundJdbcEventListener}
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
index c5f400c2..44919236 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
@@ -27,7 +27,7 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static java.util.Collections.emptyList;
 
 /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
index 12b757fa..d61d696a 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
@@ -49,8 +49,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.spring.util.BeanUtils.getOptionalBean;
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getOptionalBean;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static io.microsphere.spring.webmvc.util.WebMvcUtils.getHandlerMethodArguments;
 import static java.util.Collections.emptyList;
 

From 970a4f5ee5f6db635ba468c123a164c20334a406 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:22:21 +0800
Subject: [PATCH 088/157] Polish #41 :  BeanUtils

---
 .../core/convert/support/ConversionServiceResolver.java       | 4 ++--
 .../p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
index b6397cf1..5c745cf2 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/convert/support/ConversionServiceResolver.java
@@ -24,8 +24,8 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.format.support.DefaultFormattingConversionService;
 
-import static io.microsphere.spring.util.BeanUtils.getBeanIfAvailable;
-import static io.microsphere.spring.util.BeanUtils.isBeanPresent;
+import static io.microsphere.spring.beans.BeanUtils.getBeanIfAvailable;
+import static io.microsphere.spring.beans.BeanUtils.isBeanPresent;
 import static java.lang.String.format;
 import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
 import static org.springframework.context.ConfigurableApplicationContext.ENVIRONMENT_BEAN_NAME;
diff --git a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
index e6c77e49..ba0fc437 100644
--- a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
+++ b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/annotation/P6DataSourceBeanDefinitionRegistrar.java
@@ -33,7 +33,7 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 
 /**
  * The {@link ImportBeanDefinitionRegistrar} class to register {@link BeanDefinition BeanDefinitions}

From 4fa2dfeafe5363ca56433714af3cbc383bbf77a0 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:25:31 +0800
Subject: [PATCH 089/157] Update BeanUtils.java

---
 .../src/main/java/io/microsphere/spring/beans/BeanUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index f8c85a0d..3e422a1c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -462,7 +462,7 @@ public static void invokeAwareInterfaces(Object bean, ConfigurableBeanFactory be
      * @param beanFactory
      * @param configurableBeanFactory
      */
-    static void invokeAwareInterfaces(Object bean, BeanFactory beanFactory, @Nullable ConfigurableBeanFactory configurableBeanFactory) {
+    public static void invokeAwareInterfaces(Object bean, BeanFactory beanFactory, @Nullable ConfigurableBeanFactory configurableBeanFactory) {
         if (beanFactory instanceof ApplicationContext) {
             invokeAwareInterfaces(bean, (ApplicationContext) beanFactory);
         } else {

From 091c23b2f0bad01528cd77476334e2fce0c61168 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:28:33 +0800
Subject: [PATCH 090/157] Polish #41 : Update BeanFactoryUtils

---
 .../io/microsphere/spring/beans/factory/BeanFactoryUtils.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
index 438795ae..ce212095 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.beans.factory;
 
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
@@ -51,7 +52,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-public abstract class BeanFactoryUtils {
+public abstract class BeanFactoryUtils extends BaseUtils {
 
     /**
      * Get optional Bean

From 7740c282cdc07275d1f41bc9fd605e7008a9e025 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:28:59 +0800
Subject: [PATCH 091/157] Polish #41 : BeanDefinitionUtils

---
 .../spring/beans/factory/config/BeanDefinitionUtils.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index de600fe1..9ff3f92d 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.beans.factory.config;
 
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -53,7 +54,7 @@
  * @see BeanDefinition#ROLE_INFRASTRUCTURE
  * @since 1.0.0
  */
-public abstract class BeanDefinitionUtils {
+public abstract class BeanDefinitionUtils extends BaseUtils {
 
     /**
      * The name of getResolvableType() method.

From 6ab91f0ea3da254fa2bfab92f2f161f2ccdcdc0b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:29:36 +0800
Subject: [PATCH 092/157] Polish #41 : BeanUtils

---
 .../src/main/java/io/microsphere/spring/beans/BeanUtils.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index 3e422a1c..0667f606 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -2,6 +2,7 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.Aware;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -58,7 +59,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 2017.01.13
  */
-public abstract class BeanUtils {
+public abstract class BeanUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(BeanUtils.class);
 

From 5b2ce2de799035a01fe747e35d81fb3f174b7195 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:31:16 +0800
Subject: [PATCH 093/157] Polish #41 : PropertySourcesUtils

---
 .../spring/beans/PropertyValuesUtils.java     |  2 +-
 .../ConfigurationBeanBindingRegistrar.java    |  6 ++---
 ...DefaultPropertiesPropertySourceLoader.java |  6 ++---
 .../event/PropertySourcesChangedEvent.java    |  2 +-
 .../env}/PropertySourcesUtils.java            |  5 +++--
 .../env}/PropertySourcesUtilsTest.java        | 22 +++++++++----------
 6 files changed, 22 insertions(+), 21 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => core/env}/PropertySourcesUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => core/env}/PropertySourcesUtilsTest.java (89%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
index 772bd865..b9027681 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/PropertyValuesUtils.java
@@ -7,7 +7,7 @@
 
 import java.util.Map;
 
-import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
 
 /**
  * {@link PropertyValues} Utilities
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index 5a113dda..f76f1deb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -19,7 +19,7 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.support.ConfigurationBeanAliasGenerator;
-import io.microsphere.spring.util.PropertySourcesUtils;
+import io.microsphere.spring.core.env.PropertySourcesUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -49,8 +49,8 @@
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttribute;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getRequiredAttribute;
-import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
-import static io.microsphere.spring.util.PropertySourcesUtils.normalizePrefix;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.normalizePrefix;
 import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
 import static java.lang.Boolean.valueOf;
 import static java.util.Collections.singleton;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
index d911971d..bf7486ba 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceLoader.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.config.context.annotation;
 
 import io.microsphere.spring.context.annotation.BeanCapableImportCandidate;
-import io.microsphere.spring.util.PropertySourcesUtils;
+import io.microsphere.spring.core.env.PropertySourcesUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -28,8 +28,8 @@
 import java.util.Map;
 
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
-import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
-import static io.microsphere.spring.util.PropertySourcesUtils.getDefaultProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getDefaultProperties;
 
 /**
  * The Loader class for {@link DefaultPropertiesPropertySource @DefaultPropertiesPropertySource}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
index b2c10541..262dc765 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/env/event/PropertySourcesChangedEvent.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.config.env.event;
 
 
-import io.microsphere.spring.util.PropertySourcesUtils;
+import io.microsphere.spring.core.env.PropertySourcesUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ApplicationContextEvent;
 import org.springframework.core.env.PropertySource;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertySourcesUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertySourcesUtils.java
index 7f5b4d6c..9d903801 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/PropertySourcesUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/PropertySourcesUtils.java
@@ -1,7 +1,8 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.env;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
@@ -37,7 +38,7 @@
  * @see PropertySources
  * @since 1.0.0
  */
-public abstract class PropertySourcesUtils {
+public abstract class PropertySourcesUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(PropertySourcesUtils.class);
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
similarity index 89%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
index cd99b177..978b8637 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/PropertySourcesUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
@@ -1,4 +1,4 @@
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.env;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -23,16 +23,16 @@
 
 import static io.microsphere.spring.core.env.EnvironmentUtils.getConversionService;
 import static io.microsphere.spring.core.env.EnvironmentUtils.resolveCommaDelimitedValueToList;
-import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
-import static io.microsphere.spring.util.PropertySourcesUtils.addDefaultProperties;
-import static io.microsphere.spring.util.PropertySourcesUtils.findConfiguredPropertySource;
-import static io.microsphere.spring.util.PropertySourcesUtils.findConfiguredPropertySourceName;
-import static io.microsphere.spring.util.PropertySourcesUtils.findPropertyNamesByPrefix;
-import static io.microsphere.spring.util.PropertySourcesUtils.getDefaultProperties;
-import static io.microsphere.spring.util.PropertySourcesUtils.getDefaultPropertiesPropertySource;
-import static io.microsphere.spring.util.PropertySourcesUtils.getMapPropertySource;
-import static io.microsphere.spring.util.PropertySourcesUtils.getPropertySource;
-import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.addDefaultProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.findConfiguredPropertySource;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.findConfiguredPropertySourceName;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.findPropertyNamesByPrefix;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getDefaultProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getDefaultPropertiesPropertySource;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getMapPropertySource;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getPropertySource;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

From d49c0688e8b6503f56d21874dabb8049e9ed329b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:31:27 +0800
Subject: [PATCH 094/157] Polish #41 : PropertySourcesUtils

---
 .../context/annotation/DefaultPropertiesPropertySource.java     | 2 +-
 .../spring/net/SpringPropertySourcesURLConnectionAdapter.java   | 2 +-
 .../context/annotation/DefaultPropertiesPropertySourceTest.java | 2 +-
 .../annotation/DefaultPropertiesPropertySourcesTest.java        | 2 +-
 .../jdbc/p6spy/PropertySourcesP6LoadableOptionsAdapter.java     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySource.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySource.java
index bab99f86..2a4a0ee0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySource.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySource.java
@@ -17,7 +17,7 @@
 package io.microsphere.spring.config.context.annotation;
 
 import io.microsphere.spring.config.env.support.DefaultResourceComparator;
-import io.microsphere.spring.util.PropertySourcesUtils;
+import io.microsphere.spring.core.env.PropertySourcesUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringPropertySourcesURLConnectionAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringPropertySourcesURLConnectionAdapter.java
index ce328560..20bbb5ca 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringPropertySourcesURLConnectionAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringPropertySourcesURLConnectionAdapter.java
@@ -30,7 +30,7 @@
 import static io.microsphere.constants.PathConstants.SLASH_CHAR;
 import static io.microsphere.net.URLUtils.resolveAuthority;
 import static io.microsphere.net.URLUtils.resolvePath;
-import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
 
 /**
  * The {@link URLConnection} adapter class is based on the Spring {@link PropertySources}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
index b94f88d0..ed5b6ab8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
@@ -25,7 +25,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
index 69eb91c6..2fda2506 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
@@ -25,7 +25,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static io.microsphere.spring.util.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/PropertySourcesP6LoadableOptionsAdapter.java b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/PropertySourcesP6LoadableOptionsAdapter.java
index 1457924e..dfb045ce 100644
--- a/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/PropertySourcesP6LoadableOptionsAdapter.java
+++ b/microsphere-spring-jdbc/src/main/java/io/microsphere/spring/jdbc/p6spy/PropertySourcesP6LoadableOptionsAdapter.java
@@ -22,7 +22,7 @@
 
 import java.util.Map;
 
-import static io.microsphere.spring.util.PropertySourcesUtils.getSubProperties;
+import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
 
 /**
  * {@link PropertySources} {@link P6LoadableOptions} Adapter

From 0d308be0eec61b9604adb883b03f7c1f30dcb475 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:34:36 +0800
Subject: [PATCH 095/157] Polish #41 : ResourceLoaderUtils

---
 .../spring/{util => core/io}/ResourceLoaderUtils.java       | 2 +-
 .../spring/{util => core/io}/ResourceLoaderUtilsTest.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => core/io}/ResourceLoaderUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => core/io}/ResourceLoaderUtilsTest.java (89%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
index 4e8e1891..0b455409 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ResourceLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.io;
 
 import io.microsphere.util.BaseUtils;
 import io.microsphere.util.ClassLoaderUtils;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/ResourceLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
similarity index 89%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/ResourceLoaderUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
index 688d1df0..6bad1bd4 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/ResourceLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.io;
 
 import io.microsphere.util.ClassLoaderUtils;
 import org.junit.Test;
 
-import static io.microsphere.spring.util.ResourceLoaderUtils.getResourceLoader;
-import static io.microsphere.spring.util.ResourceLoaderUtils.getResourcePatternResolver;
+import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
+import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourcePatternResolver;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 

From 538b877ea5c9e396765b344232cf7bcc3241e42b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:35:06 +0800
Subject: [PATCH 096/157] Update ResourceLoaderUtilsTest.java

---
 .../io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
index 6bad1bd4..0d248b10 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
@@ -21,6 +21,7 @@
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourcePatternResolver;
+import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
@@ -37,7 +38,7 @@ public class ResourceLoaderUtilsTest {
     public void testGetResourceLoader() {
         assertNotNull(getResourceLoader());
         assertSame(getResourceLoader(), getResourceLoader(null));
-        assertSame(getResourceLoader(), getResourceLoader(ClassLoaderUtils.getDefaultClassLoader()));
+        assertSame(getResourceLoader(), getResourceLoader(getDefaultClassLoader()));
         assertSame(getResourceLoader(), getResourceLoader(Thread.currentThread().getContextClassLoader()));
     }
 

From cac72547adb5ee8b700c9d6f6bd1baf2deba7eeb Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:36:13 +0800
Subject: [PATCH 097/157] Polish #41 : SpringFactoriesLoaderUtils

---
 .../beans/factory/InjectionPointDependencyResolvers.java      | 2 +-
 .../factory/annotation/ConfigurationBeanBindingRegistrar.java | 2 +-
 .../{util => core/io/support}/SpringFactoriesLoaderUtils.java | 2 +-
 .../io/support}/SpringFactoriesLoaderUtilsTest.java           | 4 ++--
 .../spring/web/metadata/SmartWebEndpointMappingFactory.java   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => core/io/support}/SpringFactoriesLoaderUtils.java (99%)
 rename microsphere-spring-context/src/test/java/io/microsphere/spring/{util => core/io/support}/SpringFactoriesLoaderUtilsTest.java (96%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/InjectionPointDependencyResolvers.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/InjectionPointDependencyResolvers.java
index 9e6ea109..7d908856 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/InjectionPointDependencyResolvers.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/InjectionPointDependencyResolvers.java
@@ -25,7 +25,7 @@
 import java.lang.reflect.Parameter;
 import java.util.Set;
 
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
 
 /**
  * Composite {@link InjectionPointDependencyResolver}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index f76f1deb..f5bdc9a0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -51,7 +51,7 @@
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getRequiredAttribute;
 import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
 import static io.microsphere.spring.core.env.PropertySourcesUtils.normalizePrefix;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
 import static java.lang.Boolean.valueOf;
 import static java.util.Collections.singleton;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
similarity index 99%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
index f930f058..dd55046c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.io.support;
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
similarity index 96%
rename from microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
rename to microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
index e4484df2..bced7026 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringFactoriesLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.core.io.support;
 
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
@@ -28,7 +28,7 @@
 
 import java.util.List;
 
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
index 17d64a12..18b7a50a 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import io.microsphere.spring.util.SpringFactoriesLoaderUtils;
+import io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

From b6a14d8e58eab2e322851a035faab3bdc992aa9b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:36:21 +0800
Subject: [PATCH 098/157] Polish #41 : SpringFactoriesLoaderUtils

---
 .../factory/support/AutowireCandidateResolvingListener.java   | 4 ++--
 .../spring/context/event/BeanFactoryListeners.java            | 2 +-
 .../io/microsphere/spring/context/event/BeanListeners.java    | 2 +-
 .../spring/core/env/ListenableConfigurableEnvironment.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
index 483e80be..8f0b2e41 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/AutowireCandidateResolvingListener.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.beans.factory.support;
 
-import io.microsphere.spring.util.SpringFactoriesLoaderUtils;
+import io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -28,7 +28,7 @@
 import java.util.List;
 
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
 import static java.util.Collections.unmodifiableList;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
index 3d60a55d..a128c310 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanFactoryListeners.java
@@ -30,7 +30,7 @@
 import java.util.function.Consumer;
 
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerFactoryBean;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.registerFactories;
 
 /**
  * The Composite {@link BeanFactoryListener}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
index 22507b71..07ae93e7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/BeanListeners.java
@@ -37,7 +37,7 @@
 import java.util.function.Consumer;
 
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerFactoryBean;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.registerFactories;
 
 /**
  * The composite {@link BeanListener}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 1b627815..4dde281b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -38,7 +38,7 @@
 
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.loadFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
 
 /**

From 6169ef27f4d942777e27daf16da37de1c87d5966 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:36:50 +0800
Subject: [PATCH 099/157] Update SpringFactoriesLoaderUtilsTest.java

---
 .../core/io/support/SpringFactoriesLoaderUtilsTest.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
index bced7026..72b3660b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
@@ -18,6 +18,7 @@
 
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
@@ -54,6 +55,11 @@ public void before() {
         context.refresh();
     }
 
+    @After
+    public void after() {
+        context.close();
+    }
+
     @Test
     public void testLoadFactories() {
         testLoadFactoriesFromContext(beanFactory, context);

From 0166c4a4e10fcaea4b757bb5caf88d1b034b1ff0 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:37:16 +0800
Subject: [PATCH 100/157] Update SpringFactoriesLoaderUtils.java

---
 .../spring/core/io/support/SpringFactoriesLoaderUtils.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
index dd55046c..9e472bd7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
@@ -18,6 +18,7 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -55,7 +56,7 @@
  * @see SpringFactoriesLoader
  * @since 1.0.0
  */
-public abstract class SpringFactoriesLoaderUtils {
+public abstract class SpringFactoriesLoaderUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(SpringFactoriesLoaderUtils.class);
 

From 427a9046e6af91e1a1e402bb93e99d4ae13f3b2a Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:38:06 +0800
Subject: [PATCH 101/157] Polish #41 : Reimport

---
 .../spring/core/io/support/SpringFactoriesLoaderUtils.java    | 4 ++--
 .../test/java/io/microsphere/spring/beans/BeanUtilsTest.java  | 2 +-
 .../EnableConfigurationBeanBindingTestForMultipleBinding.java | 2 +-
 .../microsphere/spring/core/io/ResourceLoaderUtilsTest.java   | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
index 9e472bd7..64e3f56a 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
@@ -32,14 +32,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
+import static io.microsphere.spring.beans.BeanUtils.invokeBeanInterfaces;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
-import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
-import static io.microsphere.spring.beans.BeanUtils.invokeBeanInterfaces;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Collections.emptyList;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
index b417f08e..82864f3d 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
@@ -22,11 +22,11 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static io.microsphere.spring.beans.BeanUtils.getBeanIfAvailable;
 import static io.microsphere.spring.beans.BeanUtils.getBeanNames;
 import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
 import static io.microsphere.spring.beans.BeanUtils.isBeanPresent;
+import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
index e658229c..d575122f 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
@@ -23,8 +23,8 @@
  * @since 1.0.0
  */
 
-import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.beans.BeanUtils;
+import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.util.User;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
index 0d248b10..869ea2f8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
@@ -16,7 +16,6 @@
  */
 package io.microsphere.spring.core.io;
 
-import io.microsphere.util.ClassLoaderUtils;
 import org.junit.Test;
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;

From 74493f8521db8dea8433e096f217f2ffa72b41da Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:38:41 +0800
Subject: [PATCH 102/157] Update
 InterceptingApplicationEventMulticasterProxy.java

---
 .../event/InterceptingApplicationEventMulticasterProxy.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
index ec7c3a39..8051453b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterProxy.java
@@ -36,8 +36,8 @@
 
 import static io.microsphere.reflect.MethodUtils.findDeclaredMethod;
 import static io.microsphere.reflect.MethodUtils.invokeMethod;
-import static io.microsphere.spring.context.event.InterceptingApplicationEventMulticaster.resolveEventType;
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
+import static io.microsphere.spring.context.event.InterceptingApplicationEventMulticaster.resolveEventType;
 import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
 
 /**

From da8bf3f0b3da3d076f776c7c5619b30bdfbd468c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:40:42 +0800
Subject: [PATCH 103/157] Polish #41 : Remove FieldUtils

---
 .../beans/factory/BeanFactoryUtils.java       |  2 +-
 .../microsphere/spring/util/FieldUtils.java   | 88 -------------------
 .../spring/util/FieldUtilsTest.java           | 33 -------
 3 files changed, 1 insertion(+), 122 deletions(-)
 delete mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/util/FieldUtils.java
 delete mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
index ce212095..af765f44 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/BeanFactoryUtils.java
@@ -34,7 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.microsphere.spring.util.FieldUtils.getFieldValue;
+import static io.microsphere.reflect.FieldUtils.getFieldValue;
 import static io.microsphere.util.ArrayUtils.of;
 import static io.microsphere.util.ClassUtils.cast;
 import static java.util.Collections.emptyList;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/FieldUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/FieldUtils.java
deleted file mode 100644
index 6668d475..00000000
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/FieldUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.microsphere.spring.util;
-
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Field;
-
-/**
- * {@link Field} Utilities
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @see Field
- * @see ReflectionUtils
- * @since 2017.01.22
- */
-@SuppressWarnings("unchecked")
-public abstract class FieldUtils {
-
-
-    /**
-     * Get {@link Field} Value
-     *
-     * @param object    {@link Object}
-     * @param fieldName field name
-     * @param <T>       field type
-     * @return {@link Field} Value
-     */
-    public static <T> T getFieldValue(Object object, String fieldName) {
-        return (T) getFieldValue(object, fieldName, null);
-    }
-
-    /**
-     * Get {@link Field} Value
-     *
-     * @param object       {@link Object}
-     * @param fieldName    field name
-     * @param <T>          field type
-     * @param defaultValue default value
-     * @return {@link Field} Value
-     */
-    public static <T> T getFieldValue(Object object, String fieldName, T defaultValue) {
-
-        T value = getFieldValue(object, fieldName);
-
-        return value != null ? value : defaultValue;
-    }
-
-    /**
-     * Get {@link Field} Value
-     *
-     * @param object    {@link Object}
-     * @param fieldName field name
-     * @param fieldType field type
-     * @param <T>       field type
-     * @return {@link Field} Value
-     */
-    public static <T> T getFieldValue(Object object, String fieldName, Class<T> fieldType) {
-
-        T fieldValue = null;
-
-        Field field = ReflectionUtils.findField(object.getClass(), fieldName, fieldType);
-
-        if (field != null) {
-
-            boolean accessible = field.isAccessible();
-
-            try {
-
-                if (!accessible) {
-                    ReflectionUtils.makeAccessible(field);
-                }
-
-                fieldValue = (T) ReflectionUtils.getField(field, object);
-
-            } finally {
-
-                if (!accessible) {
-                    field.setAccessible(accessible);
-                }
-
-            }
-
-        }
-
-        return fieldValue;
-
-    }
-
-}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java
deleted file mode 100644
index b33ce7c0..00000000
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/FieldUtilsTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.microsphere.spring.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * {@link FieldUtils} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @see FieldUtils
- * @since 2017.01.22
- */
-public class FieldUtilsTest {
-
-    private Object data;
-
-    @Test
-    public void testGetField() {
-
-        FieldUtilsTest instance = new FieldUtilsTest();
-
-        int hash = FieldUtils.getFieldValue(instance, "data", 2);
-
-        Assert.assertEquals(2, hash);
-
-        instance.data = 1;
-
-        hash = FieldUtils.getFieldValue(instance, "data", 2);
-
-        Assert.assertEquals(1, hash);
-
-    }
-}

From 57d5f06247923a8b7871294a87f342ba302db725 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:46:40 +0800
Subject: [PATCH 104/157] Polish #41 :
 EnvironmentUtils#asConfigurableEnvironment

---
 .../spring/core/env/EnvironmentUtils.java        | 16 ++++++++++++++++
 .../spring/core/env/EnvironmentUtilsTest.java    |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
index 4c26c99a..f083e060 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
@@ -21,8 +21,10 @@
 import io.microsphere.util.BaseUtils;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.Environment;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Nonnull;
@@ -54,6 +56,20 @@ public abstract class EnvironmentUtils extends BaseUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(EnvironmentUtils.class);
 
+    /**
+     * Cast {@link Environment} to {@link ConfigurableEnvironment}
+     *
+     * @param environment {@link Environment}
+     * @return {@link ConfigurableEnvironment}
+     * @throws IllegalArgumentException If <code>environment</code> argument is not an instance of {@link ConfigurableEnvironment}
+     */
+    public static ConfigurableEnvironment asConfigurableEnvironment(Environment environment) throws IllegalArgumentException {
+        Assert.isInstanceOf(ConfigurableEnvironment.class, environment,
+                "The 'environment' argument is not a instance of ConfigurableEnvironment, " +
+                        "is it running in Spring container?");
+        return (ConfigurableEnvironment) environment;
+    }
+
     /**
      * Get the properties from the specified {@link Environment} and property names
      *
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
index 91d0afb8..4582bc46 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
 import static io.microsphere.spring.core.env.EnvironmentUtils.getConversionService;
 import static io.microsphere.spring.core.env.EnvironmentUtils.getProperties;
 import static io.microsphere.spring.core.env.EnvironmentUtils.resolveCommaDelimitedValueToList;
@@ -31,6 +32,7 @@
 import static java.util.Collections.emptyMap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 /**
  * {@link EnvironmentUtils} Test
@@ -101,6 +103,12 @@ public void testResolvePlaceholders() {
         value = resolvePlaceholders(environment, "${d}", String.class, "default-value");
         assertEquals("${d}", value);
     }
+
+    @Test
+    public void testAsConfigurableEnvironment() {
+        ConfigurableEnvironment configurableEnvironment = asConfigurableEnvironment(environment);
+        assertSame(environment, configurableEnvironment);
+    }
 }
 
 

From ee0305555aadc77c1f9061dd55983ac5c299dae3 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:47:25 +0800
Subject: [PATCH 105/157] Update
 AnnotationBeanDefinitionRegistryPostProcessor.java

---
 .../AnnotationBeanDefinitionRegistryPostProcessor.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index fda5bba8..ec22b0d7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -48,6 +48,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.tryGetMergedAnnotation;
 import static io.microsphere.spring.util.WrapperUtils.unwrap;
@@ -310,7 +311,7 @@ public ConfigurableListableBeanFactory getBeanFactory() {
     }
 
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        this.beanFactory = unwrap(beanFactory);
+        this.beanFactory = asConfigurableListableBeanFactory(beanFactory);
     }
 
     public ConfigurableEnvironment getEnvironment() {

From 3280625911482d953246b908bc269d4f9bab0ad5 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:47:29 +0800
Subject: [PATCH 106/157] Update ConfigurationBeanBindingPostProcessor.java

---
 .../annotation/ConfigurationBeanBindingPostProcessor.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
index 5e6624b1..9fbc15eb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingPostProcessor.java
@@ -38,8 +38,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.beans.factory.annotation.ConfigurationBeanBindingRegistrar.ENABLE_CONFIGURATION_BINDING_CLASS;
-import static io.microsphere.spring.util.WrapperUtils.unwrap;
 import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
 import static org.springframework.core.annotation.AnnotationAwareOrderComparator.sort;
 import static org.springframework.util.ClassUtils.getUserClass;
@@ -223,7 +223,7 @@ private static boolean getIgnoreInvalidFields(BeanDefinition beanDefinition) {
 
     @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        this.beanFactory = unwrap(beanFactory);
+        this.beanFactory = asConfigurableListableBeanFactory(beanFactory);
     }
 
     @Override

From 95afe0e5a15fcbb295e56ba070a541f60efd85e6 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:47:43 +0800
Subject: [PATCH 107/157] Polish #41 : Remove WrapperUtils

---
 .../microsphere/spring/util/WrapperUtils.java | 60 -------------------
 .../spring/util/WrapperUtilsTest.java         | 36 -----------
 2 files changed, 96 deletions(-)
 delete mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/util/WrapperUtils.java
 delete mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/WrapperUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/util/WrapperUtils.java
deleted file mode 100644
index 8681196f..00000000
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/WrapperUtils.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.util;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
-import org.springframework.util.Assert;
-
-/**
- * The utilities class for wrapper interfaces
- *
- * @since 1.0.0
- */
-public abstract class WrapperUtils {
-
-    /**
-     * Unwrap {@link BeanFactory} to {@link ConfigurableListableBeanFactory}
-     *
-     * @param beanFactory {@link ConfigurableListableBeanFactory}
-     * @return {@link ConfigurableListableBeanFactory}
-     * @throws IllegalArgumentException If <code>beanFactory</code> argument is not an instance of {@link ConfigurableListableBeanFactory}
-     */
-    public static ConfigurableListableBeanFactory unwrap(BeanFactory beanFactory) throws IllegalArgumentException {
-        Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory,
-                "The 'beanFactory' argument is not an instance of ConfigurableListableBeanFactory, " +
-                        "is it running in Spring container?");
-        return ConfigurableListableBeanFactory.class.cast(beanFactory);
-    }
-
-
-    /**
-     * Unwrap {@link Environment} to {@link ConfigurableEnvironment}
-     *
-     * @param environment {@link Environment}
-     * @return {@link ConfigurableEnvironment}
-     * @throws IllegalArgumentException If <code>environment</code> argument is not an instance of {@link ConfigurableEnvironment}
-     */
-    public static ConfigurableEnvironment unwrap(Environment environment) throws IllegalArgumentException {
-        Assert.isInstanceOf(ConfigurableEnvironment.class, environment,
-                "The 'environment' argument is not a instance of ConfigurableEnvironment, " +
-                        "is it running in Spring container?");
-        return (ConfigurableEnvironment) environment;
-    }
-}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java
deleted file mode 100644
index 552175aa..00000000
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/WrapperUtilsTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.microsphere.spring.util;
-
-import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.mockito.Mockito.mock;
-
-public class WrapperUtilsTest {
-
-    @Test
-    public void testUnwrapWithConfigurableListableBeanFactory() {
-        // Arrange
-        ConfigurableListableBeanFactory configurableListableBeanFactoryMock = mock(ConfigurableListableBeanFactory.class);
-        BeanFactory beanFactory = configurableListableBeanFactoryMock;
-
-        // Act
-        ConfigurableListableBeanFactory result = WrapperUtils.unwrap(beanFactory);
-
-        // Assert
-        assertEquals("The unwrap method should return the same instance when passed a ConfigurableListableBeanFactory.", configurableListableBeanFactoryMock, result);
-    }
-
-    @Test
-    public void testUnwrapWithNonConfigurableListableBeanFactory() {
-        // Arrange
-        BeanFactory nonConfigurableBeanFactoryMock = mock(BeanFactory.class);
-
-        // Act & Assert
-        assertThrows("The unwrap method should throw an IllegalArgumentException when the bean factory is not an instance of ConfigurableListableBeanFactory.",
-                IllegalArgumentException.class, () -> WrapperUtils.unwrap(nonConfigurableBeanFactoryMock));
-    }
-
-}

From 7853f261cbc8053e9070a3b269ee4f8b76bac4b2 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:50:32 +0800
Subject: [PATCH 108/157] Update
 AnnotationBeanDefinitionRegistryPostProcessor.java

---
 .../AnnotationBeanDefinitionRegistryPostProcessor.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index ec22b0d7..7c4abda8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -51,7 +51,7 @@
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.resolveAnnotatedBeanNameGenerator;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.tryGetMergedAnnotation;
-import static io.microsphere.spring.util.WrapperUtils.unwrap;
+import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
 import static org.springframework.util.ClassUtils.resolveClassName;
@@ -320,7 +320,7 @@ public ConfigurableEnvironment getEnvironment() {
 
     @Override
     public void setEnvironment(Environment environment) {
-        this.environment = unwrap(environment);
+        this.environment = asConfigurableEnvironment(environment);
     }
 
     public ResourceLoader getResourceLoader() {

From 93affbadd2596b554b7b915e356603246c4bf087 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 10:55:12 +0800
Subject: [PATCH 109/157] Update ObjectProviderUtils.java

---
 .../spring/{util => beans/factory}/ObjectProviderUtils.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
 rename microsphere-spring-context/src/main/java/io/microsphere/spring/{util => beans/factory}/ObjectProviderUtils.java (90%)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ObjectProviderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
similarity index 90%
rename from microsphere-spring-context/src/main/java/io/microsphere/spring/util/ObjectProviderUtils.java
rename to microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
index f308dfd4..defa99a5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/util/ObjectProviderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.microsphere.spring.util;
+package io.microsphere.spring.beans.factory;
 
 import io.microsphere.util.BaseUtils;
 import io.microsphere.util.Version;
@@ -30,6 +30,4 @@
  */
 public abstract class ObjectProviderUtils extends BaseUtils {
 
-    private static final Version SPRING_VERSION = getSpringVersion(ObjectProvider.class);
-
 }

From 71d6521a05e8ef0650c8cb7463d8a93324420f5a Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 25 Dec 2024 13:32:50 +0800
Subject: [PATCH 110/157] Update WebMvcExtensionConfiguration.java

---
 .../webmvc/annotation/WebMvcExtensionConfiguration.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
index e9727088..fd07a295 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
@@ -34,12 +34,12 @@
 public class WebMvcExtensionConfiguration extends WebMvcConfigurerAdapter {
 
     @Autowired
-    private ObjectProvider<LazyCompositeHandlerInterceptor> lazyCompositeHandlerInterceptorProvider;
+    private ObjectProvider<LazyCompositeHandlerInterceptor[]> lazyCompositeHandlerInterceptorProvider;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        LazyCompositeHandlerInterceptor lazyCompositeHandlerInterceptor = lazyCompositeHandlerInterceptorProvider.getIfAvailable();
-        if (lazyCompositeHandlerInterceptor != null) {
+        LazyCompositeHandlerInterceptor[] lazyCompositeHandlerInterceptors = lazyCompositeHandlerInterceptorProvider.getIfAvailable();
+        for (LazyCompositeHandlerInterceptor lazyCompositeHandlerInterceptor : lazyCompositeHandlerInterceptors) {
             registry.addInterceptor(lazyCompositeHandlerInterceptor);
         }
     }

From 9f6ddae5031ec5be10018c154632e2809f05cb96 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 14:22:37 +0800
Subject: [PATCH 111/157] Polish #34 : Add MethodParameterUtils

---
 ...tractInjectionPointDependencyResolver.java |  3 +-
 .../spring/core/MethodParameterUtils.java     | 90 +++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/core/MethodParameterUtils.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
index e40f2ce5..46e1cafb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
@@ -19,6 +19,7 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.filter.ResolvableDependencyTypeFilter;
+import io.microsphere.spring.core.MethodParameterUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -40,7 +41,7 @@
 import static io.microsphere.reflect.TypeUtils.isParameterizedType;
 import static io.microsphere.reflect.TypeUtils.resolveActualTypeArguments;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
-import static org.springframework.core.MethodParameter.forParameter;
+import static io.microsphere.spring.core.MethodParameterUtils.forParameter;
 
 /**
  * Abstract {@link InjectionPointDependencyResolver}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/MethodParameterUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/MethodParameterUtils.java
new file mode 100644
index 00000000..0c232bf0
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/MethodParameterUtils.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.core;
+
+import io.microsphere.util.BaseUtils;
+import org.springframework.core.MethodParameter;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+
+/**
+ * The utility class for {@link MethodParameter}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see MethodParameter
+ * @since 1.0.0
+ */
+public abstract class MethodParameterUtils extends BaseUtils {
+
+    /**
+     * Create a new MethodParameter for the given parameter descriptor.
+     * <p>This is a convenience factory method for scenarios where a
+     * Java 8 {@link Parameter} descriptor is already available.
+     *
+     * @param parameter the parameter descriptor
+     * @return the corresponding MethodParameter instance
+     * @see MethodParameter#forParameter(Parameter)
+     * @since Spring Framework 5.0
+     */
+    public static MethodParameter forParameter(Parameter parameter) {
+        return forExecutable(parameter.getDeclaringExecutable(), findParameterIndex(parameter));
+    }
+
+    /**
+     * Create a new MethodParameter for the given method or constructor.
+     * <p>This is a convenience factory method for scenarios where a
+     * Method or Constructor reference is treated in a generic fashion.
+     *
+     * @param executable     the Method or Constructor to specify a parameter for
+     * @param parameterIndex the index of the parameter
+     * @return the corresponding MethodParameter instance
+     * @since Spring Framework 5.0
+     */
+    public static MethodParameter forExecutable(Executable executable, int parameterIndex) {
+        if (executable instanceof Method) {
+            return new MethodParameter((Method) executable, parameterIndex);
+        } else if (executable instanceof Constructor) {
+            return new MethodParameter((Constructor<?>) executable, parameterIndex);
+        } else {
+            throw new IllegalArgumentException("Not a Method/Constructor: " + executable);
+        }
+    }
+
+
+    protected static int findParameterIndex(Parameter parameter) {
+        Executable executable = parameter.getDeclaringExecutable();
+        Parameter[] allParams = executable.getParameters();
+        // Try first with identity checks for greater performance.
+        for (int i = 0; i < allParams.length; i++) {
+            if (parameter == allParams[i]) {
+                return i;
+            }
+        }
+        // Potentially try again with object equality checks in order to avoid race
+        // conditions while invoking java.lang.reflect.Executable.getParameters().
+        for (int i = 0; i < allParams.length; i++) {
+            if (parameter.equals(allParams[i])) {
+                return i;
+            }
+        }
+        throw new IllegalArgumentException("Given parameter [" + parameter +
+                "] does not match any parameter in the declaring executable");
+    }
+}

From 33ec2a203c11179225e49cc019e3ab796c676496 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 16:54:49 +0800
Subject: [PATCH 112/157] Update ObjectProviderUtils.java

---
 .../microsphere/spring/beans/factory/ObjectProviderUtils.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
index defa99a5..a5458c12 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/ObjectProviderUtils.java
@@ -17,11 +17,8 @@
 package io.microsphere.spring.beans.factory;
 
 import io.microsphere.util.BaseUtils;
-import io.microsphere.util.Version;
 import org.springframework.beans.factory.ObjectProvider;
 
-import static io.microsphere.spring.util.SpringVersionUtils.getSpringVersion;
-
 /**
  * The utilities class for {@link ObjectProvider}
  *

From 7cebdfa2f94fb79dcf00b373ec7ce780d652e05c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 16:55:01 +0800
Subject: [PATCH 113/157] Polish #34 : Add ResourceUtils

---
 .../spring/core/io/ResourceUtils.java         | 68 ++++++++++++++++++
 .../spring/core/io/ResourceUtilsTest.java     | 71 +++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java
 create mode 100644 microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java
new file mode 100644
index 00000000..a5b45e21
--- /dev/null
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.core.io;
+
+import io.microsphere.util.BaseUtils;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+
+import static io.microsphere.util.ClassLoaderUtils.resolveClass;
+
+/**
+ * The utilities class for {@link Resource}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see Resource
+ * @since 1.0.0
+ */
+public abstract class ResourceUtils extends BaseUtils {
+
+    /**
+     * The class name of {@linkplain org.springframework.core.io.FileUrlResource}
+     *
+     * @since Spring Framework 5.0.2
+     */
+    public static final String FILE_URL_RESOURCE_CLASS_NAME = "org.springframework.core.io.FileUrlResource";
+
+    /**
+     * The {@link Class} of {@linkplain org.springframework.core.io.FileUrlResource}
+     *
+     * @since Spring Framework 5.0.2
+     */
+    public static final Class FILE_URL_RESOURCE_CLASS = resolveClass(FILE_URL_RESOURCE_CLASS_NAME, ResourceUtils.class.getClassLoader());
+
+    /**
+     * Determine whether the specified {@link Resource} is a {@linkplain org.springframework.core.io.FileUrlResource}
+     *
+     * @param resource {@link Resource}
+     * @return <code>true</code> if the specified {@link Resource} is a {@linkplain org.springframework.core.io.FileUrlResource}
+     */
+    public static boolean isFileUrlResource(Resource resource) {
+        return FILE_URL_RESOURCE_CLASS != null && FILE_URL_RESOURCE_CLASS.isInstance(resource);
+    }
+
+    /**
+     * Determine whether the specified {@link Resource} is a file based {@link Resource}
+     *
+     * @param resource {@link Resource}
+     * @return <code>true</code> if the specified {@link Resource} is a file system based {@link Resource}
+     */
+    public static boolean isFileBasedResource(Resource resource) {
+        return resource instanceof FileSystemResource ||
+                isFileUrlResource(resource);
+    }
+}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
new file mode 100644
index 00000000..e2a2afd5
--- /dev/null
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.microsphere.spring.core.io;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.function.Function;
+
+import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
+import static io.microsphere.spring.core.io.ResourceUtils.FILE_URL_RESOURCE_CLASS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * {@link ResourceUtils} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
+ * @see ResourceUtils
+ * @since 1.0.0
+ */
+public class ResourceUtilsTest {
+
+    private static final ResourceLoader resourceLoader = getResourceLoader();
+
+    private Resource classPathResource;
+
+    private Resource urlResource;
+
+    @Before
+    public void init() throws IOException {
+        this.classPathResource = resourceLoader.getResource("classpath:/META-INF/spring.factories");
+        URL url = this.classPathResource.getURL();
+        this.urlResource = resourceLoader.getResource(url.toString());
+    }
+
+    @Test
+    public void testIsFileUrlResource() {
+        assertResource(this.classPathResource, ResourceUtils::isFileUrlResource, false);
+        assertResource(this.urlResource, ResourceUtils::isFileUrlResource, true);
+    }
+
+    @Test
+    public void testIsFileBasedResource() throws IOException {
+        assertResource(this.classPathResource, ResourceUtils::isFileBasedResource, false);
+        assertResource(this.urlResource, ResourceUtils::isFileBasedResource, true);
+    }
+
+    private void assertResource(Resource resource, Function<Resource, Boolean> isFunction, boolean expected) {
+        assertEquals(expected, isFunction.apply(resource));
+    }
+}

From 4cc896265346cc7446ae922a742cd582f4099dde Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 16:57:03 +0800
Subject: [PATCH 114/157] Update ResourceUtilsTest.java

---
 .../io/microsphere/spring/core/io/ResourceUtilsTest.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
index e2a2afd5..32c6c842 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
@@ -18,6 +18,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 
@@ -26,10 +27,7 @@
 import java.util.function.Function;
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
-import static io.microsphere.spring.core.io.ResourceUtils.FILE_URL_RESOURCE_CLASS;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * {@link ResourceUtils} Test
@@ -63,6 +61,7 @@ public void testIsFileUrlResource() {
     public void testIsFileBasedResource() throws IOException {
         assertResource(this.classPathResource, ResourceUtils::isFileBasedResource, false);
         assertResource(this.urlResource, ResourceUtils::isFileBasedResource, true);
+        assertResource(new FileSystemResource(this.urlResource.getFile()), ResourceUtils::isFileBasedResource, true);
     }
 
     private void assertResource(Resource resource, Function<Resource, Boolean> isFunction, boolean expected) {

From 285e49e14860626fb2b37c1be773abe756a104b8 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 17:07:08 +0800
Subject: [PATCH 115/157] Polish #34 : Refactor ResourcePropertySourceLoader

---
 .../annotation/ResourcePropertySourceLoader.java       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceLoader.java
index 48c7cb49..9e15a342 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceLoader.java
@@ -27,7 +27,6 @@
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.FileUrlResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -41,6 +40,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.spring.core.io.ResourceUtils.isFileBasedResource;
+
 /**
  * The {@link PropertySourceExtensionLoader} Class for {@link ResourcePropertySource}
  *
@@ -82,7 +83,7 @@ protected void configureResourcePropertySourcesRefresher(PropertySourceExtension
         for (int i = 0; i < size; i++) {
             PropertySourceResource propertySourceResource = propertySourceResources.get(i);
             Resource resource = propertySourceResource.getResource();
-            if (isFileSystemBasedResource(resource)) {
+            if (isFileBasedResource(resource)) {
                 File resourceFile = resource.getFile();
                 listenerAdapter.register(resourceFile, propertySourceResource.getResourceValue());
                 fileWatchService.watch(resourceFile, listenerAdapter, FileChangedEvent.Kind.MODIFIED);
@@ -159,11 +160,6 @@ public void onFileModified(FileChangedEvent event) {
         }
     }
 
-    private boolean isFileSystemBasedResource(Resource resource) {
-        return resource instanceof FileSystemResource ||
-                resource instanceof FileUrlResource;
-    }
-
     @Override
     public void destroy() throws Exception {
         if (fileWatchService != null) {

From 0818ed94dd8aecc87949b143231996d8890e5478 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 17:07:51 +0800
Subject: [PATCH 116/157] Polish #34 : Refactor
 DependencyAnalysisBeanFactoryListener

---
 .../context/event/DependencyAnalysisBeanFactoryListener.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index dc5a3b10..e5d91d18 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -52,13 +52,14 @@
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.reflect.TypeUtils.isParameterizedType;
 import static io.microsphere.reflect.TypeUtils.resolveActualTypeArgumentClasses;
+import static io.microsphere.spring.core.MethodParameterUtils.forParameter;
 import static io.microsphere.util.ArrayUtils.EMPTY_PARAMETER_ARRAY;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
-import static org.springframework.core.MethodParameter.forParameter;
+
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**

From 76a6b9b665b0685f1a31f1a824da1e5f9e61da79 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 17:11:57 +0800
Subject: [PATCH 117/157] Polish #34 : Refactor DelegatingFactoryBean

---
 .../spring/beans/factory/DelegatingFactoryBean.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
index aad63a8b..a940f426 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
@@ -42,9 +42,16 @@ public class DelegatingFactoryBean implements FactoryBean<Object>, InitializingB
 
     private final Class<?> objectType;
 
+    private final boolean singleton;
+
     public DelegatingFactoryBean(Object delegate) {
+        this(delegate, true);
+    }
+
+    public DelegatingFactoryBean(Object delegate, boolean singleton) {
         this.delegate = delegate;
         this.objectType = delegate.getClass();
+        this.singleton = singleton;
     }
 
     @Override
@@ -72,6 +79,11 @@ public void setBeanName(String name) {
         invokeBeanNameAware(delegate, name);
     }
 
+    @Override
+    public boolean isSingleton() {
+        return singleton;
+    }
+
     @Override
     public void destroy() throws Exception {
         if (delegate instanceof DisposableBean) {

From 9c3feb7fbf95b34a236cd4048555314540a8464c Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 18:49:06 +0800
Subject: [PATCH 118/157] Update DelegatingFactoryBean.java

---
 .../spring/beans/factory/DelegatingFactoryBean.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
index a940f426..71e0c620 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java
@@ -27,6 +27,7 @@
 import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
 import static io.microsphere.spring.beans.BeanUtils.invokeBeanNameAware;
 import static io.microsphere.spring.beans.BeanUtils.invokeInitializingBean;
+import static org.springframework.aop.support.AopUtils.getTargetClass;
 
 /**
  * {@link FactoryBean} implementation based on delegate object that was instantiated
@@ -50,7 +51,7 @@ public DelegatingFactoryBean(Object delegate) {
 
     public DelegatingFactoryBean(Object delegate, boolean singleton) {
         this.delegate = delegate;
-        this.objectType = delegate.getClass();
+        this.objectType = getTargetClass(delegate);
         this.singleton = singleton;
     }
 

From f47ec8046c67712ddad24a55a915cf52ba89a942 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 18:49:28 +0800
Subject: [PATCH 119/157] Update AbstractInjectionPointDependencyResolver.java

---
 .../beans/factory/AbstractInjectionPointDependencyResolver.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
index 46e1cafb..1bc246d0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/AbstractInjectionPointDependencyResolver.java
@@ -19,7 +19,6 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.filter.ResolvableDependencyTypeFilter;
-import io.microsphere.spring.core.MethodParameterUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;

From 5770e4a6e53de3826f9735fb22536fe12a0f4226 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 18:49:31 +0800
Subject: [PATCH 120/157] Update DependencyAnalysisBeanFactoryListener.java

---
 .../context/event/DependencyAnalysisBeanFactoryListener.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index e5d91d18..9afac0da 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -59,7 +59,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
-
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**

From d8fcfbd84ad6da705d6a26b0cd606046b38ee194 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 22:19:30 +0800
Subject: [PATCH 121/157] Polish #34 : Refactor BeanDefinitionUtils

---
 .../factory/config/BeanDefinitionUtils.java   | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index 9ff3f92d..8547830a 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.beans.factory.config;
 
+import io.microsphere.logging.Logger;
 import io.microsphere.util.BaseUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -31,9 +32,11 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
+import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.util.ArrayUtils.EMPTY_OBJECT_ARRAY;
 import static io.microsphere.util.ArrayUtils.length;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
@@ -56,6 +59,8 @@
  */
 public abstract class BeanDefinitionUtils extends BaseUtils {
 
+    private static final Logger logger = getLogger(BeanDefinitionUtils.class);
+
     /**
      * The name of getResolvableType() method.
      *
@@ -66,8 +71,41 @@ public abstract class BeanDefinitionUtils extends BaseUtils {
      */
     private static final String GET_RESOLVABLE_TYPE_METHOD_NAME = "getResolvableType";
 
+    /**
+     * The method name of {@linkplain AbstractBeanDefinition#setInstanceSupplier(Supplier)}
+     *
+     * @since Spring Framework 5.0
+     */
+    private static final String SET_INSTANCE_SUPPLIER_METHOD_NAME = "setInstanceSupplier";
+
+    /**
+     * The method name of {@linkplain AbstractBeanDefinition#getInstanceSupplier()}
+     *
+     * @since Spring Framework 5.0
+     */
+    private static final String GET_INSTANCE_SUPPLIER_METHOD_NAME = "getInstanceSupplier";
+
+    /**
+     * The {@link MethodHandle} of {@linkplain RootBeanDefinition#getResolvableType()}
+     *
+     * @since Spring Framework 5.1
+     */
     private static final MethodHandle GET_RESOLVABLE_TYPE_METHOD_HANDLE = findVirtual(RootBeanDefinition.class, GET_RESOLVABLE_TYPE_METHOD_NAME);
 
+    /**
+     * The {@link MethodHandle} of {@linkplain AbstractBeanDefinition#setInstanceSupplier(Supplier)}
+     *
+     * @since Spring Framework 5.0
+     */
+    private static final MethodHandle SET_INSTANCE_SUPPLIER_METHOD_HANDLE = findVirtual(AbstractBeanDefinition.class, SET_INSTANCE_SUPPLIER_METHOD_NAME, Supplier.class);
+
+    /**
+     * The {@link MethodHandle} of {@linkplain AbstractBeanDefinition#getInstanceSupplier()}
+     *
+     * @since Spring Framework 5.0
+     */
+    private static final MethodHandle GET_INSTANCE_SUPPLIER_METHOD_HANDLE = findVirtual(AbstractBeanDefinition.class, GET_INSTANCE_SUPPLIER_METHOD_NAME);
+
     /**
      * Build a generic instance of {@link AbstractBeanDefinition}
      *
@@ -196,6 +234,82 @@ public static ResolvableType getResolvableType(AbstractBeanDefinition beanDefini
         return doGetResolvableType(beanDefinition);
     }
 
+    /**
+     * Determine whether the {@link AbstractBeanDefinition#setInstanceSupplier(Supplier)} method is present
+     *
+     * @return <code>true</code> if the {@link AbstractBeanDefinition#setInstanceSupplier(Supplier)} method is present,
+     * <code>false</code> otherwise
+     * @see #SET_INSTANCE_SUPPLIER_METHOD_HANDLE
+     */
+    public static boolean isSetInstanceSupplierMethodPresent() {
+        return SET_INSTANCE_SUPPLIER_METHOD_HANDLE != null;
+    }
+
+    /**
+     * Determine whether the {@link AbstractBeanDefinition#getInstanceSupplier()} method is present
+     *
+     * @return <code>true</code> if the {@link AbstractBeanDefinition#getInstanceSupplier()} method is present,
+     * <code>false</code> otherwise
+     * @see #GET_INSTANCE_SUPPLIER_METHOD_HANDLE
+     */
+    public static boolean isGetInstanceSupplierMethodPresent() {
+        return GET_INSTANCE_SUPPLIER_METHOD_HANDLE != null;
+    }
+
+    /**
+     * Determine whether the {@link AbstractBeanDefinition#getResolvableType()} method is present
+     *
+     * @return <code>true</code> if the {@link AbstractBeanDefinition#getResolvableType()} method is present,
+     * <code>false</code> otherwise
+     * @see #GET_RESOLVABLE_TYPE_METHOD_HANDLE
+     */
+    public static boolean isGetResolvableTypeMethodPresent() {
+        return GET_RESOLVABLE_TYPE_METHOD_HANDLE != null;
+    }
+
+    /**
+     * Set the {@link Supplier} reference of bean instance for {@link AbstractBeanDefinition}
+     *
+     * @param beanDefinition   {@link AbstractBeanDefinition}
+     * @param instanceSupplier {@link Supplier} for bean instance
+     * @return <code>true</code> if set successfully, <code>false</code> otherwise
+     */
+    public static boolean setInstanceSupplier(AbstractBeanDefinition beanDefinition, @Nullable Supplier<?> instanceSupplier) {
+        if (instanceSupplier == null || SET_INSTANCE_SUPPLIER_METHOD_HANDLE == null) {
+            return false;
+        }
+        try {
+            SET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition, instanceSupplier);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("It's failed to invokeExact on {}", SET_INSTANCE_SUPPLIER_METHOD_HANDLE, e);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get the {@link Supplier} reference of bean instance for {@link AbstractBeanDefinition}
+     *
+     * @param beanDefinition {@link AbstractBeanDefinition}
+     * @return <code>null</code> if not found
+     */
+    @Nullable
+    public static Supplier<?> getInstanceSupplier(AbstractBeanDefinition beanDefinition) {
+        if (GET_INSTANCE_SUPPLIER_METHOD_HANDLE == null) {
+            return null;
+        }
+        Supplier<?> supplier = null;
+        try {
+            supplier = (Supplier<?>) GET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("It's failed to invokeExact on {}", GET_INSTANCE_SUPPLIER_METHOD_HANDLE, e);
+            }
+        }
+        return supplier;
+    }
+
     /**
      * Compatible with {@link RootBeanDefinition#getResolvableType()) since Spring Framework 5.1
      *

From 0f3bdbb263ff7bc79345f51bcdcfc9422d37336e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 22:19:42 +0800
Subject: [PATCH 122/157] Polish #34 : Add BeanDefinitionUtilsTest

---
 .../config/BeanDefinitionUtilsTest.java       | 145 +++++++++++++++++-
 1 file changed, 144 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index 493ad013..c11b8bc3 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -17,14 +17,45 @@
 package io.microsphere.spring.beans.factory.config;
 
 import io.microsphere.spring.util.User;
+import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Role;
+import org.springframework.core.ResolvableType;
+import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.findInfrastructureBeanNames;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.genericBeanDefinition;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getInstanceSupplier;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getResolvableType;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.isGetInstanceSupplierMethodPresent;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.isGetResolvableTypeMethodPresent;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.isInfrastructureBean;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.isSetInstanceSupplierMethodPresent;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.resolveBeanType;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.setInstanceSupplier;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtilsTest.BEAN_NAME;
+import static io.microsphere.spring.core.SpringVersion.CURRENT;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_0;
+import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
+import static org.springframework.core.ResolvableType.forClass;
 
 /**
  * {@link BeanDefinitionUtils} Test
@@ -33,8 +64,26 @@
  * @see BeanDefinitionUtils
  * @since 1.0.0
  */
+@Component(BEAN_NAME)
 public class BeanDefinitionUtilsTest {
 
+    private static final boolean isGESpring5 = CURRENT.gt(SPRING_5_0);
+
+    private static final boolean isGESpring5_1 = CURRENT.gt(SPRING_5_1);
+
+    private static final String USER_BEAN_NAME = "user";
+
+    private static final String USERS_BEAN_NAME = "users";
+
+    static final String BEAN_NAME = "beanDefinitionUtilsTest";
+
+    private AbstractBeanDefinition beanDefinition;
+
+    @Before
+    public void init() {
+        this.beanDefinition = genericBeanDefinition(User.class);
+    }
+
     /**
      * Test methods:
      * <ul>
@@ -45,7 +94,7 @@ public class BeanDefinitionUtilsTest {
      */
     @Test
     public void testGenericBeanDefinition() {
-        AbstractBeanDefinition beanDefinition = genericBeanDefinition(User.class);
+        AbstractBeanDefinition beanDefinition = this.beanDefinition;
         assertBeanDefinition(beanDefinition, ROLE_APPLICATION);
 
         beanDefinition = genericBeanDefinition(User.class, ROLE_INFRASTRUCTURE);
@@ -59,6 +108,83 @@ public void testGenericBeanDefinition() {
 
     }
 
+    @Test
+    public void testResolveBeanType() {
+        testInSpringContainer((context, beanFactory) -> {
+            RootBeanDefinition beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(USER_BEAN_NAME);
+            assertEquals(User.class, resolveBeanType(beanDefinition, context.getClassLoader()));
+            assertEquals(User.class, resolveBeanType(beanDefinition));
+
+            beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(USERS_BEAN_NAME);
+            assertEquals(List.class, resolveBeanType(beanDefinition));
+
+            beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(BEAN_NAME);
+            assertEquals(this.getClass(), resolveBeanType(beanDefinition));
+        });
+    }
+
+    @Test
+    public void testFindInfrastructureBeanNames() {
+        testInSpringContainer((context, beanFactory) -> {
+            Set<String> infrastructureBeanNames = findInfrastructureBeanNames(beanFactory);
+            assertTrue(infrastructureBeanNames.contains(USER_BEAN_NAME));
+            assertFalse(infrastructureBeanNames.contains(USERS_BEAN_NAME));
+        });
+    }
+
+    @Test
+    public void testGetResolvableType() {
+        testInSpringContainer((context, beanFactory) -> {
+            RootBeanDefinition beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(USER_BEAN_NAME);
+            ResolvableType resolvableType = getResolvableType(beanDefinition);
+            assertEquals(User.class, resolvableType.getRawClass());
+
+            beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(USERS_BEAN_NAME);
+            resolvableType = getResolvableType(beanDefinition);
+            assertEquals(List.class, resolvableType.getRawClass());
+            assertEquals(User.class, resolvableType.getGeneric(0).getRawClass());
+
+            beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(BEAN_NAME);
+            resolvableType = getResolvableType(beanDefinition);
+            assertEquals(getClass(), resolvableType.getRawClass());
+        });
+    }
+
+
+    @Test
+    public void testIsInfrastructureBean() {
+        AbstractBeanDefinition beanDefinition = this.beanDefinition;
+        assertFalse(isInfrastructureBean(beanDefinition));
+
+        beanDefinition.setRole(ROLE_INFRASTRUCTURE);
+        assertTrue(isInfrastructureBean(beanDefinition));
+    }
+
+    @Test
+    public void testMethodsPresent() {
+        assertEquals(isGESpring5, isSetInstanceSupplierMethodPresent());
+        assertEquals(isGESpring5, isGetInstanceSupplierMethodPresent());
+
+        assertEquals(isGESpring5_1, isGetResolvableTypeMethodPresent());
+    }
+
+    @Test
+    public void testSetAndGetInstanceSupplier() {
+        AbstractBeanDefinition beanDefinition = this.beanDefinition;
+
+        User user = new User();
+
+        // setInstanceSupplier
+        assertFalse(setInstanceSupplier(beanDefinition, null));
+        assertEquals(isGESpring5, setInstanceSupplier(beanDefinition, () -> null));
+        assertEquals(isGESpring5, setInstanceSupplier(beanDefinition, () -> user));
+
+        // getInstanceSupplier
+        Supplier<?> instanceSupplier = getInstanceSupplier(beanDefinition);
+        Object instance = instanceSupplier == null ? null : instanceSupplier.get();
+        assertEquals(isGESpring5 ? user : null, instance);
+    }
+
     private void assertBeanDefinition(AbstractBeanDefinition beanDefinition, int role, Object... constructorArguments) {
         ConstructorArgumentValues argumentValues = beanDefinition.getConstructorArgumentValues();
         assertEquals(role, beanDefinition.getRole());
@@ -69,4 +195,21 @@ private void assertBeanDefinition(AbstractBeanDefinition beanDefinition, int rol
             assertEquals(constructorArguments[i], argumentValue.getValue());
         }
     }
+
+    @Bean(name = USER_BEAN_NAME)
+    @Role(ROLE_INFRASTRUCTURE)
+    public User user() {
+        return new User();
+    }
+
+    @Bean(name = USERS_BEAN_NAME)
+    public List<User> users() {
+        return Arrays.asList(new User());
+    }
+
+    private void testInSpringContainer(BiConsumer<ConfigurableApplicationContext, ConfigurableListableBeanFactory> contextConsumer) {
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(this.getClass());
+        contextConsumer.accept(context, context.getBeanFactory());
+        context.close();
+    }
 }

From 1790aefc22363a2dd2eb3f17abaf2b7ed797764e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 26 Dec 2024 22:54:28 +0800
Subject: [PATCH 123/157] Polish #34 : Refactor BeanRegistrar

---
 .../beans/factory/support/BeanRegistrar.java  | 11 ++-
 .../factory/support/BeanRegistrarTest.java    | 75 ++++++++++++++++++-
 2 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
index 20732511..88a2a05b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
@@ -19,6 +19,7 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.DelegatingFactoryBean;
+import io.microsphere.spring.beans.factory.config.BeanDefinitionUtils;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -31,6 +32,7 @@
 import java.util.List;
 
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.genericBeanDefinition;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.setInstanceSupplier;
 import static java.beans.Introspector.decapitalize;
 import static java.lang.String.format;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
@@ -246,8 +248,11 @@ public static void registerBean(BeanDefinitionRegistry registry, String beanName
     public static void registerBean(BeanDefinitionRegistry registry, String beanName, Object bean, boolean primary) {
         Class beanClass = AopUtils.getTargetClass(bean);
         AbstractBeanDefinition beanDefinition = genericBeanDefinition(beanClass);
-        beanDefinition.setInstanceSupplier(() -> bean);
-        beanDefinition.setPrimary(primary);
-        registerBeanDefinition(registry, beanName, beanDefinition);
+        if (setInstanceSupplier(beanDefinition, () -> bean)) {
+            beanDefinition.setPrimary(primary);
+            registerBeanDefinition(registry, beanName, beanDefinition);
+        } else {
+            registerFactoryBean(registry, beanName, bean, primary);
+        }
     }
 }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
index 99ed146b..3016150b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
@@ -16,18 +16,32 @@
  */
 package io.microsphere.spring.beans.factory.support;
 
+import io.microsphere.spring.test.Bean;
+import io.microsphere.spring.test.TestBean;
+import io.microsphere.spring.test.TestBean2;
 import io.microsphere.spring.util.User;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
+import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.hasAlias;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerFactoryBean;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSingleton;
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSpringFactoriesBeans;
+import static java.beans.Introspector.decapitalize;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 
@@ -43,8 +57,13 @@ public class BeanRegistrarTest {
     private DefaultListableBeanFactory beanFactory;
 
     @Before
-    public void before() {
-        beanFactory = new DefaultListableBeanFactory();
+    public void init() {
+        this.beanFactory = new DefaultListableBeanFactory();
+    }
+
+    @After
+    public void destroy() {
+        this.beanFactory.destroySingletons();
     }
 
     @Test
@@ -59,6 +78,58 @@ public void testRegisterBeanDefinition() {
         assertBeanDefinitions(() -> registerBeanDefinition(beanFactory, User.class), true, ROLE_APPLICATION, "io.microsphere.spring.util.User#0", "io.microsphere.spring.util.User#1");
     }
 
+    @Test
+    public void testRegisterSingleton() {
+        registerUserAsSingleton();
+    }
+
+    @Test
+    public void testHasAlias() {
+        String beanName = registerUserAsSingleton();
+        String alias = "test-user";
+        assertFalse(hasAlias(beanFactory, beanName, alias));
+
+        beanFactory.registerAlias(beanName, alias);
+        assertTrue(hasAlias(beanFactory, beanName, alias));
+    }
+
+    @Test
+    public void testRegisterSpringFactoriesBeans() {
+        int beansCount = registerSpringFactoriesBeans(this.beanFactory, Bean.class);
+        assertEquals(2, beansCount);
+        assertTrue(this.beanFactory.containsBean(decapitalize(TestBean.class.getSimpleName())));
+        assertTrue(this.beanFactory.containsBean(decapitalize(TestBean2.class.getSimpleName())));
+    }
+
+    @Test
+    public void testRegisterFactoryBean() {
+        testRegisterBean((beanName, bean) -> registerFactoryBean(this.beanFactory, beanName, bean));
+    }
+
+    @Test
+    public void testRegisterBean() {
+        testRegisterBean((beanName, bean) -> registerBean(this.beanFactory, beanName, bean));
+    }
+
+    private void testRegisterBean(BiConsumer<String, Object> beanConsumer) {
+        String beanName = "testBean";
+        TestBean testBean = new TestBean();
+        assertNull(testBean.getBeanName());
+        beanConsumer.accept(beanName, testBean);
+        TestBean bean = this.beanFactory.getBean(beanName, TestBean.class);
+        assertEquals(beanName, bean.getBeanName());
+        assertEquals(bean.getBeanName(), testBean.getBeanName());
+        assertEquals(testBean, bean);
+    }
+
+    private String registerUserAsSingleton() {
+        String beanName = "user";
+        User user = new User();
+        registerSingleton(beanFactory, beanName, user);
+        assertEquals(user, beanFactory.getBean(beanName));
+        return beanName;
+    }
+
     private void assertBeanDefinitions(Supplier<Boolean> booleanSupplier, boolean expectedRegistered, int role, String... expectedBeanNames) {
         boolean registered = booleanSupplier.get();
 

From 29be11f9a59067e1e9ef3ba51af8002f97c91bc4 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:02:17 +0800
Subject: [PATCH 124/157] Polish #34 : DefaultBeanDependencyResolver

---
 .../beans/factory/DefaultBeanDependencyResolver.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
index e456d037..8b451821 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DefaultBeanDependencyResolver.java
@@ -52,12 +52,14 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.collection.MapUtils.newHashMap;
 import static io.microsphere.collection.MapUtils.ofEntry;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.reflect.MemberUtils.isStatic;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getInstanceSupplier;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getResolvableType;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.resolveBeanType;
 import static io.microsphere.util.ClassLoaderUtils.loadClass;
@@ -584,9 +586,11 @@ private Map<String, RootBeanDefinition> getEligibleBeanDefinitionsMap(DefaultLis
      * @return <code>true</code> if the given {@link BeanDefinition} must be
      */
     private RootBeanDefinition getEligibleBeanDefinition(BeanDefinition beanDefinition) {
-        if (beanDefinition != null && !beanDefinition.isAbstract() && beanDefinition.isSingleton() && !beanDefinition.isLazyInit() && beanDefinition instanceof RootBeanDefinition) {
+        if (beanDefinition != null && !beanDefinition.isAbstract() && beanDefinition.isSingleton()
+                && !beanDefinition.isLazyInit() && beanDefinition instanceof RootBeanDefinition) {
             RootBeanDefinition rootBeanDefinition = (RootBeanDefinition) beanDefinition;
-            return rootBeanDefinition.getInstanceSupplier() == null ? rootBeanDefinition : null;
+            Supplier<?> instanceSupplier = getInstanceSupplier(rootBeanDefinition);
+            return instanceSupplier == null ? rootBeanDefinition : null;
         }
         return null;
     }

From 0c3bd3d773873ed98de9b8ec3f9d92ffc7f9d2fe Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:03:26 +0800
Subject: [PATCH 125/157] Polish #34 :
 InstantiationAwareBeanPostProcessorAdapter

---
 ...ntiationAwareBeanPostProcessorAdapter.java | 136 ++++--------------
 1 file changed, 28 insertions(+), 108 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
index 88d383f6..6f20f2dc 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
@@ -19,11 +19,9 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
 
-import javax.annotation.Nullable;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
 
@@ -40,138 +38,55 @@
  */
 public abstract class InstantiationAwareBeanPostProcessorAdapter implements SmartInstantiationAwareBeanPostProcessor {
 
-    @Nullable
+    /**
+     * {@inheritDoc}
+     */
     public Class<?> predictBeanType(Class<?> beanClass, String beanName) throws BeansException {
         return null;
     }
 
     /**
-     * Determine the type of the bean to be eventually returned from this
-     * processor's {@link #postProcessBeforeInstantiation} callback.
-     * <p>The default implementation returns the given bean class as-is.
-     * Specific implementations should fully evaluate their processing steps
-     * in order to create/initialize a potential proxy class upfront.
+     * {@inheritDoc}
      *
-     * @param beanClass the raw class of the bean
-     * @param beanName  the name of the bean
-     * @return the type of the bean (never {@code null})
-     * @throws org.springframework.beans.BeansException in case of errors
-     * @since 6.0
+     * @since Spring Framework 6.0
      */
     public Class<?> determineBeanType(Class<?> beanClass, String beanName) throws BeansException {
         return beanClass;
     }
 
     /**
-     * Determine the candidate constructors to use for the given bean.
-     * <p>The default implementation returns {@code null}.
-     *
-     * @param beanClass the raw class of the bean (never {@code null})
-     * @param beanName  the name of the bean
-     * @return the candidate constructors, or {@code null} if none specified
-     * @throws org.springframework.beans.BeansException in case of errors
+     * {@inheritDoc}
      */
-    @Nullable
     public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName)
             throws BeansException {
         return null;
     }
 
     /**
-     * Obtain a reference for early access to the specified bean,
-     * typically for the purpose of resolving a circular reference.
-     * <p>This callback gives post-processors a chance to expose a wrapper
-     * early - that is, before the target bean instance is fully initialized.
-     * The exposed object should be equivalent to the what
-     * {@link #postProcessBeforeInitialization} / {@link #postProcessAfterInitialization}
-     * would expose otherwise. Note that the object returned by this method will
-     * be used as bean reference unless the post-processor returns a different
-     * wrapper from said post-process callbacks. In other words: Those post-process
-     * callbacks may either eventually expose the same reference or alternatively
-     * return the raw bean instance from those subsequent callbacks (if the wrapper
-     * for the affected bean has been built for a call to this method already,
-     * it will be exposes as final bean reference by default).
-     * <p>The default implementation returns the given {@code bean} as-is.
-     *
-     * @param bean     the raw bean instance
-     * @param beanName the name of the bean
-     * @return the object to expose as bean reference
-     * (typically with the passed-in bean instance as default)
-     * @throws org.springframework.beans.BeansException in case of errors
+     * {@inheritDoc}
      */
     public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
         return bean;
     }
 
     /**
-     * Apply this BeanPostProcessor <i>before the target bean gets instantiated</i>.
-     * The returned bean object may be a proxy to use instead of the target bean,
-     * effectively suppressing default instantiation of the target bean.
-     * <p>If a non-null object is returned by this method, the bean creation process
-     * will be short-circuited. The only further processing applied is the
-     * {@link #postProcessAfterInitialization} callback from the configured
-     * {@link BeanPostProcessor BeanPostProcessors}.
-     * <p>This callback will be applied to bean definitions with their bean class,
-     * as well as to factory-method definitions in which case the returned bean type
-     * will be passed in here.
-     * <p>Post-processors may implement the extended
-     * {@link SmartInstantiationAwareBeanPostProcessor} interface in order
-     * to predict the type of the bean object that they are going to return here.
-     * <p>The default implementation returns {@code null}.
-     *
-     * @param beanClass the class of the bean to be instantiated
-     * @param beanName  the name of the bean
-     * @return the bean object to expose instead of a default instance of the target bean,
-     * or {@code null} to proceed with default instantiation
-     * @throws org.springframework.beans.BeansException in case of errors
-     * @see #postProcessAfterInstantiation
-     * @see org.springframework.beans.factory.support.AbstractBeanDefinition#getBeanClass()
-     * @see org.springframework.beans.factory.support.AbstractBeanDefinition#getFactoryMethodName()
+     * {@inheritDoc}
      */
-    @Nullable
     public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
         return null;
     }
 
     /**
-     * Perform operations after the bean has been instantiated, via a constructor or factory method,
-     * but before Spring property population (from explicit properties or autowiring) occurs.
-     * <p>This is the ideal callback for performing custom field injection on the given bean
-     * instance, right before Spring's autowiring kicks in.
-     * <p>The default implementation returns {@code true}.
-     *
-     * @param bean     the bean instance created, with properties not having been set yet
-     * @param beanName the name of the bean
-     * @return {@code true} if properties should be set on the bean; {@code false}
-     * if property population should be skipped. Normal implementations should return {@code true}.
-     * Returning {@code false} will also prevent any subsequent InstantiationAwareBeanPostProcessor
-     * instances being invoked on this bean instance.
-     * @throws org.springframework.beans.BeansException in case of errors
-     * @see #postProcessBeforeInstantiation
+     * {@inheritDoc}
      */
     public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException {
         return true;
     }
 
     /**
-     * Post-process the given property values before the factory applies them
-     * to the given bean. Allows for checking whether all dependencies have been
-     * satisfied, for example based on a "Required" annotation on bean property setters.
-     * <p>Also allows for replacing the property values to apply, typically through
-     * creating a new MutablePropertyValues instance based on the original PropertyValues,
-     * adding or removing specific values.
-     * <p>The default implementation returns the given {@code pvs} as-is.
-     * @param pvs the property values that the factory is about to apply (never {@code null})
-     * @param pds the relevant property descriptors for the target bean (with ignored
-     * dependency types - which the factory handles specifically - already filtered out)
-     * @param bean the bean instance created, but whose properties have not yet been set
-     * @param beanName the name of the bean
-     * @return the actual property values to apply to the given bean (can be the passed-in
-     * PropertyValues instance), or {@code null} to skip property population
-     * @throws org.springframework.beans.BeansException in case of errors
-     * @see #postProcessProperties
-     * @see org.springframework.beans.MutablePropertyValues
-     * @deprecated as of 5.1, in favor of {@link #postProcessProperties(PropertyValues, Object, String)}
+     * {@inheritDoc}
+     *
+     * @deprecated as of Spring Framework 5.1, in favor of {@link #postProcessProperties(PropertyValues, Object, String)}
      */
     public PropertyValues postProcessPropertyValues(
             PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeanCreationException {
@@ -179,22 +94,27 @@ public PropertyValues postProcessPropertyValues(
     }
 
     /**
-     * Post-process the given property values before the factory applies them
-     * to the given bean.
-     * <p>The default implementation returns the given {@code pvs} as-is.
+     * {@inheritDoc}
      *
-     * @param pvs      the property values that the factory is about to apply (never {@code null})
-     * @param bean     the bean instance created, but whose properties have not yet been set
-     * @param beanName the name of the bean
-     * @return the actual property values to apply to the given bean (can be the passed-in
-     * PropertyValues instance), or {@code null} to skip property population
-     * @throws org.springframework.beans.BeansException in case of errors
-     * @since 5.1
+     * @since Spring Framework 5.1
      */
-    @Nullable
     public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, String beanName)
             throws BeansException {
         return pvs;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+        return bean;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        return bean;
+    }
+
 }

From cffbcf36e987113388514bffebe5f85e7dca2954 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:46:10 +0800
Subject: [PATCH 126/157] Update BeanRegistrar.java

---
 .../microsphere/spring/beans/factory/support/BeanRegistrar.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
index 88a2a05b..0ee030f1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
@@ -19,7 +19,6 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.beans.factory.DelegatingFactoryBean;
-import io.microsphere.spring.beans.factory.config.BeanDefinitionUtils;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;

From 102d03ae3148c5ac730c877a8f4af644cdb76e52 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:46:13 +0800
Subject: [PATCH 127/157] Update BeanDefinitionUtilsTest.java

---
 .../spring/beans/factory/config/BeanDefinitionUtilsTest.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index c11b8bc3..0a614b28 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -55,7 +55,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
-import static org.springframework.core.ResolvableType.forClass;
 
 /**
  * {@link BeanDefinitionUtils} Test

From 6a12dc67dba4d3ca280f5543549b821c168429cc Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:46:43 +0800
Subject: [PATCH 128/157] Polish #34 : BeanUtils

---
 .../microsphere/spring/beans/BeanUtils.java   | 115 ++++++++++--------
 .../spring/beans/BeanUtilsTest.java           |  99 +++++++--------
 2 files changed, 112 insertions(+), 102 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index 0667f606..0edeb536 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -29,29 +29,36 @@
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Nullable;
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.invoke.MethodHandleUtils.findStatic;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableBeanFactory;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.getApplicationContextAwareProcessor;
+import static io.microsphere.util.ArrayUtils.isEmpty;
+import static io.microsphere.util.ClassLoaderUtils.getClassLoader;
+import static io.microsphere.util.ClassLoaderUtils.isPresent;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
+import static org.springframework.aop.support.AopUtils.getTargetClass;
 import static org.springframework.beans.factory.BeanFactoryUtils.beanNamesForTypeIncludingAncestors;
 import static org.springframework.beans.factory.BeanFactoryUtils.beanOfTypeIncludingAncestors;
 import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.generateBeanName;
+import static org.springframework.util.ClassUtils.resolveClassName;
+import static org.springframework.util.StringUtils.hasText;
 
 /**
  * Bean Utilities Class
@@ -67,6 +74,13 @@ public abstract class BeanUtils extends BaseUtils {
 
     private static final Class<?> APPLICATION_STARTUP_CLASS = resolveClass("org.springframework.core.metrics.ApplicationStartup");
 
+    /**
+     * The {@link MethodHandle} of {@linkplain org.springframework.beans.BeanUtils#findPrimaryConstructor(Class)}
+     *
+     * @since Spring Framework 5.0
+     */
+    private static final MethodHandle FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE = findStatic(org.springframework.beans.BeanUtils.class, "findPrimaryConstructor", Class.class);
+
     /**
      * Is Bean Present or not?
      *
@@ -87,11 +101,19 @@ public static boolean isBeanPresent(ListableBeanFactory beanFactory, Class<?> be
      * @return If present , return <code>true</code> , or <code>false</code>
      */
     public static boolean isBeanPresent(ListableBeanFactory beanFactory, Class<?> beanClass, boolean includingAncestors) {
-
         String[] beanNames = getBeanNames(beanFactory, beanClass, includingAncestors);
-
         return !ObjectUtils.isEmpty(beanNames);
+    }
 
+    /**
+     * Is Bean Present or not?
+     *
+     * @param beanFactory   {@link ListableBeanFactory}
+     * @param beanClassName The  name of {@link Class} of Bean
+     * @return If present , return <code>true</code> , or <code>false</code>
+     */
+    public static boolean isBeanPresent(ListableBeanFactory beanFactory, String beanClassName) {
+        return isBeanPresent(beanFactory, beanClassName, false);
     }
 
     /**
@@ -103,35 +125,21 @@ public static boolean isBeanPresent(ListableBeanFactory beanFactory, Class<?> be
      * @return If present , return <code>true</code> , or <code>false</code>
      */
     public static boolean isBeanPresent(ListableBeanFactory beanFactory, String beanClassName, boolean includingAncestors) {
-
         boolean present = false;
-
-        ClassLoader classLoader = beanFactory.getClass().getClassLoader();
-
-        if (ClassUtils.isPresent(beanClassName, classLoader)) {
-
-            Class beanClass = ClassUtils.resolveClassName(beanClassName, classLoader);
-
+        ClassLoader classLoader = null;
+        if (beanFactory instanceof ConfigurableBeanFactory) {
+            ConfigurableBeanFactory configurableBeanFactory = (ConfigurableBeanFactory) beanFactory;
+            classLoader = configurableBeanFactory.getBeanClassLoader();
+        } else {
+            classLoader = getClassLoader(beanFactory.getClass());
+        }
+        if (isPresent(beanClassName, classLoader)) {
+            Class beanClass = resolveClassName(beanClassName, classLoader);
             present = isBeanPresent(beanFactory, beanClass, includingAncestors);
         }
-
-
         return present;
-
     }
 
-    /**
-     * Is Bean Present or not?
-     *
-     * @param beanFactory   {@link ListableBeanFactory}
-     * @param beanClassName The  name of {@link Class} of Bean
-     * @return If present , return <code>true</code> , or <code>false</code>
-     */
-    public static boolean isBeanPresent(ListableBeanFactory beanFactory, String beanClassName) {
-
-        return isBeanPresent(beanFactory, beanClassName, false);
-
-    }
 
     /**
      * Is Bean Present or not by the specified name and class
@@ -140,7 +148,6 @@ public static boolean isBeanPresent(ListableBeanFactory beanFactory, String bean
      * @param beanName    The bean name
      * @param beanClass   The bean class
      * @return If present , return <code>true</code> , or <code>false</code>
-     * @since 1.0.0
      */
     public static boolean isBeanPresent(BeanFactory beanFactory, String beanName, Class<?> beanClass) throws NullPointerException {
         return beanFactory.containsBean(beanName) && beanFactory.isTypeMatch(beanName, beanClass);
@@ -206,29 +213,20 @@ public static String[] getBeanNames(ConfigurableListableBeanFactory beanFactory,
      * @return Bean type if can be resolved , or return <code>null</code>.
      */
     public static Class<?> resolveBeanType(String beanClassName, ClassLoader classLoader) {
-
-        if (!StringUtils.hasText(beanClassName)) {
+        if (!hasText(beanClassName)) {
             return null;
         }
 
         Class<?> beanType = null;
-
         try {
-
-            beanType = ClassUtils.resolveClassName(beanClassName, classLoader);
-
-            beanType = ClassUtils.getUserClass(beanType);
-
+            beanType = resolveClassName(beanClassName, classLoader);
+            beanType = getTargetClass(beanType);
         } catch (Exception e) {
-
             if (logger.isErrorEnabled()) {
                 logger.error(e.getMessage(), e);
             }
-
         }
-
         return beanType;
-
     }
 
     /**
@@ -243,10 +241,8 @@ public static Class<?> resolveBeanType(String beanClassName, ClassLoader classLo
      * @see BeanFactoryUtils#beanOfTypeIncludingAncestors(ListableBeanFactory, Class)
      */
     public static <T> T getOptionalBean(ListableBeanFactory beanFactory, Class<T> beanClass, boolean includingAncestors) throws BeansException {
-
         String[] beanNames = getBeanNames(beanFactory, beanClass, includingAncestors);
-
-        if (ObjectUtils.isEmpty(beanNames)) {
+        if (isEmpty(beanNames)) {
             if (logger.isDebugEnabled()) {
                 logger.debug("The bean [ class : " + beanClass.getName() + " ] can't be found ");
             }
@@ -256,19 +252,14 @@ public static <T> T getOptionalBean(ListableBeanFactory beanFactory, Class<T> be
         T bean = null;
 
         try {
-
             bean = includingAncestors ? beanOfTypeIncludingAncestors(beanFactory, beanClass) : beanFactory.getBean(beanClass);
-
         } catch (Exception e) {
-
             if (logger.isErrorEnabled()) {
                 logger.error(e.getMessage(), e);
             }
-
         }
 
         return bean;
-
     }
 
     /**
@@ -281,9 +272,7 @@ public static <T> T getOptionalBean(ListableBeanFactory beanFactory, Class<T> be
      * @throws NoUniqueBeanDefinitionException if more than one bean of the given type was found
      */
     public static <T> T getOptionalBean(ListableBeanFactory beanFactory, Class<T> beanClass) throws BeansException {
-
         return getOptionalBean(beanFactory, beanClass, false);
-
     }
 
     /**
@@ -471,6 +460,32 @@ public static void invokeAwareInterfaces(Object bean, BeanFactory beanFactory, @
         }
     }
 
+    /**
+     * Return the primary constructor of the provided class. For Kotlin classes, this
+     * returns the Java constructor corresponding to the Kotlin primary constructor
+     * (as defined in the Kotlin specification). Otherwise, in particular for non-Kotlin
+     * classes, this simply returns {@code null}.
+     *
+     * @param clazz the class to check
+     * @see <a href="https://kotlinlang.org/docs/reference/classes.html#constructors">Kotlin docs</a>
+     * @see org.springframework.beans.BeanUtils#findPrimaryConstructor(Class)
+     * @since Spring Framework 5.0
+     */
+    public static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
+        if (FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE == null) {
+            return null;
+        }
+        Constructor<T> constructor = null;
+        try {
+            constructor = (Constructor<T>) FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE.invokeExact(clazz);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("It's failed to execute invokeExact on {} from the {}", FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE, clazz);
+            }
+        }
+        return constructor;
+    }
+
     /**
      * @see AbstractAutowireCapableBeanFactory#invokeAwareMethods(String, Object)
      */
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
index 82864f3d..46fe9d0d 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
@@ -15,21 +15,25 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.env.Environment;
-import org.springframework.util.ClassUtils;
 
+import java.lang.reflect.Constructor;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.spring.beans.BeanUtils.findPrimaryConstructor;
 import static io.microsphere.spring.beans.BeanUtils.getBeanIfAvailable;
 import static io.microsphere.spring.beans.BeanUtils.getBeanNames;
 import static io.microsphere.spring.beans.BeanUtils.invokeAwareInterfaces;
 import static io.microsphere.spring.beans.BeanUtils.isBeanPresent;
+import static io.microsphere.spring.beans.BeanUtils.resolveBeanType;
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.util.ClassUtils.isAssignable;
@@ -56,48 +60,55 @@ public String testString(Environment environment) {
     }
 
     @Test
-    public void testResolveBeanType() {
+    public void testIsBeanPresent() {
+
+        DefaultListableBeanFactory registry = new DefaultListableBeanFactory();
 
-        ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
+        assertFalse(isBeanPresent(registry, TestBean.class.getName(), true));
+        assertFalse(isBeanPresent(registry, TestBean.class.getName()));
 
-        Class<?> beanType = BeanUtils.resolveBeanType(this.getClass().getName(), classLoader);
+        registerBeans(registry, TestBean.class, TestBean2.class);
 
-        assertEquals(beanType, this.getClass());
 
-        beanType = BeanUtils.resolveBeanType("", classLoader);
+        assertTrue(isBeanPresent(registry, TestBean.class.getName(), true));
+        assertTrue(isBeanPresent(registry, TestBean.class.getName()));
 
-        Assert.assertNull(beanType);
+        assertTrue(isBeanPresent(registry, TestBean.class, true));
+        assertTrue(isBeanPresent(registry, TestBean.class));
 
-        beanType = BeanUtils.resolveBeanType("     ", classLoader);
+        assertTrue(isBeanPresent(registry, TestBean2.class.getName(), true));
+        assertTrue(isBeanPresent(registry, TestBean2.class.getName()));
 
-        Assert.assertNull(beanType);
+        assertTrue(isBeanPresent(registry, TestBean2.class, true));
+        assertTrue(isBeanPresent(registry, TestBean2.class));
 
-        beanType = BeanUtils.resolveBeanType("java.lang.Abc", classLoader);
+        assertFalse(isBeanPresent(registry, BeanUtils.class.getName(), true));
+        assertFalse(isBeanPresent(registry, BeanUtils.class.getName()));
 
-        Assert.assertNull(beanType);
+        assertFalse(isBeanPresent(registry, BeanUtils.class, true));
+        assertFalse(isBeanPresent(registry, BeanUtils.class));
 
+        assertTrue(isBeanPresent(registry, "testBean", TestBean.class));
+        assertTrue(isBeanPresent(registry, "testBean2", TestBean2.class));
+        assertFalse(isBeanPresent(registry, "beanUtils", BeanUtils.class));
     }
 
     @Test
     public void testGetBeanNamesOnAnnotationBean() {
 
-        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
-
-        registerBeans(applicationContext, Config.class);
-
-        applicationContext.refresh();
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config.class);
 
         String[] beanNames = getBeanNames(applicationContext, String.class);
 
         assertTrue(Arrays.asList(beanNames).contains("testString"));
 
-
+        applicationContext.close();
     }
 
     @Test
     public void testGetBeanNamesOnXmlBean() {
 
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring-context.xml"});
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring-context.xml");
 
         String[] beanNames = getBeanNames(context, User.class);
 
@@ -172,7 +183,6 @@ public void testGetBeanNames() {
 
         assertEquals("testBean", beanName);
 
-
         beanNames = getBeanNames(beanFactory, io.microsphere.spring.test.Bean.class, true);
 
         assertEquals(2, beanNames.length);
@@ -192,46 +202,26 @@ public void testGetBeanNames() {
         beanName = beanNames[0];
 
         assertEquals("testBean2", beanName);
-
-
     }
 
-
     @Test
-    public void testIsBeanPresent() {
-
-        DefaultListableBeanFactory registry = new DefaultListableBeanFactory();
-
-        assertFalse(isBeanPresent(registry, TestBean.class.getName(), true));
-        assertFalse(isBeanPresent(registry, TestBean.class.getName()));
-
-        registerBeans(registry, TestBean.class, TestBean2.class);
-
-
-        assertTrue(isBeanPresent(registry, TestBean.class.getName(), true));
-        assertTrue(isBeanPresent(registry, TestBean.class.getName()));
-
-        assertTrue(isBeanPresent(registry, TestBean.class, true));
-        assertTrue(isBeanPresent(registry, TestBean.class));
-
-        assertTrue(isBeanPresent(registry, TestBean2.class.getName(), true));
-        assertTrue(isBeanPresent(registry, TestBean2.class.getName()));
+    public void testResolveBeanType() {
+        ClassLoader classLoader = getDefaultClassLoader();
 
-        assertTrue(isBeanPresent(registry, TestBean2.class, true));
-        assertTrue(isBeanPresent(registry, TestBean2.class));
+        Class<?> beanType = resolveBeanType(this.getClass().getName(), classLoader);
+        assertEquals(beanType, this.getClass());
 
-        assertFalse(isBeanPresent(registry, BeanUtils.class.getName(), true));
-        assertFalse(isBeanPresent(registry, BeanUtils.class.getName()));
+        beanType = resolveBeanType("", classLoader);
+        assertNull(beanType);
 
-        assertFalse(isBeanPresent(registry, BeanUtils.class, true));
-        assertFalse(isBeanPresent(registry, BeanUtils.class));
-
-        assertTrue(isBeanPresent(registry, "testBean", TestBean.class));
-        assertTrue(isBeanPresent(registry, "testBean2", TestBean2.class));
-        assertFalse(isBeanPresent(registry, "beanUtils", BeanUtils.class));
+        beanType = resolveBeanType("     ", classLoader);
+        assertNull(beanType);
 
+        beanType = resolveBeanType("java.lang.Abc", classLoader);
+        assertNull(beanType);
     }
 
+
     @Test
     public void testGetOptionalBean() {
 
@@ -239,11 +229,11 @@ public void testGetOptionalBean() {
 
         TestBean testBean = BeanUtils.getOptionalBean(registry, TestBean.class, true);
 
-        Assert.assertNull(testBean);
+        assertNull(testBean);
 
         testBean = BeanUtils.getOptionalBean(registry, TestBean.class);
 
-        Assert.assertNull(testBean);
+        assertNull(testBean);
 
         registerBeans(registry, TestBean.class);
 
@@ -380,7 +370,12 @@ public void testNamingBean() {
 
         assertEquals(-1, namingBean.compareTo(namingBean2));
 
+    }
 
+    @Test
+    public void testFindPrimaryConstructor() {
+        Constructor<BeanUtilsTest> constructor = findPrimaryConstructor(BeanUtilsTest.class);
+        assertNull(constructor);
     }
 
 }

From f19bce138e693b77d2a135da14ca68d42db9364b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:48:36 +0800
Subject: [PATCH 129/157] Update BeanUtils.java

---
 .../src/main/java/io/microsphere/spring/beans/BeanUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index 0edeb536..431c725c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -51,12 +51,12 @@
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
-import static org.springframework.aop.support.AopUtils.getTargetClass;
 import static org.springframework.beans.factory.BeanFactoryUtils.beanNamesForTypeIncludingAncestors;
 import static org.springframework.beans.factory.BeanFactoryUtils.beanOfTypeIncludingAncestors;
 import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.generateBeanName;
+import static org.springframework.util.ClassUtils.getUserClass;
 import static org.springframework.util.ClassUtils.resolveClassName;
 import static org.springframework.util.StringUtils.hasText;
 
@@ -220,7 +220,7 @@ public static Class<?> resolveBeanType(String beanClassName, ClassLoader classLo
         Class<?> beanType = null;
         try {
             beanType = resolveClassName(beanClassName, classLoader);
-            beanType = getTargetClass(beanType);
+            beanType = getUserClass(beanType);
         } catch (Exception e) {
             if (logger.isErrorEnabled()) {
                 logger.error(e.getMessage(), e);

From 3882b6b1b9d11ae0011aa35fb277d7d74255637d Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:51:55 +0800
Subject: [PATCH 130/157] Update BeanDefinitionUtilsTest.java

---
 .../spring/beans/factory/config/BeanDefinitionUtilsTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index 0a614b28..c5b0e1cf 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -207,7 +207,7 @@ public List<User> users() {
     }
 
     private void testInSpringContainer(BiConsumer<ConfigurableApplicationContext, ConfigurableListableBeanFactory> contextConsumer) {
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(this.getClass());
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(BeanDefinitionUtils.class);
         contextConsumer.accept(context, context.getBeanFactory());
         context.close();
     }

From dd4480e7600af960ca969a2e9bb39da2ed9a0e73 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:52:16 +0800
Subject: [PATCH 131/157] Update BeanDefinitionUtilsTest.java

---
 .../spring/beans/factory/config/BeanDefinitionUtilsTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index c5b0e1cf..2c81a9ff 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -207,7 +207,7 @@ public List<User> users() {
     }
 
     private void testInSpringContainer(BiConsumer<ConfigurableApplicationContext, ConfigurableListableBeanFactory> contextConsumer) {
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(BeanDefinitionUtils.class);
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(BeanDefinitionUtilsTest.class);
         contextConsumer.accept(context, context.getBeanFactory());
         context.close();
     }

From e0cfe754dfae033547cec3903be92cbac2559a50 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 09:56:03 +0800
Subject: [PATCH 132/157] Update BeanDefinitionUtilsTest.java

---
 .../config/BeanDefinitionUtilsTest.java       | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index 2c81a9ff..eafe23ce 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -50,6 +50,7 @@
 import static io.microsphere.spring.core.SpringVersion.CURRENT;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_0;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -63,7 +64,6 @@
  * @see BeanDefinitionUtils
  * @since 1.0.0
  */
-@Component(BEAN_NAME)
 public class BeanDefinitionUtilsTest {
 
     private static final boolean isGESpring5 = CURRENT.gt(SPRING_5_0);
@@ -74,7 +74,7 @@ public class BeanDefinitionUtilsTest {
 
     private static final String USERS_BEAN_NAME = "users";
 
-    static final String BEAN_NAME = "beanDefinitionUtilsTest";
+    static final String BEAN_NAME = "config";
 
     private AbstractBeanDefinition beanDefinition;
 
@@ -118,7 +118,7 @@ public void testResolveBeanType() {
             assertEquals(List.class, resolveBeanType(beanDefinition));
 
             beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(BEAN_NAME);
-            assertEquals(this.getClass(), resolveBeanType(beanDefinition));
+            assertEquals(Config.class, resolveBeanType(beanDefinition));
         });
     }
 
@@ -145,7 +145,7 @@ public void testGetResolvableType() {
 
             beanDefinition = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(BEAN_NAME);
             resolvableType = getResolvableType(beanDefinition);
-            assertEquals(getClass(), resolvableType.getRawClass());
+            assertEquals(Config.class, resolvableType.getRawClass());
         });
     }
 
@@ -195,19 +195,24 @@ private void assertBeanDefinition(AbstractBeanDefinition beanDefinition, int rol
         }
     }
 
-    @Bean(name = USER_BEAN_NAME)
-    @Role(ROLE_INFRASTRUCTURE)
-    public User user() {
-        return new User();
-    }
+    @Component(BEAN_NAME)
+    static class Config {
+
+        @Bean(name = USER_BEAN_NAME)
+        @Role(ROLE_INFRASTRUCTURE)
+        public User user() {
+            return new User();
+        }
 
-    @Bean(name = USERS_BEAN_NAME)
-    public List<User> users() {
-        return Arrays.asList(new User());
+        @Bean(name = USERS_BEAN_NAME)
+        public List<User> users() {
+            return asList(new User());
+        }
     }
 
+
     private void testInSpringContainer(BiConsumer<ConfigurableApplicationContext, ConfigurableListableBeanFactory> contextConsumer) {
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(BeanDefinitionUtilsTest.class);
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
         contextConsumer.accept(context, context.getBeanFactory());
         context.close();
     }

From ab328bf536937d1534541a45154732b67a9b68a2 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:16:51 +0800
Subject: [PATCH 133/157] Update ResourceLoaderUtils.java

---
 .../java/io/microsphere/spring/core/io/ResourceLoaderUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
index 0b455409..d4460718 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
@@ -65,7 +65,7 @@ public static ResourceLoader getResourceLoader() {
     @Nonnull
     public static ResourceLoader getResourceLoader(@Nullable ClassLoader classLoader) {
         ClassLoader targetClassLoader = classLoader == null ? getDefaultClassLoader() : classLoader;
-        return resourceLoadersCache.computeIfAbsent(targetClassLoader, DefaultResourceLoader::new);
+        return resourceLoadersCache.computeIfAbsent(targetClassLoader, PathMatchingResourcePatternResolver::new);
     }
 
     /**

From 9d3d72062b69b066d29ba93d15956c74311f0cb9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:35:55 +0800
Subject: [PATCH 134/157] Update BeanDefinitionUtils.java

---
 .../beans/factory/config/BeanDefinitionUtils.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index 8547830a..87924b24 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -217,7 +217,16 @@ public static ResolvableType getResolvableType(RootBeanDefinition rootBeanDefini
         if (GET_RESOLVABLE_TYPE_METHOD_HANDLE == null) {
             return doGetResolvableType(rootBeanDefinition);
         }
-        return execute(() -> (ResolvableType) GET_RESOLVABLE_TYPE_METHOD_HANDLE.invokeExact(rootBeanDefinition));
+        ResolvableType resolvableType = null;
+        try {
+            resolvableType = (ResolvableType) GET_RESOLVABLE_TYPE_METHOD_HANDLE.invokeExact(rootBeanDefinition);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Failed to invokeExact on {} from {}", GET_RESOLVABLE_TYPE_METHOD_HANDLE, rootBeanDefinition);
+            }
+            resolvableType = doGetResolvableType(rootBeanDefinition);
+        }
+        return resolvableType;
     }
 
     /**

From fe2a501ce48794257a482d483d9176759e324cfb Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:58:53 +0800
Subject: [PATCH 135/157] Polish #34 : Refactor
 ListenableAutowireCandidateResolver

---
 .../ListenableAutowireCandidateResolver.java  | 66 +++++++++++++++----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index f06db078..57b8db3b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -67,18 +67,25 @@ public class ListenableAutowireCandidateResolver implements AutowireCandidateRes
     private static final Logger logger = LoggerFactory.getLogger(ListenableAutowireCandidateResolver.class);
 
     /**
-     * The name of the method name of {@link AutowireCandidateResolver#cloneIfNecessary()}
+     * The {@link MethodHandle} of {@link AutowireCandidateResolver#isRequired(DependencyDescriptor)}
      *
-     * @since Spring Framework 5.2.7
+     * @since Spring Framework 5.0
+     */
+    private static final MethodHandle IS_REQUIRED_METHOD_HANDLE = findVirtual(AutowireCandidateResolver.class, "isRequired", DependencyDescriptor.class);
+
+    /**
+     * The {@link MethodHandle} of {@link AutowireCandidateResolver#hasQualifier(DependencyDescriptor)}
+     *
+     * @since Spring Framework 5.1
      */
-    private static final String CLONE_IF_NECESSARY_METHOD_NAME = "cloneIfNecessary";
+    private static final MethodHandle HAS_QUALIFIER_METHOD_HANDLE = findVirtual(AutowireCandidateResolver.class, "hasQualifier", DependencyDescriptor.class);
 
     /**
      * The {@link MethodHandle} of {@link AutowireCandidateResolver#cloneIfNecessary()}
      *
      * @since Spring Framework 5.2.7
      */
-    private static final MethodHandle CLONE_IF_NECESSARY_METHOD_HANDLE = findVirtual(AutowireCandidateResolver.class, CLONE_IF_NECESSARY_METHOD_NAME);
+    private static final MethodHandle CLONE_IF_NECESSARY_METHOD_HANDLE = findVirtual(AutowireCandidateResolver.class, "cloneIfNecessary");
 
     /**
      * The prefix of the property name of {@link ListenableAutowireCandidateResolver}
@@ -120,9 +127,25 @@ public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDesc
         return delegate.isAutowireCandidate(bdHolder, descriptor);
     }
 
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 5.0
+     */
     public boolean isRequired(DependencyDescriptor descriptor) {
-        return delegate.isRequired(descriptor);
+        if (IS_REQUIRED_METHOD_HANDLE == null) {
+            return descriptor.isRequired();
+        }
+        boolean required = false;
+        try {
+            required = (boolean) IS_REQUIRED_METHOD_HANDLE.invokeExact(delegate, descriptor);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Failed to invokeExact on {} from {}", IS_REQUIRED_METHOD_HANDLE, descriptor);
+            }
+            required = descriptor.isRequired();
+        }
+        return required;
     }
 
     /**
@@ -131,7 +154,18 @@ public boolean isRequired(DependencyDescriptor descriptor) {
      * @since Spring Framework 5.1
      */
     public boolean hasQualifier(DependencyDescriptor descriptor) {
-        return invokeMethod(descriptor, "hasQualifier", descriptor);
+        if (HAS_QUALIFIER_METHOD_HANDLE == null) {
+            return false;
+        }
+        boolean hasQualifier = false;
+        try {
+            hasQualifier = (boolean) HAS_QUALIFIER_METHOD_HANDLE.invokeExact(delegate, descriptor);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Failed to invokeExact on {} from {}", HAS_QUALIFIER_METHOD_HANDLE, descriptor);
+            }
+        }
+        return hasQualifier;
     }
 
     @Nullable
@@ -158,13 +192,21 @@ public Object getLazyResolutionProxyIfNecessary(DependencyDescriptor descriptor,
      * @since Spring Framework 5.2.7
      */
     public AutowireCandidateResolver cloneIfNecessary() {
-        if (CLONE_IF_NECESSARY_METHOD_HANDLE != null) {
-            return execute(() -> (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invokeExact(delegate));
+        if (CLONE_IF_NECESSARY_METHOD_HANDLE == null) {
+            if (logger.isTraceEnabled()) {
+                logger.trace("The method AutowireCandidateResolver#cloneIfNecessary() was not found, the clone instance will be created on default way.");
+            }
+            return instantiateClass(delegate.getClass());
         }
-        if (logger.isTraceEnabled()) {
-            logger.trace("The method AutowireCandidateResolver#cloneIfNecessary() was not found, the clone instance will be created on default way.");
+        AutowireCandidateResolver autowireCandidateResolver = null;
+        try {
+            autowireCandidateResolver = (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invokeExact(delegate);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Failed to invokeExact on {} from {}", CLONE_IF_NECESSARY_METHOD_HANDLE);
+            }
         }
-        return instantiateClass(delegate.getClass());
+        return autowireCandidateResolver;
     }
 
     @Override

From 52f1aa187858d7c3fafee6f6ec5751e8d4715c47 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:58:56 +0800
Subject: [PATCH 136/157] Polish #34 : Refactor

---
 .../annotation/AnnotatedInjectionBeanPostProcessor.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index 93076a0e..67705ab8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -72,6 +72,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static io.microsphere.spring.beans.BeanUtils.findPrimaryConstructor;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static java.util.Collections.singleton;
 import static java.util.Collections.unmodifiableCollection;
@@ -205,7 +206,7 @@ public final Constructor<?>[] determineCandidateConstructors(Class<?> beanClass,
                     List<Constructor<?>> candidates = new ArrayList<>(rawCandidates.length);
                     Constructor<?> requiredConstructor = null;
                     Constructor<?> defaultConstructor = null;
-                    Constructor<?> primaryConstructor = BeanUtils.findPrimaryConstructor(beanClass);
+                    Constructor<?> primaryConstructor = findPrimaryConstructor(beanClass);
                     int nonSyntheticConstructors = 0;
                     for (Constructor<?> candidate : rawCandidates) {
                         if (!candidate.isSynthetic()) {

From d2c11037c87f1e48f56f9e26f31400b134cbfca6 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:59:00 +0800
Subject: [PATCH 137/157] Polish #34 : Refactor

---
 .../microsphere/spring/config/ConfigurationProperty.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
index 58fba958..ec3c9e36 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
@@ -24,7 +24,8 @@
 import java.util.List;
 import java.util.Objects;
 
-import static org.springframework.util.Assert.notNull;
+import static io.microsphere.util.Assert.assertNotNull;
+
 
 /**
  * The Spring Configuration Property class
@@ -76,7 +77,7 @@ public ConfigurationProperty(String name) {
     }
 
     public ConfigurationProperty(String name, Class<?> type) {
-        notNull(name, () -> "the property name must not null");
+        assertNotNull(name, () -> "the property name must not null");
         this.name = name;
         setType(type);
         this.metadata = new Metadata();
@@ -93,7 +94,7 @@ public Class<?> getType() {
     }
 
     public void setType(@Nonnull Class<?> type) {
-        notNull(type, () -> "the property type must not null");
+        assertNotNull(type, () -> "the property type must not null");
         this.type = type;
     }
 

From 2e3b891a85a181fd46d56168213e9e7cec0c4119 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 10:59:03 +0800
Subject: [PATCH 138/157] Polish #34 : Refactor

---
 .../context/event/DependencyAnalysisBeanFactoryListener.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
index 9afac0da..44572b3e 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -47,11 +47,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import static io.microsphere.collection.ListUtils.newArrayList;
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.reflect.TypeUtils.isParameterizedType;
 import static io.microsphere.reflect.TypeUtils.resolveActualTypeArgumentClasses;
+import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getInstanceSupplier;
 import static io.microsphere.spring.core.MethodParameterUtils.forParameter;
 import static io.microsphere.util.ArrayUtils.EMPTY_PARAMETER_ARRAY;
 import static io.microsphere.util.ClassLoaderUtils.resolveClass;
@@ -415,7 +417,8 @@ private boolean isEligibleBeanDefinition(BeanDefinition beanDefinition) {
                 && !beanDefinition.isLazyInit()
                 && beanDefinition instanceof RootBeanDefinition) {
             RootBeanDefinition rootBeanDefinition = (RootBeanDefinition) beanDefinition;
-            return rootBeanDefinition.getInstanceSupplier() == null;
+            Supplier<?> instanceSupplier = getInstanceSupplier(rootBeanDefinition);
+            return instanceSupplier == null || instanceSupplier.get() == null;
         }
         return false;
     }

From 9041180815cabe2c98c407df25fd1227a49d6cd0 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:01:39 +0800
Subject: [PATCH 139/157] Polish #34

---
 .../event/EventPublishingBeanBeforeProcessor.java        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
index ec48ad87..285f0b83 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/event/EventPublishingBeanBeforeProcessor.java
@@ -110,6 +110,15 @@ public void postProcessBeforeDestruction(Object bean, String beanName) throws Be
         this.beanEventListeners.onBeforeBeanDestroy(beanName, bean);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 4.3
+     */
+    public boolean requiresDestruction(Object object) {
+        return true;
+    }
+
     private void prepareBeanDefinitions(BeanDefinitionRegistry registry) {
         String[] beanNames = registry.getBeanDefinitionNames();
         int length = beanNames.length;

From 471b33cfcdaee6c9b1f2e5fe592bc9518bbd1eef Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:19:50 +0800
Subject: [PATCH 140/157] Polish #34 : Optimize the logging message

---
 .../main/java/io/microsphere/spring/beans/BeanUtils.java  | 2 +-
 .../spring/beans/factory/config/BeanDefinitionUtils.java  | 8 +++++---
 .../support/ListenableAutowireCandidateResolver.java      | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index 431c725c..d2f68098 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -480,7 +480,7 @@ public static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
             constructor = (Constructor<T>) FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE.invokeExact(clazz);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("It's failed to execute invokeExact on {} from the {}", FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE, clazz);
+                logger.warn("Failed to execute invokeExact on {} with arg : {}", FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE, clazz, e);
             }
         }
         return constructor;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index 87924b24..d5bc1788 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -29,6 +29,7 @@
 import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -222,7 +223,7 @@ public static ResolvableType getResolvableType(RootBeanDefinition rootBeanDefini
             resolvableType = (ResolvableType) GET_RESOLVABLE_TYPE_METHOD_HANDLE.invokeExact(rootBeanDefinition);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} from {}", GET_RESOLVABLE_TYPE_METHOD_HANDLE, rootBeanDefinition);
+                logger.warn("Failed to invokeExact on {} with arg : {}", GET_RESOLVABLE_TYPE_METHOD_HANDLE, rootBeanDefinition, e);
             }
             resolvableType = doGetResolvableType(rootBeanDefinition);
         }
@@ -291,7 +292,8 @@ public static boolean setInstanceSupplier(AbstractBeanDefinition beanDefinition,
             SET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition, instanceSupplier);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("It's failed to invokeExact on {}", SET_INSTANCE_SUPPLIER_METHOD_HANDLE, e);
+                logger.warn("Failed to invokeExact on {} with args : {}", SET_INSTANCE_SUPPLIER_METHOD_HANDLE,
+                        Arrays.asList(beanDefinition, instanceSupplier), e);
             }
         }
         return true;
@@ -313,7 +315,7 @@ public static Supplier<?> getInstanceSupplier(AbstractBeanDefinition beanDefinit
             supplier = (Supplier<?>) GET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("It's failed to invokeExact on {}", GET_INSTANCE_SUPPLIER_METHOD_HANDLE, e);
+                logger.warn("Failed to invokeExact on {} with arg : {}", GET_INSTANCE_SUPPLIER_METHOD_HANDLE, beanDefinition, e);
             }
         }
         return supplier;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 57b8db3b..75149bd6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -141,7 +141,8 @@ public boolean isRequired(DependencyDescriptor descriptor) {
             required = (boolean) IS_REQUIRED_METHOD_HANDLE.invokeExact(delegate, descriptor);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} from {}", IS_REQUIRED_METHOD_HANDLE, descriptor);
+                logger.warn("Failed to invokeExact on {} with args : '{}'", IS_REQUIRED_METHOD_HANDLE,
+                        Arrays.asList(delegate, descriptor), e);
             }
             required = descriptor.isRequired();
         }
@@ -162,7 +163,8 @@ public boolean hasQualifier(DependencyDescriptor descriptor) {
             hasQualifier = (boolean) HAS_QUALIFIER_METHOD_HANDLE.invokeExact(delegate, descriptor);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} from {}", HAS_QUALIFIER_METHOD_HANDLE, descriptor);
+                logger.warn("Failed to invokeExact on {} with args : {}", HAS_QUALIFIER_METHOD_HANDLE,
+                        Arrays.asList(delegate, descriptor), e);
             }
         }
         return hasQualifier;
@@ -203,7 +205,7 @@ public AutowireCandidateResolver cloneIfNecessary() {
             autowireCandidateResolver = (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invokeExact(delegate);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} from {}", CLONE_IF_NECESSARY_METHOD_HANDLE);
+                logger.warn("Failed to invokeExact on {} with arg : {}", CLONE_IF_NECESSARY_METHOD_HANDLE, delegate, e);
             }
         }
         return autowireCandidateResolver;

From 899c6135612ab9e3b66dd0f7e92648caad5d7bae Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:21:50 +0800
Subject: [PATCH 141/157] Update BeanDefinitionUtils.java

---
 .../spring/beans/factory/config/BeanDefinitionUtils.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index d5bc1788..e34fccc1 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -223,7 +223,7 @@ public static ResolvableType getResolvableType(RootBeanDefinition rootBeanDefini
             resolvableType = (ResolvableType) GET_RESOLVABLE_TYPE_METHOD_HANDLE.invokeExact(rootBeanDefinition);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} with arg : {}", GET_RESOLVABLE_TYPE_METHOD_HANDLE, rootBeanDefinition, e);
+                logger.warn("Failed to invokeExact on {} with arg : '{}'", GET_RESOLVABLE_TYPE_METHOD_HANDLE, rootBeanDefinition, e);
             }
             resolvableType = doGetResolvableType(rootBeanDefinition);
         }
@@ -292,7 +292,7 @@ public static boolean setInstanceSupplier(AbstractBeanDefinition beanDefinition,
             SET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition, instanceSupplier);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} with args : {}", SET_INSTANCE_SUPPLIER_METHOD_HANDLE,
+                logger.warn("Failed to invokeExact on {} with args : '{}'", SET_INSTANCE_SUPPLIER_METHOD_HANDLE,
                         Arrays.asList(beanDefinition, instanceSupplier), e);
             }
         }
@@ -315,7 +315,7 @@ public static Supplier<?> getInstanceSupplier(AbstractBeanDefinition beanDefinit
             supplier = (Supplier<?>) GET_INSTANCE_SUPPLIER_METHOD_HANDLE.invokeExact(beanDefinition);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} with arg : {}", GET_INSTANCE_SUPPLIER_METHOD_HANDLE, beanDefinition, e);
+                logger.warn("Failed to invokeExact on {} with arg : '{}'", GET_INSTANCE_SUPPLIER_METHOD_HANDLE, beanDefinition, e);
             }
         }
         return supplier;

From 0b0dd2ac40b60fcae6f37f476368ccd52d63ec12 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:21:55 +0800
Subject: [PATCH 142/157] Update BeanUtils.java

---
 .../src/main/java/io/microsphere/spring/beans/BeanUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
index d2f68098..d9175b01 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -480,7 +480,7 @@ public static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
             constructor = (Constructor<T>) FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE.invokeExact(clazz);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to execute invokeExact on {} with arg : {}", FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE, clazz, e);
+                logger.warn("Failed to execute invokeExact on {} with arg : '{}'", FIND_PRIMARY_CONSTRUCTOR_METHOD_HANDLE, clazz, e);
             }
         }
         return constructor;

From b8482e926d57645f877320a6e5c1802f27e76023 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:21:59 +0800
Subject: [PATCH 143/157] Update ListenableAutowireCandidateResolver.java

---
 .../factory/support/ListenableAutowireCandidateResolver.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 75149bd6..757febeb 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -163,7 +163,7 @@ public boolean hasQualifier(DependencyDescriptor descriptor) {
             hasQualifier = (boolean) HAS_QUALIFIER_METHOD_HANDLE.invokeExact(delegate, descriptor);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} with args : {}", HAS_QUALIFIER_METHOD_HANDLE,
+                logger.warn("Failed to invokeExact on {} with args : '{}'", HAS_QUALIFIER_METHOD_HANDLE,
                         Arrays.asList(delegate, descriptor), e);
             }
         }
@@ -205,7 +205,7 @@ public AutowireCandidateResolver cloneIfNecessary() {
             autowireCandidateResolver = (AutowireCandidateResolver) CLONE_IF_NECESSARY_METHOD_HANDLE.invokeExact(delegate);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Failed to invokeExact on {} with arg : {}", CLONE_IF_NECESSARY_METHOD_HANDLE, delegate, e);
+                logger.warn("Failed to invokeExact on {} with arg : '{}'", CLONE_IF_NECESSARY_METHOD_HANDLE, delegate, e);
             }
         }
         return autowireCandidateResolver;

From 42c866f5615f00000b63a79ecdada2ab519df6d9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:22:23 +0800
Subject: [PATCH 144/157] Polish #34 : ListenableConfigurableEnvironment

---
 .../ListenableConfigurableEnvironment.java    | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 4dde281b..029d98e4 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -26,6 +26,7 @@
 import org.springframework.core.env.MissingRequiredPropertiesException;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.Profiles;
+import org.springframework.core.env.PropertyResolver;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -68,17 +69,23 @@ public class ListenableConfigurableEnvironment implements ConfigurableEnvironmen
      */
     public static final boolean ENABLED_PROPERTY_VALUE = false;
 
+    /**
+     * The {@link MethodHandle} of {@linkplain PropertyResolver#getPropertyAsClass(String, Class)} was removed from Spring Framework 5.0
+     */
+    @Nullable
+    private static final MethodHandle GET_PROPERTY_AS_CLASS_METHOD_HANDLE = findVirtual(PropertyResolver.class, "getPropertyAsClass", String.class, Class.class);
+
     /**
      * The {@link MethodHandle} of {@link Environment#acceptsProfiles(Profiles)} since Spring Framework 5.1
      */
     @Nullable
-    private static final MethodHandle acceptsProfilesMethodHandle = findVirtual(Environment.class, "acceptsProfiles", Profiles.class);
+    private static final MethodHandle ACCEPTS_PROFILES_METHOD_HANDLE = findVirtual(Environment.class, "acceptsProfiles", Profiles.class);
 
     /**
      * The {@link MethodHandle} of {@link Environment#matchesProfiles(String...)} since Spring Framework 5.3.8
      */
     @Nullable
-    private static final MethodHandle matchesProfilesMethodHandle = findVirtual(Environment.class, "matchesProfiles", String[].class);
+    private static final MethodHandle MATCHES_PROFILES_METHOD_HANDLE = findVirtual(Environment.class, "matchesProfiles", String[].class);
 
     private final ConfigurableEnvironment delegate;
 
@@ -196,12 +203,12 @@ public String[] getDefaultProfiles() {
      * @since Spring Framework 5.3.28
      */
     public boolean matchesProfiles(String... profileExpressions) {
-        if (matchesProfilesMethodHandle != null) {
+        if (MATCHES_PROFILES_METHOD_HANDLE != null) {
             try {
-                return (boolean) matchesProfilesMethodHandle.invokeExact((Environment) delegate, profileExpressions);
+                return (boolean) MATCHES_PROFILES_METHOD_HANDLE.invokeExact((Environment) delegate, profileExpressions);
             } catch (Throwable e) {
                 if (logger.isWarnEnabled()) {
-                    logger.warn("Failed to invoke {} with args : '{}'", matchesProfilesMethodHandle, Arrays.toString(profileExpressions), e);
+                    logger.warn("Failed to invoke {} with args : '{}'", MATCHES_PROFILES_METHOD_HANDLE, Arrays.toString(profileExpressions), e);
                 }
             }
         }
@@ -220,12 +227,13 @@ public boolean acceptsProfiles(String... profiles) {
      * @since Spring Framework 5.1
      */
     public boolean acceptsProfiles(Profiles profiles) {
-        if (acceptsProfilesMethodHandle != null) {
+        if (ACCEPTS_PROFILES_METHOD_HANDLE != null) {
             try {
-                return (boolean) acceptsProfilesMethodHandle.invokeExact((Environment) delegate, profiles);
+                return (boolean) ACCEPTS_PROFILES_METHOD_HANDLE.invokeExact((Environment) delegate, profiles);
             } catch (Throwable e) {
                 if (logger.isWarnEnabled()) {
-                    logger.warn("Failed to invoke {} with args : '{}'", acceptsProfilesMethodHandle, profiles, e);
+                    logger.warn("Failed to invokeExact on {} with args : '{}'", ACCEPTS_PROFILES_METHOD_HANDLE,
+                            Arrays.asList(delegate, profiles), e);
                 }
             }
         }
@@ -370,6 +378,23 @@ public ConfigurableEnvironment getDelegate() {
         return this.delegate;
     }
 
+    public <T> T getPropertyAsClass(String key, Class<T> targetType) {
+        if (GET_PROPERTY_AS_CLASS_METHOD_HANDLE == null) {
+            return delegate.getProperty(key, targetType);
+        }
+        T value = null;
+        try {
+            value = (T) GET_PROPERTY_AS_CLASS_METHOD_HANDLE.invokeExact(delegate, key, targetType);
+        } catch (Throwable e) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Failed to invokeExact on {} with args : '{}'", GET_PROPERTY_AS_CLASS_METHOD_HANDLE,
+                        Arrays.asList(key, targetType), e);
+            }
+            value = delegate.getProperty(key, targetType);
+        }
+        return value;
+    }
+
     /**
      * Set the {@link ListenableConfigurableEnvironment} into {@link ConfigurableApplicationContext} if
      * {@link #isEnabled(Environment) enabled}

From 86884d65a8101c8c19c7bc34cc7ed928d0ae4f4f Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:26:13 +0800
Subject: [PATCH 145/157] Update ProfilesParser.java

---
 .../core/env/ProfilesParser.java              | 304 +++++++++---------
 1 file changed, 153 insertions(+), 151 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
index 527201e9..3612702f 100644
--- a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -29,6 +29,9 @@
 import java.util.StringTokenizer;
 import java.util.function.Predicate;
 
+import static io.microsphere.util.Assert.assertNotEmpty;
+import static io.microsphere.util.Assert.assertTrue;
+
 /**
  * Internal parser used by {@link Profiles#of}.
  *
@@ -38,157 +41,156 @@
  */
 final class ProfilesParser {
 
- private ProfilesParser() {
- }
-
-
- static Profiles parse(String... expressions) {
-  Assert.notEmpty(expressions, "Must specify at least one profile expression");
-  Profiles[] parsed = new Profiles[expressions.length];
-  for (int i = 0; i < expressions.length; i++) {
-   parsed[i] = parseExpression(expressions[i]);
-  }
-  return new ParsedProfiles(expressions, parsed);
- }
-
- private static Profiles parseExpression(String expression) {
-  Assert.hasText(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
-  StringTokenizer tokens = new StringTokenizer(expression, "()&|!", true);
-  return parseTokens(expression, tokens);
- }
-
- private static Profiles parseTokens(String expression, StringTokenizer tokens) {
-  return parseTokens(expression, tokens, Context.NONE);
- }
-
- private static Profiles parseTokens(String expression, StringTokenizer tokens, Context context) {
-  List<Profiles> elements = new ArrayList<>();
-  Operator operator = null;
-  while (tokens.hasMoreTokens()) {
-   String token = tokens.nextToken().trim();
-   if (token.isEmpty()) {
-    continue;
-   }
-   switch (token) {
-    case "(":
-     Profiles contents = parseTokens(expression, tokens, Context.PARENTHESIS);
-     if (context == Context.NEGATE) {
-      return contents;
-     }
-     elements.add(contents);
-     break;
-    case "&":
-     assertWellFormed(expression, operator == null || operator == Operator.AND);
-     operator = Operator.AND;
-     break;
-    case "|":
-     assertWellFormed(expression, operator == null || operator == Operator.OR);
-     operator = Operator.OR;
-     break;
-    case "!":
-     elements.add(not(parseTokens(expression, tokens, Context.NEGATE)));
-     break;
-    case ")":
-     Profiles merged = merge(expression, elements, operator);
-     if (context == Context.PARENTHESIS) {
-      return merged;
-     }
-     elements.clear();
-     elements.add(merged);
-     operator = null;
-     break;
-    default:
-     Profiles value = equals(token);
-     if (context == Context.NEGATE) {
-      return value;
-     }
-     elements.add(value);
-   }
-  }
-  return merge(expression, elements, operator);
- }
-
- private static Profiles merge(String expression, List<Profiles> elements, @Nullable Operator operator) {
-  assertWellFormed(expression, !elements.isEmpty());
-  if (elements.size() == 1) {
-   return elements.get(0);
-  }
-  Profiles[] profiles = elements.toArray(new Profiles[0]);
-  return (operator == Operator.AND ? and(profiles) : or(profiles));
- }
-
- private static void assertWellFormed(String expression, boolean wellFormed) {
-  Assert.isTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
- }
-
- private static Profiles or(Profiles... profiles) {
-  return activeProfile -> Arrays.stream(profiles).anyMatch(isMatch(activeProfile));
- }
-
- private static Profiles and(Profiles... profiles) {
-  return activeProfile -> Arrays.stream(profiles).allMatch(isMatch(activeProfile));
- }
-
- private static Profiles not(Profiles profiles) {
-  return activeProfile -> !profiles.matches(activeProfile);
- }
-
- private static Profiles equals(String profile) {
-  return activeProfile -> activeProfile.test(profile);
- }
-
- private static Predicate<Profiles> isMatch(Predicate<String> activeProfiles) {
-  return profiles -> profiles.matches(activeProfiles);
- }
-
-
- private enum Operator { AND, OR }
-
- private enum Context { NONE, NEGATE, PARENTHESIS }
-
-
- private static class ParsedProfiles implements Profiles {
-
-  private final Set<String> expressions = new LinkedHashSet<>();
-
-  private final Profiles[] parsed;
-
-  ParsedProfiles(String[] expressions, Profiles[] parsed) {
-   Collections.addAll(this.expressions, expressions);
-   this.parsed = parsed;
-  }
-
-  @Override
-  public boolean matches(Predicate<String> activeProfiles) {
-   for (Profiles candidate : this.parsed) {
-    if (candidate.matches(activeProfiles)) {
-     return true;
+    private ProfilesParser() {
+    }
+
+    static Profiles parse(String... expressions) {
+        assertNotEmpty(expressions, "Must specify at least one profile expression");
+        Profiles[] parsed = new Profiles[expressions.length];
+        for (int i = 0; i < expressions.length; i++) {
+            parsed[i] = parseExpression(expressions[i]);
+        }
+        return new ParsedProfiles(expressions, parsed);
+    }
+
+    private static Profiles parseExpression(String expression) {
+        assertNotEmpty(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
+        StringTokenizer tokens = new StringTokenizer(expression, "()&|!", true);
+        return parseTokens(expression, tokens);
+    }
+
+    private static Profiles parseTokens(String expression, StringTokenizer tokens) {
+        return parseTokens(expression, tokens, Context.NONE);
+    }
+
+    private static Profiles parseTokens(String expression, StringTokenizer tokens, Context context) {
+        List<Profiles> elements = new ArrayList<>();
+        Operator operator = null;
+        while (tokens.hasMoreTokens()) {
+            String token = tokens.nextToken().trim();
+            if (token.isEmpty()) {
+                continue;
+            }
+            switch (token) {
+                case "(":
+                    Profiles contents = parseTokens(expression, tokens, Context.PARENTHESIS);
+                    if (context == Context.NEGATE) {
+                        return contents;
+                    }
+                    elements.add(contents);
+                    break;
+                case "&":
+                    assertWellFormed(expression, operator == null || operator == Operator.AND);
+                    operator = Operator.AND;
+                    break;
+                case "|":
+                    assertWellFormed(expression, operator == null || operator == Operator.OR);
+                    operator = Operator.OR;
+                    break;
+                case "!":
+                    elements.add(not(parseTokens(expression, tokens, Context.NEGATE)));
+                    break;
+                case ")":
+                    Profiles merged = merge(expression, elements, operator);
+                    if (context == Context.PARENTHESIS) {
+                        return merged;
+                    }
+                    elements.clear();
+                    elements.add(merged);
+                    operator = null;
+                    break;
+                default:
+                    Profiles value = equals(token);
+                    if (context == Context.NEGATE) {
+                        return value;
+                    }
+                    elements.add(value);
+            }
+        }
+        return merge(expression, elements, operator);
+    }
+
+    private static Profiles merge(String expression, List<Profiles> elements, @Nullable Operator operator) {
+        assertWellFormed(expression, !elements.isEmpty());
+        if (elements.size() == 1) {
+            return elements.get(0);
+        }
+        Profiles[] profiles = elements.toArray(new Profiles[0]);
+        return (operator == Operator.AND ? and(profiles) : or(profiles));
+    }
+
+    private static void assertWellFormed(String expression, boolean wellFormed) {
+        assertTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
+    }
+
+    private static Profiles or(Profiles... profiles) {
+        return activeProfile -> Arrays.stream(profiles).anyMatch(isMatch(activeProfile));
+    }
+
+    private static Profiles and(Profiles... profiles) {
+        return activeProfile -> Arrays.stream(profiles).allMatch(isMatch(activeProfile));
+    }
+
+    private static Profiles not(Profiles profiles) {
+        return activeProfile -> !profiles.matches(activeProfile);
+    }
+
+    private static Profiles equals(String profile) {
+        return activeProfile -> activeProfile.test(profile);
+    }
+
+    private static Predicate<Profiles> isMatch(Predicate<String> activeProfiles) {
+        return profiles -> profiles.matches(activeProfiles);
+    }
+
+
+    private enum Operator {AND, OR}
+
+    private enum Context {NONE, NEGATE, PARENTHESIS}
+
+
+    private static class ParsedProfiles implements Profiles {
+
+        private final Set<String> expressions = new LinkedHashSet<>();
+
+        private final Profiles[] parsed;
+
+        ParsedProfiles(String[] expressions, Profiles[] parsed) {
+            Collections.addAll(this.expressions, expressions);
+            this.parsed = parsed;
+        }
+
+        @Override
+        public boolean matches(Predicate<String> activeProfiles) {
+            for (Profiles candidate : this.parsed) {
+                if (candidate.matches(activeProfiles)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            ParsedProfiles that = (ParsedProfiles) obj;
+            return this.expressions.equals(that.expressions);
+        }
+
+        @Override
+        public int hashCode() {
+            return this.expressions.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return StringUtils.collectionToDelimitedString(this.expressions, " or ");
+        }
     }
-   }
-   return false;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-   if (this == obj) {
-    return true;
-   }
-   if (obj == null || getClass() != obj.getClass()) {
-    return false;
-   }
-   ParsedProfiles that = (ParsedProfiles) obj;
-   return this.expressions.equals(that.expressions);
-  }
-
-  @Override
-  public int hashCode() {
-   return this.expressions.hashCode();
-  }
-
-  @Override
-  public String toString() {
-   return StringUtils.collectionToDelimitedString(this.expressions, " or ");
-  }
- }
 
 }

From bb5c7c2d352ea2294aaeff7b9bc7f2e6d5bddcc9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 11:27:55 +0800
Subject: [PATCH 146/157] Update ListenableConfigurableEnvironment.java

---
 .../core/env/ListenableConfigurableEnvironment.java      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 029d98e4..3890acf8 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -378,19 +378,18 @@ public ConfigurableEnvironment getDelegate() {
         return this.delegate;
     }
 
-    public <T> T getPropertyAsClass(String key, Class<T> targetType) {
+    public <T> Class<T> getPropertyAsClass(String key, Class<T> targetType) {
         if (GET_PROPERTY_AS_CLASS_METHOD_HANDLE == null) {
-            return delegate.getProperty(key, targetType);
+            return null;
         }
-        T value = null;
+        Class<T> value = null;
         try {
-            value = (T) GET_PROPERTY_AS_CLASS_METHOD_HANDLE.invokeExact(delegate, key, targetType);
+            value = (Class<T>) GET_PROPERTY_AS_CLASS_METHOD_HANDLE.invokeExact(delegate, key, targetType);
         } catch (Throwable e) {
             if (logger.isWarnEnabled()) {
                 logger.warn("Failed to invokeExact on {} with args : '{}'", GET_PROPERTY_AS_CLASS_METHOD_HANDLE,
                         Arrays.asList(key, targetType), e);
             }
-            value = delegate.getProperty(key, targetType);
         }
         return value;
     }

From 2fe7f5e74eac545e39bc2ec774309eae33acba73 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 21:48:09 +0800
Subject: [PATCH 147/157] Polish #34 :  Add microsphere-spring-compatible
 module

---
 microsphere-spring-compatible/pom.xml         |   52 +
 .../springframework/core/env/Profiles.java    |    0
 .../core/env/ProfilesParser.java              |   20 +-
 .../org/springframework/lang/NonNull.java     |   53 +
 .../org/springframework/lang/Nullable.java    |   54 +
 .../org/springframework/package-info.java     |    3 +-
 .../java/org/springframework/util/Assert.java |  736 +++++++++
 .../org/springframework/util/ClassUtils.java  | 1449 +++++++++++++++++
 .../springframework/util/CollectionUtils.java |  516 ++++++
 .../util/ConcurrentReferenceHashMap.java      | 1092 +++++++++++++
 .../springframework/util/MultiValueMap.java   |   96 ++
 .../util/MultiValueMapAdapter.java            |  187 +++
 .../org/springframework/util/ObjectUtils.java | 1040 ++++++++++++
 .../springframework/util/ReflectionUtils.java |  881 ++++++++++
 .../org/springframework/util/StreamUtils.java |  295 ++++
 .../org/springframework/util/StringUtils.java | 1433 ++++++++++++++++
 pom.xml                                       |    1 +
 17 files changed, 7896 insertions(+), 12 deletions(-)
 create mode 100644 microsphere-spring-compatible/pom.xml
 rename {microsphere-spring-context => microsphere-spring-compatible}/src/main/java/org/springframework/core/env/Profiles.java (100%)
 rename {microsphere-spring-context => microsphere-spring-compatible}/src/main/java/org/springframework/core/env/ProfilesParser.java (92%)
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
 rename {microsphere-spring-context => microsphere-spring-compatible}/src/main/java/org/springframework/package-info.java (83%)
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
 create mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java

diff --git a/microsphere-spring-compatible/pom.xml b/microsphere-spring-compatible/pom.xml
new file mode 100644
index 00000000..1f614bc4
--- /dev/null
+++ b/microsphere-spring-compatible/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <groupId>io.github.microsphere-projects</groupId>
+        <artifactId>microsphere-spring-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../microsphere-spring-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.github.microsphere-projects</groupId>
+    <artifactId>microsphere-spring-compatible</artifactId>
+    <version>${revision}</version>
+    <packaging>jar</packaging>
+
+    <name>Microsphere :: Spring :: Compatible</name>
+    <description>Microsphere Spring Compatible</description>
+
+    <dependencies>
+
+        <!-- JSR 305 -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java b/microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java
similarity index 100%
rename from microsphere-spring-context/src/main/java/org/springframework/core/env/Profiles.java
rename to microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java
diff --git a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
similarity index 92%
rename from microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
rename to microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
index 3612702f..2512db10 100644
--- a/microsphere-spring-context/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -16,10 +16,6 @@
 
 package org.springframework.core.env;
 
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -29,8 +25,9 @@
 import java.util.StringTokenizer;
 import java.util.function.Predicate;
 
-import static io.microsphere.util.Assert.assertNotEmpty;
-import static io.microsphere.util.Assert.assertTrue;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Internal parser used by {@link Profiles#of}.
@@ -44,8 +41,9 @@ final class ProfilesParser {
     private ProfilesParser() {
     }
 
+
     static Profiles parse(String... expressions) {
-        assertNotEmpty(expressions, "Must specify at least one profile expression");
+        Assert.notEmpty(expressions, "Must specify at least one profile expression");
         Profiles[] parsed = new Profiles[expressions.length];
         for (int i = 0; i < expressions.length; i++) {
             parsed[i] = parseExpression(expressions[i]);
@@ -54,7 +52,7 @@ static Profiles parse(String... expressions) {
     }
 
     private static Profiles parseExpression(String expression) {
-        assertNotEmpty(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
+        Assert.hasText(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
         StringTokenizer tokens = new StringTokenizer(expression, "()&|!", true);
         return parseTokens(expression, tokens);
     }
@@ -120,7 +118,7 @@ private static Profiles merge(String expression, List<Profiles> elements, @Nulla
     }
 
     private static void assertWellFormed(String expression, boolean wellFormed) {
-        assertTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
+        Assert.isTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
     }
 
     private static Profiles or(Profiles... profiles) {
@@ -144,9 +142,9 @@ private static Predicate<Profiles> isMatch(Predicate<String> activeProfiles) {
     }
 
 
-    private enum Operator {AND, OR}
+    private enum Operator { AND, OR }
 
-    private enum Context {NONE, NEGATE, PARENTHESIS}
+    private enum Context { NONE, NEGATE, PARENTHESIS }
 
 
     private static class ParsedProfiles implements Profiles {
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java b/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
new file mode 100644
index 00000000..fa022278
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.lang;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierNickname;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A common Spring annotation to declare that annotated elements cannot be {@code null}.
+ *
+ * <p>Leverages JSR-305 meta-annotations to indicate nullability in Java to common
+ * tools with JSR-305 support and used by Kotlin to infer nullability of Spring API.
+ *
+ * <p>Should be used at parameter, return value, and field level. Method overrides should
+ * repeat parent {@code @NonNull} annotations unless they behave differently.
+ *
+ * <p>Use {@code @NonNullApi} (scope = parameters + return values) and/or {@code @NonNullFields}
+ * (scope = fields) to set the default behavior to non-nullable in order to avoid annotating
+ * your whole codebase with {@code @NonNull}.
+ *
+ * @author Sebastien Deleuze
+ * @author Juergen Hoeller
+ * @since 5.0
+ * @see NonNullApi
+ * @see NonNullFields
+ * @see Nullable
+ */
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull
+@TypeQualifierNickname
+public @interface NonNull {
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java b/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
new file mode 100644
index 00000000..b2d9aa6c
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2002-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.lang;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A common Spring annotation to declare that annotated elements can be {@code null} under
+ * some circumstance.
+ *
+ * <p>Leverages JSR-305 meta-annotations to indicate nullability in Java to common
+ * tools with JSR-305 support and used by Kotlin to infer nullability of Spring API.
+ *
+ * <p>Should be used at parameter, return value, and field level. Methods override should
+ * repeat parent {@code @Nullable} annotations unless they behave differently.
+ *
+ * <p>Can be used in association with {@code @NonNullApi} or {@code @NonNullFields} to
+ * override the default non-nullable semantic to nullable.
+ *
+ * @author Sebastien Deleuze
+ * @author Juergen Hoeller
+ * @since 5.0
+ * @see NonNullApi
+ * @see NonNullFields
+ * @see NonNull
+ */
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull(when = When.MAYBE)
+@TypeQualifierNickname
+public @interface Nullable {
+}
diff --git a/microsphere-spring-context/src/main/java/org/springframework/package-info.java b/microsphere-spring-compatible/src/main/java/org/springframework/package-info.java
similarity index 83%
rename from microsphere-spring-context/src/main/java/org/springframework/package-info.java
rename to microsphere-spring-compatible/src/main/java/org/springframework/package-info.java
index 1e6729d7..9e0d9d01 100644
--- a/microsphere-spring-context/src/main/java/org/springframework/package-info.java
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/package-info.java
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 /**
- * The classes in this package or sub-packages are used to be compatible with the different versions of Spring Framework
+ * The classes in this package or sub-packages are forked from the Spring Framework 5.3.x(latest),
+ * which will be used to be compatible with the lower versions of Spring Framework.
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
  * @since 1.0.0
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
new file mode 100644
index 00000000..54bc2e85
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
@@ -0,0 +1,736 @@
+/*
+ * Copyright 2002-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * Assertion utility class that assists in validating arguments.
+ *
+ * <p>Useful for identifying programmer errors early and clearly at runtime.
+ *
+ * <p>For example, if the contract of a public method states it does not
+ * allow {@code null} arguments, {@code Assert} can be used to validate that
+ * contract. Doing this clearly indicates a contract violation when it
+ * occurs and protects the class's invariants.
+ *
+ * <p>Typically used to validate method arguments rather than configuration
+ * properties, to check for cases that are usually programmer errors rather
+ * than configuration errors. In contrast to configuration initialization
+ * code, there is usually no point in falling back to defaults in such methods.
+ *
+ * <p>This class is similar to JUnit's assertion library. If an argument value is
+ * deemed invalid, an {@link IllegalArgumentException} is thrown (typically).
+ * For example:
+ *
+ * <pre class="code">
+ * Assert.notNull(clazz, "The class must not be null");
+ * Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
+ *
+ * <p>Mainly for internal use within the framework; for a more comprehensive suite
+ * of assertion utilities consider {@code org.apache.commons.lang3.Validate} from
+ * <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>,
+ * Google Guava's
+ * <a href="https://github.com/google/guava/wiki/PreconditionsExplained">Preconditions</a>,
+ * or similar third-party libraries.
+ *
+ * @author Keith Donald
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Colin Sampaleanu
+ * @author Rob Harrop
+ * @since 1.1.2
+ */
+public abstract class Assert {
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalStateException}
+	 * if the expression evaluates to {@code false}.
+	 * <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException}
+	 * on an assertion failure.
+	 * <pre class="code">Assert.state(id == null, "The id property must not already be initialized");</pre>
+	 * @param expression a boolean expression
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalStateException if {@code expression} is {@code false}
+	 */
+	public static void state(boolean expression, String message) {
+		if (!expression) {
+			throw new IllegalStateException(message);
+		}
+	}
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalStateException}
+	 * if the expression evaluates to {@code false}.
+	 * <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException}
+	 * on an assertion failure.
+	 * <pre class="code">
+	 * Assert.state(entity.getId() == null,
+	 *     () -&gt; "ID for entity " + entity.getName() + " must not already be initialized");
+	 * </pre>
+	 * @param expression a boolean expression
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalStateException if {@code expression} is {@code false}
+	 * @since 5.0
+	 */
+	public static void state(boolean expression, Supplier<String> messageSupplier) {
+		if (!expression) {
+			throw new IllegalStateException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalStateException}
+	 * if the expression evaluates to {@code false}.
+	 * @deprecated as of 4.3.7, in favor of {@link #state(boolean, String)}
+	 */
+	@Deprecated
+	public static void state(boolean expression) {
+		state(expression, "[Assertion failed] - this state invariant must be true");
+	}
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
+	 * if the expression evaluates to {@code false}.
+	 * <pre class="code">Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
+	 * @param expression a boolean expression
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if {@code expression} is {@code false}
+	 */
+	public static void isTrue(boolean expression, String message) {
+		if (!expression) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
+	 * if the expression evaluates to {@code false}.
+	 * <pre class="code">
+	 * Assert.isTrue(i &gt; 0, () -&gt; "The value '" + i + "' must be greater than zero");
+	 * </pre>
+	 * @param expression a boolean expression
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if {@code expression} is {@code false}
+	 * @since 5.0
+	 */
+	public static void isTrue(boolean expression, Supplier<String> messageSupplier) {
+		if (!expression) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
+	 * if the expression evaluates to {@code false}.
+	 * @deprecated as of 4.3.7, in favor of {@link #isTrue(boolean, String)}
+	 */
+	@Deprecated
+	public static void isTrue(boolean expression) {
+		isTrue(expression, "[Assertion failed] - this expression must be true");
+	}
+
+	/**
+	 * Assert that an object is {@code null}.
+	 * <pre class="code">Assert.isNull(value, "The value must be null");</pre>
+	 * @param object the object to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the object is not {@code null}
+	 */
+	public static void isNull(@Nullable Object object, String message) {
+		if (object != null) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that an object is {@code null}.
+	 * <pre class="code">
+	 * Assert.isNull(value, () -&gt; "The value '" + value + "' must be null");
+	 * </pre>
+	 * @param object the object to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the object is not {@code null}
+	 * @since 5.0
+	 */
+	public static void isNull(@Nullable Object object, Supplier<String> messageSupplier) {
+		if (object != null) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that an object is {@code null}.
+	 * @deprecated as of 4.3.7, in favor of {@link #isNull(Object, String)}
+	 */
+	@Deprecated
+	public static void isNull(@Nullable Object object) {
+		isNull(object, "[Assertion failed] - the object argument must be null");
+	}
+
+	/**
+	 * Assert that an object is not {@code null}.
+	 * <pre class="code">Assert.notNull(clazz, "The class must not be null");</pre>
+	 * @param object the object to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the object is {@code null}
+	 */
+	public static void notNull(@Nullable Object object, String message) {
+		if (object == null) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that an object is not {@code null}.
+	 * <pre class="code">
+	 * Assert.notNull(entity.getId(),
+	 *     () -&gt; "ID for entity " + entity.getName() + " must not be null");
+	 * </pre>
+	 * @param object the object to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the object is {@code null}
+	 * @since 5.0
+	 */
+	public static void notNull(@Nullable Object object, Supplier<String> messageSupplier) {
+		if (object == null) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that an object is not {@code null}.
+	 * @deprecated as of 4.3.7, in favor of {@link #notNull(Object, String)}
+	 */
+	@Deprecated
+	public static void notNull(@Nullable Object object) {
+		notNull(object, "[Assertion failed] - this argument is required; it must not be null");
+	}
+
+	/**
+	 * Assert that the given String is not empty; that is,
+	 * it must not be {@code null} and not the empty String.
+	 * <pre class="code">Assert.hasLength(name, "Name must not be empty");</pre>
+	 * @param text the String to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the text is empty
+	 * @see StringUtils#hasLength
+	 */
+	public static void hasLength(@Nullable String text, String message) {
+		if (!StringUtils.hasLength(text)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that the given String is not empty; that is,
+	 * it must not be {@code null} and not the empty String.
+	 * <pre class="code">
+	 * Assert.hasLength(account.getName(),
+	 *     () -&gt; "Name for account '" + account.getId() + "' must not be empty");
+	 * </pre>
+	 * @param text the String to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the text is empty
+	 * @since 5.0
+	 * @see StringUtils#hasLength
+	 */
+	public static void hasLength(@Nullable String text, Supplier<String> messageSupplier) {
+		if (!StringUtils.hasLength(text)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that the given String is not empty; that is,
+	 * it must not be {@code null} and not the empty String.
+	 * @deprecated as of 4.3.7, in favor of {@link #hasLength(String, String)}
+	 */
+	@Deprecated
+	public static void hasLength(@Nullable String text) {
+		hasLength(text,
+				"[Assertion failed] - this String argument must have length; it must not be null or empty");
+	}
+
+	/**
+	 * Assert that the given String contains valid text content; that is, it must not
+	 * be {@code null} and must contain at least one non-whitespace character.
+	 * <pre class="code">Assert.hasText(name, "'name' must not be empty");</pre>
+	 * @param text the String to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the text does not contain valid text content
+	 * @see StringUtils#hasText
+	 */
+	public static void hasText(@Nullable String text, String message) {
+		if (!StringUtils.hasText(text)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that the given String contains valid text content; that is, it must not
+	 * be {@code null} and must contain at least one non-whitespace character.
+	 * <pre class="code">
+	 * Assert.hasText(account.getName(),
+	 *     () -&gt; "Name for account '" + account.getId() + "' must not be empty");
+	 * </pre>
+	 * @param text the String to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the text does not contain valid text content
+	 * @since 5.0
+	 * @see StringUtils#hasText
+	 */
+	public static void hasText(@Nullable String text, Supplier<String> messageSupplier) {
+		if (!StringUtils.hasText(text)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that the given String contains valid text content; that is, it must not
+	 * be {@code null} and must contain at least one non-whitespace character.
+	 * @deprecated as of 4.3.7, in favor of {@link #hasText(String, String)}
+	 */
+	@Deprecated
+	public static void hasText(@Nullable String text) {
+		hasText(text,
+				"[Assertion failed] - this String argument must have text; it must not be null, empty, or blank");
+	}
+
+	/**
+	 * Assert that the given text does not contain the given substring.
+	 * <pre class="code">Assert.doesNotContain(name, "rod", "Name must not contain 'rod'");</pre>
+	 * @param textToSearch the text to search
+	 * @param substring the substring to find within the text
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the text contains the substring
+	 */
+	public static void doesNotContain(@Nullable String textToSearch, String substring, String message) {
+		if (StringUtils.hasLength(textToSearch) && StringUtils.hasLength(substring) &&
+				textToSearch.contains(substring)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that the given text does not contain the given substring.
+	 * <pre class="code">
+	 * Assert.doesNotContain(name, forbidden, () -&gt; "Name must not contain '" + forbidden + "'");
+	 * </pre>
+	 * @param textToSearch the text to search
+	 * @param substring the substring to find within the text
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the text contains the substring
+	 * @since 5.0
+	 */
+	public static void doesNotContain(@Nullable String textToSearch, String substring, Supplier<String> messageSupplier) {
+		if (StringUtils.hasLength(textToSearch) && StringUtils.hasLength(substring) &&
+				textToSearch.contains(substring)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that the given text does not contain the given substring.
+	 * @deprecated as of 4.3.7, in favor of {@link #doesNotContain(String, String, String)}
+	 */
+	@Deprecated
+	public static void doesNotContain(@Nullable String textToSearch, String substring) {
+		doesNotContain(textToSearch, substring,
+				() -> "[Assertion failed] - this String argument must not contain the substring [" + substring + "]");
+	}
+
+	/**
+	 * Assert that an array contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * <pre class="code">Assert.notEmpty(array, "The array must contain elements");</pre>
+	 * @param array the array to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the object array is {@code null} or contains no elements
+	 */
+	public static void notEmpty(@Nullable Object[] array, String message) {
+		if (ObjectUtils.isEmpty(array)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that an array contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * <pre class="code">
+	 * Assert.notEmpty(array, () -&gt; "The " + arrayType + " array must contain elements");
+	 * </pre>
+	 * @param array the array to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the object array is {@code null} or contains no elements
+	 * @since 5.0
+	 */
+	public static void notEmpty(@Nullable Object[] array, Supplier<String> messageSupplier) {
+		if (ObjectUtils.isEmpty(array)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that an array contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Object[], String)}
+	 */
+	@Deprecated
+	public static void notEmpty(@Nullable Object[] array) {
+		notEmpty(array, "[Assertion failed] - this array must not be empty: it must contain at least 1 element");
+	}
+
+	/**
+	 * Assert that an array contains no {@code null} elements.
+	 * <p>Note: Does not complain if the array is empty!
+	 * <pre class="code">Assert.noNullElements(array, "The array must contain non-null elements");</pre>
+	 * @param array the array to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the object array contains a {@code null} element
+	 */
+	public static void noNullElements(@Nullable Object[] array, String message) {
+		if (array != null) {
+			for (Object element : array) {
+				if (element == null) {
+					throw new IllegalArgumentException(message);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Assert that an array contains no {@code null} elements.
+	 * <p>Note: Does not complain if the array is empty!
+	 * <pre class="code">
+	 * Assert.noNullElements(array, () -&gt; "The " + arrayType + " array must contain non-null elements");
+	 * </pre>
+	 * @param array the array to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the object array contains a {@code null} element
+	 * @since 5.0
+	 */
+	public static void noNullElements(@Nullable Object[] array, Supplier<String> messageSupplier) {
+		if (array != null) {
+			for (Object element : array) {
+				if (element == null) {
+					throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Assert that an array contains no {@code null} elements.
+	 * @deprecated as of 4.3.7, in favor of {@link #noNullElements(Object[], String)}
+	 */
+	@Deprecated
+	public static void noNullElements(@Nullable Object[] array) {
+		noNullElements(array, "[Assertion failed] - this array must not contain any null elements");
+	}
+
+	/**
+	 * Assert that a collection contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * <pre class="code">Assert.notEmpty(collection, "Collection must contain elements");</pre>
+	 * @param collection the collection to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the collection is {@code null} or
+	 * contains no elements
+	 */
+	public static void notEmpty(@Nullable Collection<?> collection, String message) {
+		if (CollectionUtils.isEmpty(collection)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that a collection contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * <pre class="code">
+	 * Assert.notEmpty(collection, () -&gt; "The " + collectionType + " collection must contain elements");
+	 * </pre>
+	 * @param collection the collection to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the collection is {@code null} or
+	 * contains no elements
+	 * @since 5.0
+	 */
+	public static void notEmpty(@Nullable Collection<?> collection, Supplier<String> messageSupplier) {
+		if (CollectionUtils.isEmpty(collection)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that a collection contains elements; that is, it must not be
+	 * {@code null} and must contain at least one element.
+	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Collection, String)}
+	 */
+	@Deprecated
+	public static void notEmpty(@Nullable Collection<?> collection) {
+		notEmpty(collection,
+				"[Assertion failed] - this collection must not be empty: it must contain at least 1 element");
+	}
+
+	/**
+	 * Assert that a collection contains no {@code null} elements.
+	 * <p>Note: Does not complain if the collection is empty!
+	 * <pre class="code">Assert.noNullElements(collection, "Collection must contain non-null elements");</pre>
+	 * @param collection the collection to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the collection contains a {@code null} element
+	 * @since 5.2
+	 */
+	public static void noNullElements(@Nullable Collection<?> collection, String message) {
+		if (collection != null) {
+			for (Object element : collection) {
+				if (element == null) {
+					throw new IllegalArgumentException(message);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Assert that a collection contains no {@code null} elements.
+	 * <p>Note: Does not complain if the collection is empty!
+	 * <pre class="code">
+	 * Assert.noNullElements(collection, () -&gt; "Collection " + collectionName + " must contain non-null elements");
+	 * </pre>
+	 * @param collection the collection to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the collection contains a {@code null} element
+	 * @since 5.2
+	 */
+	public static void noNullElements(@Nullable Collection<?> collection, Supplier<String> messageSupplier) {
+		if (collection != null) {
+			for (Object element : collection) {
+				if (element == null) {
+					throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Assert that a Map contains entries; that is, it must not be {@code null}
+	 * and must contain at least one entry.
+	 * <pre class="code">Assert.notEmpty(map, "Map must contain entries");</pre>
+	 * @param map the map to check
+	 * @param message the exception message to use if the assertion fails
+	 * @throws IllegalArgumentException if the map is {@code null} or contains no entries
+	 */
+	public static void notEmpty(@Nullable Map<?, ?> map, String message) {
+		if (CollectionUtils.isEmpty(map)) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+
+	/**
+	 * Assert that a Map contains entries; that is, it must not be {@code null}
+	 * and must contain at least one entry.
+	 * <pre class="code">
+	 * Assert.notEmpty(map, () -&gt; "The " + mapType + " map must contain entries");
+	 * </pre>
+	 * @param map the map to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails
+	 * @throws IllegalArgumentException if the map is {@code null} or contains no entries
+	 * @since 5.0
+	 */
+	public static void notEmpty(@Nullable Map<?, ?> map, Supplier<String> messageSupplier) {
+		if (CollectionUtils.isEmpty(map)) {
+			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that a Map contains entries; that is, it must not be {@code null}
+	 * and must contain at least one entry.
+	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Map, String)}
+	 */
+	@Deprecated
+	public static void notEmpty(@Nullable Map<?, ?> map) {
+		notEmpty(map, "[Assertion failed] - this map must not be empty; it must contain at least one entry");
+	}
+
+	/**
+	 * Assert that the provided object is an instance of the provided class.
+	 * <pre class="code">Assert.instanceOf(Foo.class, foo, "Foo expected");</pre>
+	 * @param type the type to check against
+	 * @param obj the object to check
+	 * @param message a message which will be prepended to provide further context.
+	 * If it is empty or ends in ":" or ";" or "," or ".", a full exception message
+	 * will be appended. If it ends in a space, the name of the offending object's
+	 * type will be appended. In any other case, a ":" with a space and the name
+	 * of the offending object's type will be appended.
+	 * @throws IllegalArgumentException if the object is not an instance of type
+	 */
+	public static void isInstanceOf(Class<?> type, @Nullable Object obj, String message) {
+		notNull(type, "Type to check against must not be null");
+		if (!type.isInstance(obj)) {
+			instanceCheckFailed(type, obj, message);
+		}
+	}
+
+	/**
+	 * Assert that the provided object is an instance of the provided class.
+	 * <pre class="code">
+	 * Assert.instanceOf(Foo.class, foo, () -&gt; "Processing " + Foo.class.getSimpleName() + ":");
+	 * </pre>
+	 * @param type the type to check against
+	 * @param obj the object to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails. See {@link #isInstanceOf(Class, Object, String)} for details.
+	 * @throws IllegalArgumentException if the object is not an instance of type
+	 * @since 5.0
+	 */
+	public static void isInstanceOf(Class<?> type, @Nullable Object obj, Supplier<String> messageSupplier) {
+		notNull(type, "Type to check against must not be null");
+		if (!type.isInstance(obj)) {
+			instanceCheckFailed(type, obj, nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that the provided object is an instance of the provided class.
+	 * <pre class="code">Assert.instanceOf(Foo.class, foo);</pre>
+	 * @param type the type to check against
+	 * @param obj the object to check
+	 * @throws IllegalArgumentException if the object is not an instance of type
+	 */
+	public static void isInstanceOf(Class<?> type, @Nullable Object obj) {
+		isInstanceOf(type, obj, "");
+	}
+
+	/**
+	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
+	 * <pre class="code">Assert.isAssignable(Number.class, myClass, "Number expected");</pre>
+	 * @param superType the supertype to check against
+	 * @param subType the subtype to check
+	 * @param message a message which will be prepended to provide further context.
+	 * If it is empty or ends in ":" or ";" or "," or ".", a full exception message
+	 * will be appended. If it ends in a space, the name of the offending subtype
+	 * will be appended. In any other case, a ":" with a space and the name of the
+	 * offending subtype will be appended.
+	 * @throws IllegalArgumentException if the classes are not assignable
+	 */
+	public static void isAssignable(Class<?> superType, @Nullable Class<?> subType, String message) {
+		notNull(superType, "Supertype to check against must not be null");
+		if (subType == null || !superType.isAssignableFrom(subType)) {
+			assignableCheckFailed(superType, subType, message);
+		}
+	}
+
+	/**
+	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
+	 * <pre class="code">
+	 * Assert.isAssignable(Number.class, myClass, () -&gt; "Processing " + myAttributeName + ":");
+	 * </pre>
+	 * @param superType the supertype to check against
+	 * @param subType the subtype to check
+	 * @param messageSupplier a supplier for the exception message to use if the
+	 * assertion fails. See {@link #isAssignable(Class, Class, String)} for details.
+	 * @throws IllegalArgumentException if the classes are not assignable
+	 * @since 5.0
+	 */
+	public static void isAssignable(Class<?> superType, @Nullable Class<?> subType, Supplier<String> messageSupplier) {
+		notNull(superType, "Supertype to check against must not be null");
+		if (subType == null || !superType.isAssignableFrom(subType)) {
+			assignableCheckFailed(superType, subType, nullSafeGet(messageSupplier));
+		}
+	}
+
+	/**
+	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
+	 * <pre class="code">Assert.isAssignable(Number.class, myClass);</pre>
+	 * @param superType the supertype to check
+	 * @param subType the subtype to check
+	 * @throws IllegalArgumentException if the classes are not assignable
+	 */
+	public static void isAssignable(Class<?> superType, Class<?> subType) {
+		isAssignable(superType, subType, "");
+	}
+
+
+	private static void instanceCheckFailed(Class<?> type, @Nullable Object obj, @Nullable String msg) {
+		String className = (obj != null ? obj.getClass().getName() : "null");
+		String result = "";
+		boolean defaultMessage = true;
+		if (StringUtils.hasLength(msg)) {
+			if (endsWithSeparator(msg)) {
+				result = msg + " ";
+			}
+			else {
+				result = messageWithTypeName(msg, className);
+				defaultMessage = false;
+			}
+		}
+		if (defaultMessage) {
+			result = result + ("Object of class [" + className + "] must be an instance of " + type);
+		}
+		throw new IllegalArgumentException(result);
+	}
+
+	private static void assignableCheckFailed(Class<?> superType, @Nullable Class<?> subType, @Nullable String msg) {
+		String result = "";
+		boolean defaultMessage = true;
+		if (StringUtils.hasLength(msg)) {
+			if (endsWithSeparator(msg)) {
+				result = msg + " ";
+			}
+			else {
+				result = messageWithTypeName(msg, subType);
+				defaultMessage = false;
+			}
+		}
+		if (defaultMessage) {
+			result = result + (subType + " is not assignable to " + superType);
+		}
+		throw new IllegalArgumentException(result);
+	}
+
+	private static boolean endsWithSeparator(String msg) {
+		return (msg.endsWith(":") || msg.endsWith(";") || msg.endsWith(",") || msg.endsWith("."));
+	}
+
+	private static String messageWithTypeName(String msg, @Nullable Object typeName) {
+		return msg + (msg.endsWith(" ") ? "" : ": ") + typeName;
+	}
+
+	@Nullable
+	private static String nullSafeGet(@Nullable Supplier<String> messageSupplier) {
+		return (messageSupplier != null ? messageSupplier.get() : null);
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
new file mode 100644
index 00000000..8a9762c6
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
@@ -0,0 +1,1449 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.beans.Introspector;
+import java.io.Closeable;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.StringJoiner;
+
+/**
+ * Miscellaneous {@code java.lang.Class} utility methods.
+ *
+ * <p>Mainly for internal use within the framework.
+ *
+ * @author Juergen Hoeller
+ * @author Keith Donald
+ * @author Rob Harrop
+ * @author Sam Brannen
+ * @author Sebastien Deleuze
+ * @since 1.1
+ * @see TypeUtils
+ * @see ReflectionUtils
+ */
+public abstract class ClassUtils {
+
+	/** Suffix for array class names: {@code "[]"}. */
+	public static final String ARRAY_SUFFIX = "[]";
+
+	/** Prefix for internal array class names: {@code "["}. */
+	private static final String INTERNAL_ARRAY_PREFIX = "[";
+
+	/** Prefix for internal non-primitive array class names: {@code "[L"}. */
+	private static final String NON_PRIMITIVE_ARRAY_PREFIX = "[L";
+
+	/** A reusable empty class array constant. */
+	private static final Class<?>[] EMPTY_CLASS_ARRAY = {};
+
+	/** The package separator character: {@code '.'}. */
+	private static final char PACKAGE_SEPARATOR = '.';
+
+	/** The path separator character: {@code '/'}. */
+	private static final char PATH_SEPARATOR = '/';
+
+	/** The nested class separator character: {@code '$'}. */
+	private static final char NESTED_CLASS_SEPARATOR = '$';
+
+	/** The CGLIB class separator: {@code "$$"}. */
+	public static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+	/** The ".class" file suffix. */
+	public static final String CLASS_FILE_SUFFIX = ".class";
+
+	/** Precomputed value for the combination of private, static and final modifiers. */
+	private static final int NON_OVERRIDABLE_MODIFIER = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL;
+
+	/** Precomputed value for the combination of public and protected modifiers. */
+	private static final int OVERRIDABLE_MODIFIER = Modifier.PUBLIC | Modifier.PROTECTED;
+
+
+	/**
+	 * Map with primitive wrapper type as key and corresponding primitive
+	 * type as value, for example: Integer.class -> int.class.
+	 */
+	private static final Map<Class<?>, Class<?>> primitiveWrapperTypeMap = new IdentityHashMap<>(9);
+
+	/**
+	 * Map with primitive type as key and corresponding wrapper
+	 * type as value, for example: int.class -> Integer.class.
+	 */
+	private static final Map<Class<?>, Class<?>> primitiveTypeToWrapperMap = new IdentityHashMap<>(9);
+
+	/**
+	 * Map with primitive type name as key and corresponding primitive
+	 * type as value, for example: "int" -> "int.class".
+	 */
+	private static final Map<String, Class<?>> primitiveTypeNameMap = new HashMap<>(32);
+
+	/**
+	 * Map with common Java language class name as key and corresponding Class as value.
+	 * Primarily for efficient deserialization of remote invocations.
+	 */
+	private static final Map<String, Class<?>> commonClassCache = new HashMap<>(64);
+
+	/**
+	 * Common Java language interfaces which are supposed to be ignored
+	 * when searching for 'primary' user-level interfaces.
+	 */
+	private static final Set<Class<?>> javaLanguageInterfaces;
+
+	/**
+	 * Cache for equivalent methods on an interface implemented by the declaring class.
+	 */
+	private static final Map<Method, Method> interfaceMethodCache = new ConcurrentReferenceHashMap<>(256);
+
+
+	static {
+		primitiveWrapperTypeMap.put(Boolean.class, boolean.class);
+		primitiveWrapperTypeMap.put(Byte.class, byte.class);
+		primitiveWrapperTypeMap.put(Character.class, char.class);
+		primitiveWrapperTypeMap.put(Double.class, double.class);
+		primitiveWrapperTypeMap.put(Float.class, float.class);
+		primitiveWrapperTypeMap.put(Integer.class, int.class);
+		primitiveWrapperTypeMap.put(Long.class, long.class);
+		primitiveWrapperTypeMap.put(Short.class, short.class);
+		primitiveWrapperTypeMap.put(Void.class, void.class);
+
+		// Map entry iteration is less expensive to initialize than forEach with lambdas
+		for (Map.Entry<Class<?>, Class<?>> entry : primitiveWrapperTypeMap.entrySet()) {
+			primitiveTypeToWrapperMap.put(entry.getValue(), entry.getKey());
+			registerCommonClasses(entry.getKey());
+		}
+
+		Set<Class<?>> primitiveTypes = new HashSet<>(32);
+		primitiveTypes.addAll(primitiveWrapperTypeMap.values());
+		Collections.addAll(primitiveTypes, boolean[].class, byte[].class, char[].class,
+				double[].class, float[].class, int[].class, long[].class, short[].class);
+		for (Class<?> primitiveType : primitiveTypes) {
+			primitiveTypeNameMap.put(primitiveType.getName(), primitiveType);
+		}
+
+		registerCommonClasses(Boolean[].class, Byte[].class, Character[].class, Double[].class,
+				Float[].class, Integer[].class, Long[].class, Short[].class);
+		registerCommonClasses(Number.class, Number[].class, String.class, String[].class,
+				Class.class, Class[].class, Object.class, Object[].class);
+		registerCommonClasses(Throwable.class, Exception.class, RuntimeException.class,
+				Error.class, StackTraceElement.class, StackTraceElement[].class);
+		registerCommonClasses(Enum.class, Iterable.class, Iterator.class, Enumeration.class,
+				Collection.class, List.class, Set.class, Map.class, Map.Entry.class, Optional.class);
+
+		Class<?>[] javaLanguageInterfaceArray = {Serializable.class, Externalizable.class,
+				Closeable.class, AutoCloseable.class, Cloneable.class, Comparable.class};
+		registerCommonClasses(javaLanguageInterfaceArray);
+		javaLanguageInterfaces = new HashSet<>(Arrays.asList(javaLanguageInterfaceArray));
+	}
+
+
+	/**
+	 * Register the given common classes with the ClassUtils cache.
+	 */
+	private static void registerCommonClasses(Class<?>... commonClasses) {
+		for (Class<?> clazz : commonClasses) {
+			commonClassCache.put(clazz.getName(), clazz);
+		}
+	}
+
+	/**
+	 * Return the default ClassLoader to use: typically the thread context
+	 * ClassLoader, if available; the ClassLoader that loaded the ClassUtils
+	 * class will be used as fallback.
+	 * <p>Call this method if you intend to use the thread context ClassLoader
+	 * in a scenario where you clearly prefer a non-null ClassLoader reference:
+	 * for example, for class path resource loading (but not necessarily for
+	 * {@code Class.forName}, which accepts a {@code null} ClassLoader
+	 * reference as well).
+	 * @return the default ClassLoader (only {@code null} if even the system
+	 * ClassLoader isn't accessible)
+	 * @see Thread#getContextClassLoader()
+	 * @see ClassLoader#getSystemClassLoader()
+	 */
+	@Nullable
+	public static ClassLoader getDefaultClassLoader() {
+		ClassLoader cl = null;
+		try {
+			cl = Thread.currentThread().getContextClassLoader();
+		}
+		catch (Throwable ex) {
+			// Cannot access thread context ClassLoader - falling back...
+		}
+		if (cl == null) {
+			// No thread context class loader -> use class loader of this class.
+			cl = ClassUtils.class.getClassLoader();
+			if (cl == null) {
+				// getClassLoader() returning null indicates the bootstrap ClassLoader
+				try {
+					cl = ClassLoader.getSystemClassLoader();
+				}
+				catch (Throwable ex) {
+					// Cannot access system ClassLoader - oh well, maybe the caller can live with null...
+				}
+			}
+		}
+		return cl;
+	}
+
+	/**
+	 * Override the thread context ClassLoader with the environment's bean ClassLoader
+	 * if necessary, i.e. if the bean ClassLoader is not equivalent to the thread
+	 * context ClassLoader already.
+	 * @param classLoaderToUse the actual ClassLoader to use for the thread context
+	 * @return the original thread context ClassLoader, or {@code null} if not overridden
+	 */
+	@Nullable
+	public static ClassLoader overrideThreadContextClassLoader(@Nullable ClassLoader classLoaderToUse) {
+		Thread currentThread = Thread.currentThread();
+		ClassLoader threadContextClassLoader = currentThread.getContextClassLoader();
+		if (classLoaderToUse != null && !classLoaderToUse.equals(threadContextClassLoader)) {
+			currentThread.setContextClassLoader(classLoaderToUse);
+			return threadContextClassLoader;
+		}
+		else {
+			return null;
+		}
+	}
+
+	/**
+	 * Replacement for {@code Class.forName()} that also returns Class instances
+	 * for primitives (e.g. "int") and array class names (e.g. "String[]").
+	 * Furthermore, it is also capable of resolving nested class names in Java source
+	 * style (e.g. "java.lang.Thread.State" instead of "java.lang.Thread$State").
+	 * @param name the name of the Class
+	 * @param classLoader the class loader to use
+	 * (can be {@code null}, which indicates the default class loader)
+	 * @return a class instance for the supplied name
+	 * @throws ClassNotFoundException if the class was not found
+	 * @throws LinkageError if the class file could not be loaded
+	 * @see Class#forName(String, boolean, ClassLoader)
+	 */
+	public static Class<?> forName(String name, @Nullable ClassLoader classLoader)
+			throws ClassNotFoundException, LinkageError {
+
+		Assert.notNull(name, "Name must not be null");
+
+		Class<?> clazz = resolvePrimitiveClassName(name);
+		if (clazz == null) {
+			clazz = commonClassCache.get(name);
+		}
+		if (clazz != null) {
+			return clazz;
+		}
+
+		// "java.lang.String[]" style arrays
+		if (name.endsWith(ARRAY_SUFFIX)) {
+			String elementClassName = name.substring(0, name.length() - ARRAY_SUFFIX.length());
+			Class<?> elementClass = forName(elementClassName, classLoader);
+			return Array.newInstance(elementClass, 0).getClass();
+		}
+
+		// "[Ljava.lang.String;" style arrays
+		if (name.startsWith(NON_PRIMITIVE_ARRAY_PREFIX) && name.endsWith(";")) {
+			String elementName = name.substring(NON_PRIMITIVE_ARRAY_PREFIX.length(), name.length() - 1);
+			Class<?> elementClass = forName(elementName, classLoader);
+			return Array.newInstance(elementClass, 0).getClass();
+		}
+
+		// "[[I" or "[[Ljava.lang.String;" style arrays
+		if (name.startsWith(INTERNAL_ARRAY_PREFIX)) {
+			String elementName = name.substring(INTERNAL_ARRAY_PREFIX.length());
+			Class<?> elementClass = forName(elementName, classLoader);
+			return Array.newInstance(elementClass, 0).getClass();
+		}
+
+		ClassLoader clToUse = classLoader;
+		if (clToUse == null) {
+			clToUse = getDefaultClassLoader();
+		}
+		try {
+			return Class.forName(name, false, clToUse);
+		}
+		catch (ClassNotFoundException ex) {
+			int lastDotIndex = name.lastIndexOf(PACKAGE_SEPARATOR);
+			if (lastDotIndex != -1) {
+				String nestedClassName =
+						name.substring(0, lastDotIndex) + NESTED_CLASS_SEPARATOR + name.substring(lastDotIndex + 1);
+				try {
+					return Class.forName(nestedClassName, false, clToUse);
+				}
+				catch (ClassNotFoundException ex2) {
+					// Swallow - let original exception get through
+				}
+			}
+			throw ex;
+		}
+	}
+
+	/**
+	 * Resolve the given class name into a Class instance. Supports
+	 * primitives (like "int") and array class names (like "String[]").
+	 * <p>This is effectively equivalent to the {@code forName}
+	 * method with the same arguments, with the only difference being
+	 * the exceptions thrown in case of class loading failure.
+	 * @param className the name of the Class
+	 * @param classLoader the class loader to use
+	 * (can be {@code null}, which indicates the default class loader)
+	 * @return a class instance for the supplied name
+	 * @throws IllegalArgumentException if the class name was not resolvable
+	 * (that is, the class could not be found or the class file could not be loaded)
+	 * @throws IllegalStateException if the corresponding class is resolvable but
+	 * there was a readability mismatch in the inheritance hierarchy of the class
+	 * (typically a missing dependency declaration in a Jigsaw module definition
+	 * for a superclass or interface implemented by the class to be loaded here)
+	 * @see #forName(String, ClassLoader)
+	 */
+	public static Class<?> resolveClassName(String className, @Nullable ClassLoader classLoader)
+			throws IllegalArgumentException {
+
+		try {
+			return forName(className, classLoader);
+		}
+		catch (IllegalAccessError err) {
+			throw new IllegalStateException("Readability mismatch in inheritance hierarchy of class [" +
+					className + "]: " + err.getMessage(), err);
+		}
+		catch (LinkageError err) {
+			throw new IllegalArgumentException("Unresolvable class definition for class [" + className + "]", err);
+		}
+		catch (ClassNotFoundException ex) {
+			throw new IllegalArgumentException("Could not find class [" + className + "]", ex);
+		}
+	}
+
+	/**
+	 * Determine whether the {@link Class} identified by the supplied name is present
+	 * and can be loaded. Will return {@code false} if either the class or
+	 * one of its dependencies is not present or cannot be loaded.
+	 * @param className the name of the class to check
+	 * @param classLoader the class loader to use
+	 * (can be {@code null} which indicates the default class loader)
+	 * @return whether the specified class is present (including all of its
+	 * superclasses and interfaces)
+	 * @throws IllegalStateException if the corresponding class is resolvable but
+	 * there was a readability mismatch in the inheritance hierarchy of the class
+	 * (typically a missing dependency declaration in a Jigsaw module definition
+	 * for a superclass or interface implemented by the class to be checked here)
+	 */
+	public static boolean isPresent(String className, @Nullable ClassLoader classLoader) {
+		try {
+			forName(className, classLoader);
+			return true;
+		}
+		catch (IllegalAccessError err) {
+			throw new IllegalStateException("Readability mismatch in inheritance hierarchy of class [" +
+					className + "]: " + err.getMessage(), err);
+		}
+		catch (Throwable ex) {
+			// Typically ClassNotFoundException or NoClassDefFoundError...
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether the given class is visible in the given ClassLoader.
+	 * @param clazz the class to check (typically an interface)
+	 * @param classLoader the ClassLoader to check against
+	 * (can be {@code null} in which case this method will always return {@code true})
+	 */
+	public static boolean isVisible(Class<?> clazz, @Nullable ClassLoader classLoader) {
+		if (classLoader == null) {
+			return true;
+		}
+		try {
+			if (clazz.getClassLoader() == classLoader) {
+				return true;
+			}
+		}
+		catch (SecurityException ex) {
+			// Fall through to loadable check below
+		}
+
+		// Visible if same Class can be loaded from given ClassLoader
+		return isLoadable(clazz, classLoader);
+	}
+
+	/**
+	 * Check whether the given class is cache-safe in the given context,
+	 * i.e. whether it is loaded by the given ClassLoader or a parent of it.
+	 * @param clazz the class to analyze
+	 * @param classLoader the ClassLoader to potentially cache metadata in
+	 * (can be {@code null} which indicates the system class loader)
+	 */
+	public static boolean isCacheSafe(Class<?> clazz, @Nullable ClassLoader classLoader) {
+		Assert.notNull(clazz, "Class must not be null");
+		try {
+			ClassLoader target = clazz.getClassLoader();
+			// Common cases
+			if (target == classLoader || target == null) {
+				return true;
+			}
+			if (classLoader == null) {
+				return false;
+			}
+			// Check for match in ancestors -> positive
+			ClassLoader current = classLoader;
+			while (current != null) {
+				current = current.getParent();
+				if (current == target) {
+					return true;
+				}
+			}
+			// Check for match in children -> negative
+			while (target != null) {
+				target = target.getParent();
+				if (target == classLoader) {
+					return false;
+				}
+			}
+		}
+		catch (SecurityException ex) {
+			// Fall through to loadable check below
+		}
+
+		// Fallback for ClassLoaders without parent/child relationship:
+		// safe if same Class can be loaded from given ClassLoader
+		return (classLoader != null && isLoadable(clazz, classLoader));
+	}
+
+	/**
+	 * Check whether the given class is loadable in the given ClassLoader.
+	 * @param clazz the class to check (typically an interface)
+	 * @param classLoader the ClassLoader to check against
+	 * @since 5.0.6
+	 */
+	private static boolean isLoadable(Class<?> clazz, ClassLoader classLoader) {
+		try {
+			return (clazz == classLoader.loadClass(clazz.getName()));
+			// Else: different class with same name found
+		}
+		catch (ClassNotFoundException ex) {
+			// No corresponding class found at all
+			return false;
+		}
+	}
+
+	/**
+	 * Resolve the given class name as primitive class, if appropriate,
+	 * according to the JVM's naming rules for primitive classes.
+	 * <p>Also supports the JVM's internal class names for primitive arrays.
+	 * Does <i>not</i> support the "[]" suffix notation for primitive arrays;
+	 * this is only supported by {@link #forName(String, ClassLoader)}.
+	 * @param name the name of the potentially primitive class
+	 * @return the primitive class, or {@code null} if the name does not denote
+	 * a primitive class or primitive array class
+	 */
+	@Nullable
+	public static Class<?> resolvePrimitiveClassName(@Nullable String name) {
+		Class<?> result = null;
+		// Most class names will be quite long, considering that they
+		// SHOULD sit in a package, so a length check is worthwhile.
+		if (name != null && name.length() <= 7) {
+			// Could be a primitive - likely.
+			result = primitiveTypeNameMap.get(name);
+		}
+		return result;
+	}
+
+	/**
+	 * Check if the given class represents a primitive wrapper,
+	 * i.e. Boolean, Byte, Character, Short, Integer, Long, Float, Double, or
+	 * Void.
+	 * @param clazz the class to check
+	 * @return whether the given class is a primitive wrapper class
+	 */
+	public static boolean isPrimitiveWrapper(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return primitiveWrapperTypeMap.containsKey(clazz);
+	}
+
+	/**
+	 * Check if the given class represents a primitive (i.e. boolean, byte,
+	 * char, short, int, long, float, or double), {@code void}, or a wrapper for
+	 * those types (i.e. Boolean, Byte, Character, Short, Integer, Long, Float,
+	 * Double, or Void).
+	 * @param clazz the class to check
+	 * @return {@code true} if the given class represents a primitive, void, or
+	 * a wrapper class
+	 */
+	public static boolean isPrimitiveOrWrapper(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return (clazz.isPrimitive() || isPrimitiveWrapper(clazz));
+	}
+
+	/**
+	 * Check if the given class represents an array of primitives,
+	 * i.e. boolean, byte, char, short, int, long, float, or double.
+	 * @param clazz the class to check
+	 * @return whether the given class is a primitive array class
+	 */
+	public static boolean isPrimitiveArray(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return (clazz.isArray() && clazz.getComponentType().isPrimitive());
+	}
+
+	/**
+	 * Check if the given class represents an array of primitive wrappers,
+	 * i.e. Boolean, Byte, Character, Short, Integer, Long, Float, or Double.
+	 * @param clazz the class to check
+	 * @return whether the given class is a primitive wrapper array class
+	 */
+	public static boolean isPrimitiveWrapperArray(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return (clazz.isArray() && isPrimitiveWrapper(clazz.getComponentType()));
+	}
+
+	/**
+	 * Resolve the given class if it is a primitive class,
+	 * returning the corresponding primitive wrapper type instead.
+	 * @param clazz the class to check
+	 * @return the original class, or a primitive wrapper for the original primitive type
+	 */
+	public static Class<?> resolvePrimitiveIfNecessary(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return (clazz.isPrimitive() && clazz != void.class ? primitiveTypeToWrapperMap.get(clazz) : clazz);
+	}
+
+	/**
+	 * Check if the right-hand side type may be assigned to the left-hand side
+	 * type, assuming setting by reflection. Considers primitive wrapper
+	 * classes as assignable to the corresponding primitive types.
+	 * @param lhsType the target type (left-hand side (LHS) type)
+	 * @param rhsType the value type (right-hand side (RHS) type) that should
+	 * be assigned to the target type
+	 * @return {@code true} if {@code rhsType} is assignable to {@code lhsType}
+	 * @see TypeUtils#isAssignable(java.lang.reflect.Type, java.lang.reflect.Type)
+	 */
+	public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
+		Assert.notNull(lhsType, "Left-hand side type must not be null");
+		Assert.notNull(rhsType, "Right-hand side type must not be null");
+		if (lhsType.isAssignableFrom(rhsType)) {
+			return true;
+		}
+		if (lhsType.isPrimitive()) {
+			Class<?> resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
+			return (lhsType == resolvedPrimitive);
+		}
+		else {
+			Class<?> resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
+			return (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper));
+		}
+	}
+
+	/**
+	 * Determine if the given type is assignable from the given value,
+	 * assuming setting by reflection. Considers primitive wrapper classes
+	 * as assignable to the corresponding primitive types.
+	 * @param type the target type
+	 * @param value the value that should be assigned to the type
+	 * @return if the type is assignable from the value
+	 */
+	public static boolean isAssignableValue(Class<?> type, @Nullable Object value) {
+		Assert.notNull(type, "Type must not be null");
+		return (value != null ? isAssignable(type, value.getClass()) : !type.isPrimitive());
+	}
+
+	/**
+	 * Convert a "/"-based resource path to a "."-based fully qualified class name.
+	 * @param resourcePath the resource path pointing to a class
+	 * @return the corresponding fully qualified class name
+	 */
+	public static String convertResourcePathToClassName(String resourcePath) {
+		Assert.notNull(resourcePath, "Resource path must not be null");
+		return resourcePath.replace(PATH_SEPARATOR, PACKAGE_SEPARATOR);
+	}
+
+	/**
+	 * Convert a "."-based fully qualified class name to a "/"-based resource path.
+	 * @param className the fully qualified class name
+	 * @return the corresponding resource path, pointing to the class
+	 */
+	public static String convertClassNameToResourcePath(String className) {
+		Assert.notNull(className, "Class name must not be null");
+		return className.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
+	}
+
+	/**
+	 * Return a path suitable for use with {@code ClassLoader.getResource}
+	 * (also suitable for use with {@code Class.getResource} by prepending a
+	 * slash ('/') to the return value). Built by taking the package of the specified
+	 * class file, converting all dots ('.') to slashes ('/'), adding a trailing slash
+	 * if necessary, and concatenating the specified resource name to this.
+	 * <br/>As such, this function may be used to build a path suitable for
+	 * loading a resource file that is in the same package as a class file,
+	 * although {@link org.springframework.core.io.ClassPathResource} is usually
+	 * even more convenient.
+	 * @param clazz the Class whose package will be used as the base
+	 * @param resourceName the resource name to append. A leading slash is optional.
+	 * @return the built-up resource path
+	 * @see ClassLoader#getResource
+	 * @see Class#getResource
+	 */
+	public static String addResourcePathToPackagePath(Class<?> clazz, String resourceName) {
+		Assert.notNull(resourceName, "Resource name must not be null");
+		if (!resourceName.startsWith("/")) {
+			return classPackageAsResourcePath(clazz) + '/' + resourceName;
+		}
+		return classPackageAsResourcePath(clazz) + resourceName;
+	}
+
+	/**
+	 * Given an input class object, return a string which consists of the
+	 * class's package name as a pathname, i.e., all dots ('.') are replaced by
+	 * slashes ('/'). Neither a leading nor trailing slash is added. The result
+	 * could be concatenated with a slash and the name of a resource and fed
+	 * directly to {@code ClassLoader.getResource()}. For it to be fed to
+	 * {@code Class.getResource} instead, a leading slash would also have
+	 * to be prepended to the returned value.
+	 * @param clazz the input class. A {@code null} value or the default
+	 * (empty) package will result in an empty string ("") being returned.
+	 * @return a path which represents the package name
+	 * @see ClassLoader#getResource
+	 * @see Class#getResource
+	 */
+	public static String classPackageAsResourcePath(@Nullable Class<?> clazz) {
+		if (clazz == null) {
+			return "";
+		}
+		String className = clazz.getName();
+		int packageEndIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
+		if (packageEndIndex == -1) {
+			return "";
+		}
+		String packageName = className.substring(0, packageEndIndex);
+		return packageName.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
+	}
+
+	/**
+	 * Build a String that consists of the names of the classes/interfaces
+	 * in the given array.
+	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
+	 * the "class "/"interface " prefix before every class name.
+	 * @param classes an array of Class objects
+	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
+	 * @see java.util.AbstractCollection#toString()
+	 */
+	public static String classNamesToString(Class<?>... classes) {
+		return classNamesToString(Arrays.asList(classes));
+	}
+
+	/**
+	 * Build a String that consists of the names of the classes/interfaces
+	 * in the given collection.
+	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
+	 * the "class "/"interface " prefix before every class name.
+	 * @param classes a Collection of Class objects (can be {@code null})
+	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
+	 * @see java.util.AbstractCollection#toString()
+	 */
+	public static String classNamesToString(@Nullable Collection<Class<?>> classes) {
+		if (CollectionUtils.isEmpty(classes)) {
+			return "[]";
+		}
+		StringJoiner stringJoiner = new StringJoiner(", ", "[", "]");
+		for (Class<?> clazz : classes) {
+			stringJoiner.add(clazz.getName());
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Copy the given {@code Collection} into a {@code Class} array.
+	 * <p>The {@code Collection} must contain {@code Class} elements only.
+	 * @param collection the {@code Collection} to copy
+	 * @return the {@code Class} array
+	 * @since 3.1
+	 * @see StringUtils#toStringArray
+	 */
+	public static Class<?>[] toClassArray(@Nullable Collection<Class<?>> collection) {
+		return (!CollectionUtils.isEmpty(collection) ? collection.toArray(EMPTY_CLASS_ARRAY) : EMPTY_CLASS_ARRAY);
+	}
+
+	/**
+	 * Return all interfaces that the given instance implements as an array,
+	 * including ones implemented by superclasses.
+	 * @param instance the instance to analyze for interfaces
+	 * @return all interfaces that the given instance implements as an array
+	 */
+	public static Class<?>[] getAllInterfaces(Object instance) {
+		Assert.notNull(instance, "Instance must not be null");
+		return getAllInterfacesForClass(instance.getClass());
+	}
+
+	/**
+	 * Return all interfaces that the given class implements as an array,
+	 * including ones implemented by superclasses.
+	 * <p>If the class itself is an interface, it gets returned as sole interface.
+	 * @param clazz the class to analyze for interfaces
+	 * @return all interfaces that the given object implements as an array
+	 */
+	public static Class<?>[] getAllInterfacesForClass(Class<?> clazz) {
+		return getAllInterfacesForClass(clazz, null);
+	}
+
+	/**
+	 * Return all interfaces that the given class implements as an array,
+	 * including ones implemented by superclasses.
+	 * <p>If the class itself is an interface, it gets returned as sole interface.
+	 * @param clazz the class to analyze for interfaces
+	 * @param classLoader the ClassLoader that the interfaces need to be visible in
+	 * (can be {@code null} when accepting all declared interfaces)
+	 * @return all interfaces that the given object implements as an array
+	 */
+	public static Class<?>[] getAllInterfacesForClass(Class<?> clazz, @Nullable ClassLoader classLoader) {
+		return toClassArray(getAllInterfacesForClassAsSet(clazz, classLoader));
+	}
+
+	/**
+	 * Return all interfaces that the given instance implements as a Set,
+	 * including ones implemented by superclasses.
+	 * @param instance the instance to analyze for interfaces
+	 * @return all interfaces that the given instance implements as a Set
+	 */
+	public static Set<Class<?>> getAllInterfacesAsSet(Object instance) {
+		Assert.notNull(instance, "Instance must not be null");
+		return getAllInterfacesForClassAsSet(instance.getClass());
+	}
+
+	/**
+	 * Return all interfaces that the given class implements as a Set,
+	 * including ones implemented by superclasses.
+	 * <p>If the class itself is an interface, it gets returned as sole interface.
+	 * @param clazz the class to analyze for interfaces
+	 * @return all interfaces that the given object implements as a Set
+	 */
+	public static Set<Class<?>> getAllInterfacesForClassAsSet(Class<?> clazz) {
+		return getAllInterfacesForClassAsSet(clazz, null);
+	}
+
+	/**
+	 * Return all interfaces that the given class implements as a Set,
+	 * including ones implemented by superclasses.
+	 * <p>If the class itself is an interface, it gets returned as sole interface.
+	 * @param clazz the class to analyze for interfaces
+	 * @param classLoader the ClassLoader that the interfaces need to be visible in
+	 * (can be {@code null} when accepting all declared interfaces)
+	 * @return all interfaces that the given object implements as a Set
+	 */
+	public static Set<Class<?>> getAllInterfacesForClassAsSet(Class<?> clazz, @Nullable ClassLoader classLoader) {
+		Assert.notNull(clazz, "Class must not be null");
+		if (clazz.isInterface() && isVisible(clazz, classLoader)) {
+			return Collections.singleton(clazz);
+		}
+		Set<Class<?>> interfaces = new LinkedHashSet<>();
+		Class<?> current = clazz;
+		while (current != null) {
+			Class<?>[] ifcs = current.getInterfaces();
+			for (Class<?> ifc : ifcs) {
+				if (isVisible(ifc, classLoader)) {
+					interfaces.add(ifc);
+				}
+			}
+			current = current.getSuperclass();
+		}
+		return interfaces;
+	}
+
+	/**
+	 * Create a composite interface Class for the given interfaces,
+	 * implementing the given interfaces in one single Class.
+	 * <p>This implementation builds a JDK proxy class for the given interfaces.
+	 * @param interfaces the interfaces to merge
+	 * @param classLoader the ClassLoader to create the composite Class in
+	 * @return the merged interface as Class
+	 * @throws IllegalArgumentException if the specified interfaces expose
+	 * conflicting method signatures (or a similar constraint is violated)
+	 * @see Proxy#getProxyClass
+	 */
+	@SuppressWarnings("deprecation")  // on JDK 9
+	public static Class<?> createCompositeInterface(Class<?>[] interfaces, @Nullable ClassLoader classLoader) {
+		Assert.notEmpty(interfaces, "Interface array must not be empty");
+		return Proxy.getProxyClass(classLoader, interfaces);
+	}
+
+	/**
+	 * Determine the common ancestor of the given classes, if any.
+	 * @param clazz1 the class to introspect
+	 * @param clazz2 the other class to introspect
+	 * @return the common ancestor (i.e. common superclass, one interface
+	 * extending the other), or {@code null} if none found. If any of the
+	 * given classes is {@code null}, the other class will be returned.
+	 * @since 3.2.6
+	 */
+	@Nullable
+	public static Class<?> determineCommonAncestor(@Nullable Class<?> clazz1, @Nullable Class<?> clazz2) {
+		if (clazz1 == null) {
+			return clazz2;
+		}
+		if (clazz2 == null) {
+			return clazz1;
+		}
+		if (clazz1.isAssignableFrom(clazz2)) {
+			return clazz1;
+		}
+		if (clazz2.isAssignableFrom(clazz1)) {
+			return clazz2;
+		}
+		Class<?> ancestor = clazz1;
+		do {
+			ancestor = ancestor.getSuperclass();
+			if (ancestor == null || Object.class == ancestor) {
+				return null;
+			}
+		}
+		while (!ancestor.isAssignableFrom(clazz2));
+		return ancestor;
+	}
+
+	/**
+	 * Determine whether the given interface is a common Java language interface:
+	 * {@link Serializable}, {@link Externalizable}, {@link Closeable}, {@link AutoCloseable},
+	 * {@link Cloneable}, {@link Comparable} - all of which can be ignored when looking
+	 * for 'primary' user-level interfaces. Common characteristics: no service-level
+	 * operations, no bean property methods, no default methods.
+	 * @param ifc the interface to check
+	 * @since 5.0.3
+	 */
+	public static boolean isJavaLanguageInterface(Class<?> ifc) {
+		return javaLanguageInterfaces.contains(ifc);
+	}
+
+	/**
+	 * Determine if the supplied class is an <em>inner class</em>,
+	 * i.e. a non-static member of an enclosing class.
+	 * @return {@code true} if the supplied class is an inner class
+	 * @since 5.0.5
+	 * @see Class#isMemberClass()
+	 */
+	public static boolean isInnerClass(Class<?> clazz) {
+		return (clazz.isMemberClass() && !Modifier.isStatic(clazz.getModifiers()));
+	}
+
+	/**
+	 * Determine if the supplied {@link Class} is a JVM-generated implementation
+	 * class for a lambda expression or method reference.
+	 * <p>This method makes a best-effort attempt at determining this, based on
+	 * checks that work on modern, mainstream JVMs.
+	 * @param clazz the class to check
+	 * @return {@code true} if the class is a lambda implementation class
+	 * @since 5.3.19
+	 */
+	public static boolean isLambdaClass(Class<?> clazz) {
+		return (clazz.isSynthetic() && (clazz.getSuperclass() == Object.class) &&
+				(clazz.getInterfaces().length > 0) && clazz.getName().contains("$$Lambda"));
+	}
+
+	/**
+	 * Check whether the given object is a CGLIB proxy.
+	 * @param object the object to check
+	 * @see org.springframework.aop.support.AopUtils#isCglibProxy(Object)
+	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
+	 * such as for a Spring AOP proxy
+	 */
+	@Deprecated
+	public static boolean isCglibProxy(Object object) {
+		return isCglibProxyClass(object.getClass());
+	}
+
+	/**
+	 * Check whether the specified class is a CGLIB-generated class.
+	 * @param clazz the class to check
+	 * @see #getUserClass(Class)
+	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
+	 * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClass(@Nullable Class<?> clazz) {
+		return (clazz != null && isCglibProxyClassName(clazz.getName()));
+	}
+
+	/**
+	 * Check whether the specified class name is a CGLIB-generated class.
+	 * @param className the class name to check
+	 * @see #CGLIB_CLASS_SEPARATOR
+	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
+	 * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClassName(@Nullable String className) {
+		return (className != null && className.contains(CGLIB_CLASS_SEPARATOR));
+	}
+
+	/**
+	 * Return the user-defined class for the given instance: usually simply
+	 * the class of the given instance, but the original class in case of a
+	 * CGLIB-generated subclass.
+	 * @param instance the instance to check
+	 * @return the user-defined class
+	 */
+	public static Class<?> getUserClass(Object instance) {
+		Assert.notNull(instance, "Instance must not be null");
+		return getUserClass(instance.getClass());
+	}
+
+	/**
+	 * Return the user-defined class for the given class: usually simply the given
+	 * class, but the original class in case of a CGLIB-generated subclass.
+	 * @param clazz the class to check
+	 * @return the user-defined class
+	 * @see #CGLIB_CLASS_SEPARATOR
+	 */
+	public static Class<?> getUserClass(Class<?> clazz) {
+		if (clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
+			Class<?> superclass = clazz.getSuperclass();
+			if (superclass != null && superclass != Object.class) {
+				return superclass;
+			}
+		}
+		return clazz;
+	}
+
+	/**
+	 * Return a descriptive name for the given object's type: usually simply
+	 * the class name, but component type class name + "[]" for arrays,
+	 * and an appended list of implemented interfaces for JDK proxies.
+	 * @param value the value to introspect
+	 * @return the qualified name of the class
+	 */
+	@Nullable
+	public static String getDescriptiveType(@Nullable Object value) {
+		if (value == null) {
+			return null;
+		}
+		Class<?> clazz = value.getClass();
+		if (Proxy.isProxyClass(clazz)) {
+			String prefix = clazz.getName() + " implementing ";
+			StringJoiner result = new StringJoiner(",", prefix, "");
+			for (Class<?> ifc : clazz.getInterfaces()) {
+				result.add(ifc.getName());
+			}
+			return result.toString();
+		}
+		else {
+			return clazz.getTypeName();
+		}
+	}
+
+	/**
+	 * Check whether the given class matches the user-specified type name.
+	 * @param clazz the class to check
+	 * @param typeName the type name to match
+	 */
+	public static boolean matchesTypeName(Class<?> clazz, @Nullable String typeName) {
+		return (typeName != null &&
+				(typeName.equals(clazz.getTypeName()) || typeName.equals(clazz.getSimpleName())));
+	}
+
+	/**
+	 * Get the class name without the qualified package name.
+	 * @param className the className to get the short name for
+	 * @return the class name of the class without the package name
+	 * @throws IllegalArgumentException if the className is empty
+	 */
+	public static String getShortName(String className) {
+		Assert.hasLength(className, "Class name must not be empty");
+		int lastDotIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
+		int nameEndIndex = className.indexOf(CGLIB_CLASS_SEPARATOR);
+		if (nameEndIndex == -1) {
+			nameEndIndex = className.length();
+		}
+		String shortName = className.substring(lastDotIndex + 1, nameEndIndex);
+		shortName = shortName.replace(NESTED_CLASS_SEPARATOR, PACKAGE_SEPARATOR);
+		return shortName;
+	}
+
+	/**
+	 * Get the class name without the qualified package name.
+	 * @param clazz the class to get the short name for
+	 * @return the class name of the class without the package name
+	 */
+	public static String getShortName(Class<?> clazz) {
+		return getShortName(getQualifiedName(clazz));
+	}
+
+	/**
+	 * Return the short string name of a Java class in uncapitalized JavaBeans
+	 * property format. Strips the outer class name in case of a nested class.
+	 * @param clazz the class
+	 * @return the short name rendered in a standard JavaBeans property format
+	 * @see Introspector#decapitalize(String)
+	 */
+	public static String getShortNameAsProperty(Class<?> clazz) {
+		String shortName = getShortName(clazz);
+		int dotIndex = shortName.lastIndexOf(PACKAGE_SEPARATOR);
+		shortName = (dotIndex != -1 ? shortName.substring(dotIndex + 1) : shortName);
+		return Introspector.decapitalize(shortName);
+	}
+
+	/**
+	 * Determine the name of the class file, relative to the containing
+	 * package: e.g. "String.class"
+	 * @param clazz the class
+	 * @return the file name of the ".class" file
+	 */
+	public static String getClassFileName(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		String className = clazz.getName();
+		int lastDotIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
+		return className.substring(lastDotIndex + 1) + CLASS_FILE_SUFFIX;
+	}
+
+	/**
+	 * Determine the name of the package of the given class,
+	 * e.g. "java.lang" for the {@code java.lang.String} class.
+	 * @param clazz the class
+	 * @return the package name, or the empty String if the class
+	 * is defined in the default package
+	 */
+	public static String getPackageName(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return getPackageName(clazz.getName());
+	}
+
+	/**
+	 * Determine the name of the package of the given fully-qualified class name,
+	 * e.g. "java.lang" for the {@code java.lang.String} class name.
+	 * @param fqClassName the fully-qualified class name
+	 * @return the package name, or the empty String if the class
+	 * is defined in the default package
+	 */
+	public static String getPackageName(String fqClassName) {
+		Assert.notNull(fqClassName, "Class name must not be null");
+		int lastDotIndex = fqClassName.lastIndexOf(PACKAGE_SEPARATOR);
+		return (lastDotIndex != -1 ? fqClassName.substring(0, lastDotIndex) : "");
+	}
+
+	/**
+	 * Return the qualified name of the given class: usually simply
+	 * the class name, but component type class name + "[]" for arrays.
+	 * @param clazz the class
+	 * @return the qualified name of the class
+	 */
+	public static String getQualifiedName(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		return clazz.getTypeName();
+	}
+
+	/**
+	 * Return the qualified name of the given method, consisting of
+	 * fully qualified interface/class name + "." + method name.
+	 * @param method the method
+	 * @return the qualified name of the method
+	 */
+	public static String getQualifiedMethodName(Method method) {
+		return getQualifiedMethodName(method, null);
+	}
+
+	/**
+	 * Return the qualified name of the given method, consisting of
+	 * fully qualified interface/class name + "." + method name.
+	 * @param method the method
+	 * @param clazz the clazz that the method is being invoked on
+	 * (can be {@code null} to indicate the method's declaring class)
+	 * @return the qualified name of the method
+	 * @since 4.3.4
+	 */
+	public static String getQualifiedMethodName(Method method, @Nullable Class<?> clazz) {
+		Assert.notNull(method, "Method must not be null");
+		return (clazz != null ? clazz : method.getDeclaringClass()).getName() + '.' + method.getName();
+	}
+
+	/**
+	 * Determine whether the given class has a public constructor with the given signature.
+	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
+	 * @param clazz the clazz to analyze
+	 * @param paramTypes the parameter types of the method
+	 * @return whether the class has a corresponding constructor
+	 * @see Class#getConstructor
+	 */
+	public static boolean hasConstructor(Class<?> clazz, Class<?>... paramTypes) {
+		return (getConstructorIfAvailable(clazz, paramTypes) != null);
+	}
+
+	/**
+	 * Determine whether the given class has a public constructor with the given signature,
+	 * and return it if available (else return {@code null}).
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
+	 * @param clazz the clazz to analyze
+	 * @param paramTypes the parameter types of the method
+	 * @return the constructor, or {@code null} if not found
+	 * @see Class#getConstructor
+	 */
+	@Nullable
+	public static <T> Constructor<T> getConstructorIfAvailable(Class<T> clazz, Class<?>... paramTypes) {
+		Assert.notNull(clazz, "Class must not be null");
+		try {
+			return clazz.getConstructor(paramTypes);
+		}
+		catch (NoSuchMethodException ex) {
+			return null;
+		}
+	}
+
+	/**
+	 * Determine whether the given class has a public method with the given signature.
+	 * @param clazz the clazz to analyze
+	 * @param method the method to look for
+	 * @return whether the class has a corresponding method
+	 * @since 5.2.3
+	 */
+	public static boolean hasMethod(Class<?> clazz, Method method) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(method, "Method must not be null");
+		if (clazz == method.getDeclaringClass()) {
+			return true;
+		}
+		String methodName = method.getName();
+		Class<?>[] paramTypes = method.getParameterTypes();
+		return getMethodOrNull(clazz, methodName, paramTypes) != null;
+	}
+
+	/**
+	 * Determine whether the given class has a public method with the given signature.
+	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
+	 * @param clazz the clazz to analyze
+	 * @param methodName the name of the method
+	 * @param paramTypes the parameter types of the method
+	 * @return whether the class has a corresponding method
+	 * @see Class#getMethod
+	 */
+	public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
+		return (getMethodIfAvailable(clazz, methodName, paramTypes) != null);
+	}
+
+	/**
+	 * Determine whether the given class has a public method with the given signature,
+	 * and return it if available (else throws an {@code IllegalStateException}).
+	 * <p>In case of any signature specified, only returns the method if there is a
+	 * unique candidate, i.e. a single public method with the specified name.
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code IllegalStateException}.
+	 * @param clazz the clazz to analyze
+	 * @param methodName the name of the method
+	 * @param paramTypes the parameter types of the method
+	 * (can be {@code null} to indicate any signature)
+	 * @return the method (never {@code null})
+	 * @throws IllegalStateException if the method has not been found
+	 * @see Class#getMethod
+	 */
+	public static Method getMethod(Class<?> clazz, String methodName, @Nullable Class<?>... paramTypes) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(methodName, "Method name must not be null");
+		if (paramTypes != null) {
+			try {
+				return clazz.getMethod(methodName, paramTypes);
+			}
+			catch (NoSuchMethodException ex) {
+				throw new IllegalStateException("Expected method not found: " + ex);
+			}
+		}
+		else {
+			Set<Method> candidates = findMethodCandidatesByName(clazz, methodName);
+			if (candidates.size() == 1) {
+				return candidates.iterator().next();
+			}
+			else if (candidates.isEmpty()) {
+				throw new IllegalStateException("Expected method not found: " + clazz.getName() + '.' + methodName);
+			}
+			else {
+				throw new IllegalStateException("No unique method found: " + clazz.getName() + '.' + methodName);
+			}
+		}
+	}
+
+	/**
+	 * Determine whether the given class has a public method with the given signature,
+	 * and return it if available (else return {@code null}).
+	 * <p>In case of any signature specified, only returns the method if there is a
+	 * unique candidate, i.e. a single public method with the specified name.
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
+	 * @param clazz the clazz to analyze
+	 * @param methodName the name of the method
+	 * @param paramTypes the parameter types of the method
+	 * (can be {@code null} to indicate any signature)
+	 * @return the method, or {@code null} if not found
+	 * @see Class#getMethod
+	 */
+	@Nullable
+	public static Method getMethodIfAvailable(Class<?> clazz, String methodName, @Nullable Class<?>... paramTypes) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(methodName, "Method name must not be null");
+		if (paramTypes != null) {
+			return getMethodOrNull(clazz, methodName, paramTypes);
+		}
+		else {
+			Set<Method> candidates = findMethodCandidatesByName(clazz, methodName);
+			if (candidates.size() == 1) {
+				return candidates.iterator().next();
+			}
+			return null;
+		}
+	}
+
+	/**
+	 * Return the number of methods with a given name (with any argument types),
+	 * for the given class and/or its superclasses. Includes non-public methods.
+	 * @param clazz	the clazz to check
+	 * @param methodName the name of the method
+	 * @return the number of methods with the given name
+	 */
+	public static int getMethodCountForName(Class<?> clazz, String methodName) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(methodName, "Method name must not be null");
+		int count = 0;
+		Method[] declaredMethods = clazz.getDeclaredMethods();
+		for (Method method : declaredMethods) {
+			if (methodName.equals(method.getName())) {
+				count++;
+			}
+		}
+		Class<?>[] ifcs = clazz.getInterfaces();
+		for (Class<?> ifc : ifcs) {
+			count += getMethodCountForName(ifc, methodName);
+		}
+		if (clazz.getSuperclass() != null) {
+			count += getMethodCountForName(clazz.getSuperclass(), methodName);
+		}
+		return count;
+	}
+
+	/**
+	 * Does the given class or one of its superclasses at least have one or more
+	 * methods with the supplied name (with any argument types)?
+	 * Includes non-public methods.
+	 * @param clazz	the clazz to check
+	 * @param methodName the name of the method
+	 * @return whether there is at least one method with the given name
+	 */
+	public static boolean hasAtLeastOneMethodWithName(Class<?> clazz, String methodName) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(methodName, "Method name must not be null");
+		Method[] declaredMethods = clazz.getDeclaredMethods();
+		for (Method method : declaredMethods) {
+			if (method.getName().equals(methodName)) {
+				return true;
+			}
+		}
+		Class<?>[] ifcs = clazz.getInterfaces();
+		for (Class<?> ifc : ifcs) {
+			if (hasAtLeastOneMethodWithName(ifc, methodName)) {
+				return true;
+			}
+		}
+		return (clazz.getSuperclass() != null && hasAtLeastOneMethodWithName(clazz.getSuperclass(), methodName));
+	}
+
+	/**
+	 * Given a method, which may come from an interface, and a target class used
+	 * in the current reflective invocation, find the corresponding target method
+	 * if there is one &mdash; for example, the method may be {@code IFoo.bar()},
+	 * and the target class may be {@code DefaultFoo}. In this case, the method may be
+	 * {@code DefaultFoo.bar()}. This enables attributes on that method to be found.
+	 * <p><b>NOTE:</b> In contrast to {@link org.springframework.aop.support.AopUtils#getMostSpecificMethod},
+	 * this method does <i>not</i> resolve bridge methods automatically.
+	 * Call {@link org.springframework.core.BridgeMethodResolver#findBridgedMethod}
+	 * if bridge method resolution is desirable &mdash; for example, to obtain
+	 * metadata from the original method definition.
+	 * <p><b>NOTE:</b> If Java security settings disallow reflective access &mdash;
+	 * for example, calls to {@code Class#getDeclaredMethods}, etc. &mdash; this
+	 * implementation will fall back to returning the originally provided method.
+	 * @param method the method to be invoked, which may come from an interface
+	 * @param targetClass the target class for the current invocation
+	 * (can be {@code null} or may not even implement the method)
+	 * @return the specific target method, or the original method if the
+	 * {@code targetClass} does not implement it
+	 * @see #getInterfaceMethodIfPossible(Method, Class)
+	 */
+	public static Method getMostSpecificMethod(Method method, @Nullable Class<?> targetClass) {
+		if (targetClass != null && targetClass != method.getDeclaringClass() &&
+				(isOverridable(method, targetClass) || !method.getDeclaringClass().isAssignableFrom(targetClass))) {
+			try {
+				if (Modifier.isPublic(method.getModifiers())) {
+					try {
+						return targetClass.getMethod(method.getName(), method.getParameterTypes());
+					}
+					catch (NoSuchMethodException ex) {
+						return method;
+					}
+				}
+				else {
+					Method specificMethod =
+							ReflectionUtils.findMethod(targetClass, method.getName(), method.getParameterTypes());
+					return (specificMethod != null ? specificMethod : method);
+				}
+			}
+			catch (SecurityException ex) {
+				// Security settings are disallowing reflective access; fall back to 'method' below.
+			}
+		}
+		return method;
+	}
+
+	/**
+	 * Determine a corresponding interface method for the given method handle, if possible.
+	 * <p>This is particularly useful for arriving at a public exported type on Jigsaw
+	 * which can be reflectively invoked without an illegal access warning.
+	 * @param method the method to be invoked, potentially from an implementation class
+	 * @return the corresponding interface method, or the original method if none found
+	 * @since 5.1
+	 * @deprecated in favor of {@link #getInterfaceMethodIfPossible(Method, Class)}
+	 */
+	@Deprecated
+	public static Method getInterfaceMethodIfPossible(Method method) {
+		return getInterfaceMethodIfPossible(method, null);
+	}
+
+	/**
+	 * Determine a corresponding interface method for the given method handle, if possible.
+	 * <p>This is particularly useful for arriving at a public exported type on Jigsaw
+	 * which can be reflectively invoked without an illegal access warning.
+	 * @param method the method to be invoked, potentially from an implementation class
+	 * @param targetClass the target class to check for declared interfaces
+	 * @return the corresponding interface method, or the original method if none found
+	 * @since 5.3.16
+	 * @see #getMostSpecificMethod
+	 */
+	public static Method getInterfaceMethodIfPossible(Method method, @Nullable Class<?> targetClass) {
+		if (!Modifier.isPublic(method.getModifiers()) || method.getDeclaringClass().isInterface()) {
+			return method;
+		}
+		// Try cached version of method in its declaring class
+		Method result = interfaceMethodCache.computeIfAbsent(method,
+				key -> findInterfaceMethodIfPossible(key, key.getDeclaringClass(), Object.class));
+		if (result == method && targetClass != null) {
+			// No interface method found yet -> try given target class (possibly a subclass of the
+			// declaring class, late-binding a base class method to a subclass-declared interface:
+			// see e.g. HashMap.HashIterator.hasNext)
+			result = findInterfaceMethodIfPossible(method, targetClass, method.getDeclaringClass());
+		}
+		return result;
+	}
+
+	private static Method findInterfaceMethodIfPossible(Method method, Class<?> startClass, Class<?> endClass) {
+		Class<?> current = startClass;
+		while (current != null && current != endClass) {
+			Class<?>[] ifcs = current.getInterfaces();
+			for (Class<?> ifc : ifcs) {
+				try {
+					return ifc.getMethod(method.getName(), method.getParameterTypes());
+				}
+				catch (NoSuchMethodException ex) {
+					// ignore
+				}
+			}
+			current = current.getSuperclass();
+		}
+		return method;
+	}
+
+	/**
+	 * Determine whether the given method is declared by the user or at least pointing to
+	 * a user-declared method.
+	 * <p>Checks {@link Method#isSynthetic()} (for implementation methods) as well as the
+	 * {@code GroovyObject} interface (for interface methods; on an implementation class,
+	 * implementations of the {@code GroovyObject} methods will be marked as synthetic anyway).
+	 * Note that, despite being synthetic, bridge methods ({@link Method#isBridge()}) are considered
+	 * as user-level methods since they are eventually pointing to a user-declared generic method.
+	 * @param method the method to check
+	 * @return {@code true} if the method can be considered as user-declared; {@code false} otherwise
+	 */
+	public static boolean isUserLevelMethod(Method method) {
+		Assert.notNull(method, "Method must not be null");
+		return (method.isBridge() || (!method.isSynthetic() && !isGroovyObjectMethod(method)));
+	}
+
+	private static boolean isGroovyObjectMethod(Method method) {
+		return method.getDeclaringClass().getName().equals("groovy.lang.GroovyObject");
+	}
+
+	/**
+	 * Determine whether the given method is overridable in the given target class.
+	 * @param method the method to check
+	 * @param targetClass the target class to check against
+	 */
+	private static boolean isOverridable(Method method, @Nullable Class<?> targetClass) {
+		if ((method.getModifiers() & NON_OVERRIDABLE_MODIFIER) != 0) {
+			return false;
+		}
+		if ((method.getModifiers() & OVERRIDABLE_MODIFIER) != 0) {
+			return true;
+		}
+		return (targetClass == null ||
+				getPackageName(method.getDeclaringClass()).equals(getPackageName(targetClass)));
+	}
+
+	/**
+	 * Return a public static method of a class.
+	 * @param clazz the class which defines the method
+	 * @param methodName the static method name
+	 * @param args the parameter types to the method
+	 * @return the static method, or {@code null} if no static method was found
+	 * @throws IllegalArgumentException if the method name is blank or the clazz is null
+	 */
+	@Nullable
+	public static Method getStaticMethod(Class<?> clazz, String methodName, Class<?>... args) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(methodName, "Method name must not be null");
+		try {
+			Method method = clazz.getMethod(methodName, args);
+			return (Modifier.isStatic(method.getModifiers()) ? method : null);
+		}
+		catch (NoSuchMethodException ex) {
+			return null;
+		}
+	}
+
+
+	@Nullable
+	private static Method getMethodOrNull(Class<?> clazz, String methodName, Class<?>[] paramTypes) {
+		try {
+			return clazz.getMethod(methodName, paramTypes);
+		}
+		catch (NoSuchMethodException ex) {
+			return null;
+		}
+	}
+
+	private static Set<Method> findMethodCandidatesByName(Class<?> clazz, String methodName) {
+		Set<Method> candidates = new HashSet<>(1);
+		Method[] methods = clazz.getMethods();
+		for (Method method : methods) {
+			if (methodName.equals(method.getName())) {
+				candidates.add(method);
+			}
+		}
+		return candidates;
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
new file mode 100644
index 00000000..d2f921f0
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
@@ -0,0 +1,516 @@
+/*
+ * Copyright 2002-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.SortedSet;
+
+/**
+ * Miscellaneous collection utility methods.
+ * Mainly for internal use within the framework.
+ *
+ * @author Juergen Hoeller
+ * @author Rob Harrop
+ * @author Arjen Poutsma
+ * @since 1.1.3
+ */
+public abstract class CollectionUtils {
+
+	/**
+	 * Default load factor for {@link HashMap}/{@link LinkedHashMap} variants.
+	 * @see #newHashMap(int)
+	 * @see #newLinkedHashMap(int)
+	 */
+	static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+
+	/**
+	 * Return {@code true} if the supplied Collection is {@code null} or empty.
+	 * Otherwise, return {@code false}.
+	 * @param collection the Collection to check
+	 * @return whether the given Collection is empty
+	 */
+	public static boolean isEmpty(@Nullable Collection<?> collection) {
+		return (collection == null || collection.isEmpty());
+	}
+
+	/**
+	 * Return {@code true} if the supplied Map is {@code null} or empty.
+	 * Otherwise, return {@code false}.
+	 * @param map the Map to check
+	 * @return whether the given Map is empty
+	 */
+	public static boolean isEmpty(@Nullable Map<?, ?> map) {
+		return (map == null || map.isEmpty());
+	}
+
+	/**
+	 * Instantiate a new {@link HashMap} with an initial capacity
+	 * that can accommodate the specified number of elements without
+	 * any immediate resize/rehash operations to be expected.
+	 * <p>This differs from the regular {@link HashMap} constructor
+	 * which takes an initial capacity relative to a load factor
+	 * but is effectively aligned with the JDK's
+	 * {@link java.util.concurrent.ConcurrentHashMap#ConcurrentHashMap(int)}.
+	 * @param expectedSize the expected number of elements (with a corresponding
+	 * capacity to be derived so that no resize/rehash operations are needed)
+	 * @since 5.3
+	 * @see #newLinkedHashMap(int)
+	 */
+	public static <K, V> HashMap<K, V> newHashMap(int expectedSize) {
+		return new HashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
+	}
+
+	/**
+	 * Instantiate a new {@link LinkedHashMap} with an initial capacity
+	 * that can accommodate the specified number of elements without
+	 * any immediate resize/rehash operations to be expected.
+	 * <p>This differs from the regular {@link LinkedHashMap} constructor
+	 * which takes an initial capacity relative to a load factor but is
+	 * aligned with Spring's own {@link LinkedCaseInsensitiveMap} and
+	 * {@link LinkedMultiValueMap} constructor semantics as of 5.3.
+	 * @param expectedSize the expected number of elements (with a corresponding
+	 * capacity to be derived so that no resize/rehash operations are needed)
+	 * @since 5.3
+	 * @see #newHashMap(int)
+	 */
+	public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(int expectedSize) {
+		return new LinkedHashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
+	}
+
+	private static int computeMapInitialCapacity(int expectedSize) {
+		return (int) Math.ceil(expectedSize / (double) DEFAULT_LOAD_FACTOR);
+	}
+
+	/**
+	 * Convert the supplied array into a List. A primitive array gets converted
+	 * into a List of the appropriate wrapper type.
+	 * <p><b>NOTE:</b> Generally prefer the standard {@link Arrays#asList} method.
+	 * This {@code arrayToList} method is just meant to deal with an incoming Object
+	 * value that might be an {@code Object[]} or a primitive array at runtime.
+	 * <p>A {@code null} source value will be converted to an empty List.
+	 * @param source the (potentially primitive) array
+	 * @return the converted List result
+	 * @see ObjectUtils#toObjectArray(Object)
+	 * @see Arrays#asList(Object[])
+	 */
+	public static List<?> arrayToList(@Nullable Object source) {
+		return Arrays.asList(ObjectUtils.toObjectArray(source));
+	}
+
+	/**
+	 * Merge the given array into the given Collection.
+	 * @param array the array to merge (may be {@code null})
+	 * @param collection the target Collection to merge the array into
+	 */
+	@SuppressWarnings("unchecked")
+	public static <E> void mergeArrayIntoCollection(@Nullable Object array, Collection<E> collection) {
+		Object[] arr = ObjectUtils.toObjectArray(array);
+		for (Object elem : arr) {
+			collection.add((E) elem);
+		}
+	}
+
+	/**
+	 * Merge the given Properties instance into the given Map,
+	 * copying all properties (key-value pairs) over.
+	 * <p>Uses {@code Properties.propertyNames()} to even catch
+	 * default properties linked into the original Properties instance.
+	 * @param props the Properties instance to merge (may be {@code null})
+	 * @param map the target Map to merge the properties into
+	 */
+	@SuppressWarnings("unchecked")
+	public static <K, V> void mergePropertiesIntoMap(@Nullable Properties props, Map<K, V> map) {
+		if (props != null) {
+			for (Enumeration<?> en = props.propertyNames(); en.hasMoreElements();) {
+				String key = (String) en.nextElement();
+				Object value = props.get(key);
+				if (value == null) {
+					// Allow for defaults fallback or potentially overridden accessor...
+					value = props.getProperty(key);
+				}
+				map.put((K) key, (V) value);
+			}
+		}
+	}
+
+
+	/**
+	 * Check whether the given Iterator contains the given element.
+	 * @param iterator the Iterator to check
+	 * @param element the element to look for
+	 * @return {@code true} if found, {@code false} otherwise
+	 */
+	public static boolean contains(@Nullable Iterator<?> iterator, Object element) {
+		if (iterator != null) {
+			while (iterator.hasNext()) {
+				Object candidate = iterator.next();
+				if (ObjectUtils.nullSafeEquals(candidate, element)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the given Enumeration contains the given element.
+	 * @param enumeration the Enumeration to check
+	 * @param element the element to look for
+	 * @return {@code true} if found, {@code false} otherwise
+	 */
+	public static boolean contains(@Nullable Enumeration<?> enumeration, Object element) {
+		if (enumeration != null) {
+			while (enumeration.hasMoreElements()) {
+				Object candidate = enumeration.nextElement();
+				if (ObjectUtils.nullSafeEquals(candidate, element)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the given Collection contains the given element instance.
+	 * <p>Enforces the given instance to be present, rather than returning
+	 * {@code true} for an equal element as well.
+	 * @param collection the Collection to check
+	 * @param element the element to look for
+	 * @return {@code true} if found, {@code false} otherwise
+	 */
+	public static boolean containsInstance(@Nullable Collection<?> collection, Object element) {
+		if (collection != null) {
+			for (Object candidate : collection) {
+				if (candidate == element) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Return {@code true} if any element in '{@code candidates}' is
+	 * contained in '{@code source}'; otherwise returns {@code false}.
+	 * @param source the source Collection
+	 * @param candidates the candidates to search for
+	 * @return whether any of the candidates has been found
+	 */
+	public static boolean containsAny(Collection<?> source, Collection<?> candidates) {
+		return findFirstMatch(source, candidates) != null;
+	}
+
+	/**
+	 * Return the first element in '{@code candidates}' that is contained in
+	 * '{@code source}'. If no element in '{@code candidates}' is present in
+	 * '{@code source}' returns {@code null}. Iteration order is
+	 * {@link Collection} implementation specific.
+	 * @param source the source Collection
+	 * @param candidates the candidates to search for
+	 * @return the first present object, or {@code null} if not found
+	 */
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public static <E> E findFirstMatch(Collection<?> source, Collection<E> candidates) {
+		if (isEmpty(source) || isEmpty(candidates)) {
+			return null;
+		}
+		for (Object candidate : candidates) {
+			if (source.contains(candidate)) {
+				return (E) candidate;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Find a single value of the given type in the given Collection.
+	 * @param collection the Collection to search
+	 * @param type the type to look for
+	 * @return a value of the given type found if there is a clear match,
+	 * or {@code null} if none or more than one such value found
+	 */
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public static <T> T findValueOfType(Collection<?> collection, @Nullable Class<T> type) {
+		if (isEmpty(collection)) {
+			return null;
+		}
+		T value = null;
+		for (Object element : collection) {
+			if (type == null || type.isInstance(element)) {
+				if (value != null) {
+					// More than one value found... no clear single value.
+					return null;
+				}
+				value = (T) element;
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * Find a single value of one of the given types in the given Collection:
+	 * searching the Collection for a value of the first type, then
+	 * searching for a value of the second type, etc.
+	 * @param collection the collection to search
+	 * @param types the types to look for, in prioritized order
+	 * @return a value of one of the given types found if there is a clear match,
+	 * or {@code null} if none or more than one such value found
+	 */
+	@Nullable
+	public static Object findValueOfType(Collection<?> collection, Class<?>[] types) {
+		if (isEmpty(collection) || ObjectUtils.isEmpty(types)) {
+			return null;
+		}
+		for (Class<?> type : types) {
+			Object value = findValueOfType(collection, type);
+			if (value != null) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Determine whether the given Collection only contains a single unique object.
+	 * @param collection the Collection to check
+	 * @return {@code true} if the collection contains a single reference or
+	 * multiple references to the same instance, {@code false} otherwise
+	 */
+	public static boolean hasUniqueObject(Collection<?> collection) {
+		if (isEmpty(collection)) {
+			return false;
+		}
+		boolean hasCandidate = false;
+		Object candidate = null;
+		for (Object elem : collection) {
+			if (!hasCandidate) {
+				hasCandidate = true;
+				candidate = elem;
+			}
+			else if (candidate != elem) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Find the common element type of the given Collection, if any.
+	 * @param collection the Collection to check
+	 * @return the common element type, or {@code null} if no clear
+	 * common type has been found (or the collection was empty)
+	 */
+	@Nullable
+	public static Class<?> findCommonElementType(Collection<?> collection) {
+		if (isEmpty(collection)) {
+			return null;
+		}
+		Class<?> candidate = null;
+		for (Object val : collection) {
+			if (val != null) {
+				if (candidate == null) {
+					candidate = val.getClass();
+				}
+				else if (candidate != val.getClass()) {
+					return null;
+				}
+			}
+		}
+		return candidate;
+	}
+
+	/**
+	 * Retrieve the first element of the given Set, using {@link SortedSet#first()}
+	 * or otherwise using the iterator.
+	 * @param set the Set to check (may be {@code null} or empty)
+	 * @return the first element, or {@code null} if none
+	 * @since 5.2.3
+	 * @see SortedSet
+	 * @see LinkedHashMap#keySet()
+	 * @see java.util.LinkedHashSet
+	 */
+	@Nullable
+	public static <T> T firstElement(@Nullable Set<T> set) {
+		if (isEmpty(set)) {
+			return null;
+		}
+		if (set instanceof SortedSet) {
+			return ((SortedSet<T>) set).first();
+		}
+
+		Iterator<T> it = set.iterator();
+		T first = null;
+		if (it.hasNext()) {
+			first = it.next();
+		}
+		return first;
+	}
+
+	/**
+	 * Retrieve the first element of the given List, accessing the zero index.
+	 * @param list the List to check (may be {@code null} or empty)
+	 * @return the first element, or {@code null} if none
+	 * @since 5.2.3
+	 */
+	@Nullable
+	public static <T> T firstElement(@Nullable List<T> list) {
+		if (isEmpty(list)) {
+			return null;
+		}
+		return list.get(0);
+	}
+
+	/**
+	 * Retrieve the last element of the given Set, using {@link SortedSet#last()}
+	 * or otherwise iterating over all elements (assuming a linked set).
+	 * @param set the Set to check (may be {@code null} or empty)
+	 * @return the last element, or {@code null} if none
+	 * @since 5.0.3
+	 * @see SortedSet
+	 * @see LinkedHashMap#keySet()
+	 * @see java.util.LinkedHashSet
+	 */
+	@Nullable
+	public static <T> T lastElement(@Nullable Set<T> set) {
+		if (isEmpty(set)) {
+			return null;
+		}
+		if (set instanceof SortedSet) {
+			return ((SortedSet<T>) set).last();
+		}
+
+		// Full iteration necessary...
+		Iterator<T> it = set.iterator();
+		T last = null;
+		while (it.hasNext()) {
+			last = it.next();
+		}
+		return last;
+	}
+
+	/**
+	 * Retrieve the last element of the given List, accessing the highest index.
+	 * @param list the List to check (may be {@code null} or empty)
+	 * @return the last element, or {@code null} if none
+	 * @since 5.0.3
+	 */
+	@Nullable
+	public static <T> T lastElement(@Nullable List<T> list) {
+		if (isEmpty(list)) {
+			return null;
+		}
+		return list.get(list.size() - 1);
+	}
+
+	/**
+	 * Marshal the elements from the given enumeration into an array of the given type.
+	 * Enumeration elements must be assignable to the type of the given array. The array
+	 * returned will be a different instance than the array given.
+	 */
+	public static <A, E extends A> A[] toArray(Enumeration<E> enumeration, A[] array) {
+		ArrayList<A> elements = new ArrayList<>();
+		while (enumeration.hasMoreElements()) {
+			elements.add(enumeration.nextElement());
+		}
+		return elements.toArray(array);
+	}
+
+	/**
+	 * Adapt an {@link Enumeration} to an {@link Iterator}.
+	 * @param enumeration the original {@code Enumeration}
+	 * @return the adapted {@code Iterator}
+	 */
+	public static <E> Iterator<E> toIterator(@Nullable Enumeration<E> enumeration) {
+		return (enumeration != null ? new EnumerationIterator<>(enumeration) : Collections.emptyIterator());
+	}
+
+	/**
+	 * Adapt a {@code Map<K, List<V>>} to an {@code MultiValueMap<K, V>}.
+	 * @param targetMap the original map
+	 * @return the adapted multi-value map (wrapping the original map)
+	 * @since 3.1
+	 */
+	public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> targetMap) {
+		return new MultiValueMapAdapter<>(targetMap);
+	}
+
+	/**
+	 * Return an unmodifiable view of the specified multi-value map.
+	 * @param targetMap the map for which an unmodifiable view is to be returned.
+	 * @return an unmodifiable view of the specified multi-value map
+	 * @since 3.1
+	 */
+	@SuppressWarnings("unchecked")
+	public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(
+			MultiValueMap<? extends K, ? extends V> targetMap) {
+
+		Assert.notNull(targetMap, "'targetMap' must not be null");
+		Map<K, List<V>> result = newLinkedHashMap(targetMap.size());
+		targetMap.forEach((key, value) -> {
+			List<? extends V> values = Collections.unmodifiableList(value);
+			result.put(key, (List<V>) values);
+		});
+		Map<K, List<V>> unmodifiableMap = Collections.unmodifiableMap(result);
+		return toMultiValueMap(unmodifiableMap);
+	}
+
+
+	/**
+	 * Iterator wrapping an Enumeration.
+	 */
+	private static class EnumerationIterator<E> implements Iterator<E> {
+
+		private final Enumeration<E> enumeration;
+
+		public EnumerationIterator(Enumeration<E> enumeration) {
+			this.enumeration = enumeration;
+		}
+
+		@Override
+		public boolean hasNext() {
+			return this.enumeration.hasMoreElements();
+		}
+
+		@Override
+		public E next() {
+			return this.enumeration.nextElement();
+		}
+
+		@Override
+		public void remove() throws UnsupportedOperationException {
+			throw new UnsupportedOperationException("Not supported");
+		}
+	}
+
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
new file mode 100644
index 00000000..9fdf5b17
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
@@ -0,0 +1,1092 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Array;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * A {@link ConcurrentHashMap} that uses {@link ReferenceType#SOFT soft} or
+ * {@linkplain ReferenceType#WEAK weak} references for both {@code keys} and {@code values}.
+ *
+ * <p>This class can be used as an alternative to
+ * {@code Collections.synchronizedMap(new WeakHashMap<K, Reference<V>>())} in order to
+ * support better performance when accessed concurrently. This implementation follows the
+ * same design constraints as {@link ConcurrentHashMap} with the exception that
+ * {@code null} values and {@code null} keys are supported.
+ *
+ * <p><b>NOTE:</b> The use of references means that there is no guarantee that items
+ * placed into the map will be subsequently available. The garbage collector may discard
+ * references at any time, so it may appear that an unknown thread is silently removing
+ * entries.
+ *
+ * <p>If not explicitly specified, this implementation will use
+ * {@linkplain SoftReference soft entry references}.
+ *
+ * @author Phillip Webb
+ * @author Juergen Hoeller
+ * @since 3.2
+ * @param <K> the key type
+ * @param <V> the value type
+ */
+public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
+
+	private static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+	private static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+	private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+
+	private static final ReferenceType DEFAULT_REFERENCE_TYPE = ReferenceType.SOFT;
+
+	private static final int MAXIMUM_CONCURRENCY_LEVEL = 1 << 16;
+
+	private static final int MAXIMUM_SEGMENT_SIZE = 1 << 30;
+
+
+	/**
+	 * Array of segments indexed using the high order bits from the hash.
+	 */
+	private final Segment[] segments;
+
+	/**
+	 * When the average number of references per table exceeds this value resize will be attempted.
+	 */
+	private final float loadFactor;
+
+	/**
+	 * The reference type: SOFT or WEAK.
+	 */
+	private final ReferenceType referenceType;
+
+	/**
+	 * The shift value used to calculate the size of the segments array and an index from the hash.
+	 */
+	private final int shift;
+
+	/**
+	 * Late binding entry set.
+	 */
+	@Nullable
+	private volatile Set<Map.Entry<K, V>> entrySet;
+
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 */
+	public ConcurrentReferenceHashMap() {
+		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity) {
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param loadFactor the load factor. When the average number of references per table
+	 * exceeds this value resize will be attempted
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
+		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity, int concurrencyLevel) {
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param referenceType the reference type used for entries (soft or weak)
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity, ReferenceType referenceType) {
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, referenceType);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel) {
+		this(initialCapacity, loadFactor, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
+	 * @param referenceType the reference type used for entries (soft or weak)
+	 */
+	@SuppressWarnings("unchecked")
+	public ConcurrentReferenceHashMap(
+			int initialCapacity, float loadFactor, int concurrencyLevel, ReferenceType referenceType) {
+
+		Assert.isTrue(initialCapacity >= 0, "Initial capacity must not be negative");
+		Assert.isTrue(loadFactor > 0f, "Load factor must be positive");
+		Assert.isTrue(concurrencyLevel > 0, "Concurrency level must be positive");
+		Assert.notNull(referenceType, "Reference type must not be null");
+		this.loadFactor = loadFactor;
+		this.shift = calculateShift(concurrencyLevel, MAXIMUM_CONCURRENCY_LEVEL);
+		int size = 1 << this.shift;
+		this.referenceType = referenceType;
+		int roundedUpSegmentCapacity = (int) ((initialCapacity + size - 1L) / size);
+		int initialSize = 1 << calculateShift(roundedUpSegmentCapacity, MAXIMUM_SEGMENT_SIZE);
+		Segment[] segments = (Segment[]) Array.newInstance(Segment.class, size);
+		int resizeThreshold = (int) (initialSize * getLoadFactor());
+		for (int i = 0; i < segments.length; i++) {
+			segments[i] = new Segment(initialSize, resizeThreshold);
+		}
+		this.segments = segments;
+	}
+
+
+	protected final float getLoadFactor() {
+		return this.loadFactor;
+	}
+
+	protected final int getSegmentsSize() {
+		return this.segments.length;
+	}
+
+	protected final Segment getSegment(int index) {
+		return this.segments[index];
+	}
+
+	/**
+	 * Factory method that returns the {@link ReferenceManager}.
+	 * This method will be called once for each {@link Segment}.
+	 * @return a new reference manager
+	 */
+	protected ReferenceManager createReferenceManager() {
+		return new ReferenceManager();
+	}
+
+	/**
+	 * Get the hash for a given object, apply an additional hash function to reduce
+	 * collisions. This implementation uses the same Wang/Jenkins algorithm as
+	 * {@link ConcurrentHashMap}. Subclasses can override to provide alternative hashing.
+	 * @param o the object to hash (may be null)
+	 * @return the resulting hash code
+	 */
+	protected int getHash(@Nullable Object o) {
+		int hash = (o != null ? o.hashCode() : 0);
+		hash += (hash << 15) ^ 0xffffcd7d;
+		hash ^= (hash >>> 10);
+		hash += (hash << 3);
+		hash ^= (hash >>> 6);
+		hash += (hash << 2) + (hash << 14);
+		hash ^= (hash >>> 16);
+		return hash;
+	}
+
+	@Override
+	@Nullable
+	public V get(@Nullable Object key) {
+		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
+		Entry<K, V> entry = (ref != null ? ref.get() : null);
+		return (entry != null ? entry.getValue() : null);
+	}
+
+	@Override
+	@Nullable
+	public V getOrDefault(@Nullable Object key, @Nullable V defaultValue) {
+		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
+		Entry<K, V> entry = (ref != null ? ref.get() : null);
+		return (entry != null ? entry.getValue() : defaultValue);
+	}
+
+	@Override
+	public boolean containsKey(@Nullable Object key) {
+		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
+		Entry<K, V> entry = (ref != null ? ref.get() : null);
+		return (entry != null && ObjectUtils.nullSafeEquals(entry.getKey(), key));
+	}
+
+	/**
+	 * Return a {@link Reference} to the {@link Entry} for the specified {@code key},
+	 * or {@code null} if not found.
+	 * @param key the key (can be {@code null})
+	 * @param restructure types of restructure allowed during this call
+	 * @return the reference, or {@code null} if not found
+	 */
+	@Nullable
+	protected final Reference<K, V> getReference(@Nullable Object key, Restructure restructure) {
+		int hash = getHash(key);
+		return getSegmentForHash(hash).getReference(key, hash, restructure);
+	}
+
+	@Override
+	@Nullable
+	public V put(@Nullable K key, @Nullable V value) {
+		return put(key, value, true);
+	}
+
+	@Override
+	@Nullable
+	public V putIfAbsent(@Nullable K key, @Nullable V value) {
+		return put(key, value, false);
+	}
+
+	@Nullable
+	private V put(@Nullable final K key, @Nullable final V value, final boolean overwriteExisting) {
+		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.RESIZE) {
+			@Override
+			@Nullable
+			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
+				if (entry != null) {
+					V oldValue = entry.getValue();
+					if (overwriteExisting) {
+						entry.setValue(value);
+					}
+					return oldValue;
+				}
+				Assert.state(entries != null, "No entries segment");
+				entries.add(value);
+				return null;
+			}
+		});
+	}
+
+	@Override
+	@Nullable
+	public V remove(@Nullable Object key) {
+		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_AFTER, TaskOption.SKIP_IF_EMPTY) {
+			@Override
+			@Nullable
+			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
+				if (entry != null) {
+					if (ref != null) {
+						ref.release();
+					}
+					return entry.value;
+				}
+				return null;
+			}
+		});
+	}
+
+	@Override
+	public boolean remove(@Nullable Object key, final @Nullable Object value) {
+		Boolean result = doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_AFTER, TaskOption.SKIP_IF_EMPTY) {
+			@Override
+			protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
+				if (entry != null && ObjectUtils.nullSafeEquals(entry.getValue(), value)) {
+					if (ref != null) {
+						ref.release();
+					}
+					return true;
+				}
+				return false;
+			}
+		});
+		return (Boolean.TRUE.equals(result));
+	}
+
+	@Override
+	public boolean replace(@Nullable K key, final @Nullable V oldValue, final @Nullable V newValue) {
+		Boolean result = doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
+			@Override
+			protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
+				if (entry != null && ObjectUtils.nullSafeEquals(entry.getValue(), oldValue)) {
+					entry.setValue(newValue);
+					return true;
+				}
+				return false;
+			}
+		});
+		return (Boolean.TRUE.equals(result));
+	}
+
+	@Override
+	@Nullable
+	public V replace(@Nullable K key, final @Nullable V value) {
+		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
+			@Override
+			@Nullable
+			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
+				if (entry != null) {
+					V oldValue = entry.getValue();
+					entry.setValue(value);
+					return oldValue;
+				}
+				return null;
+			}
+		});
+	}
+
+	@Override
+	public void clear() {
+		for (Segment segment : this.segments) {
+			segment.clear();
+		}
+	}
+
+	/**
+	 * Remove any entries that have been garbage collected and are no longer referenced.
+	 * Under normal circumstances garbage collected entries are automatically purged as
+	 * items are added or removed from the Map. This method can be used to force a purge,
+	 * and is useful when the Map is read frequently but updated less often.
+	 */
+	public void purgeUnreferencedEntries() {
+		for (Segment segment : this.segments) {
+			segment.restructureIfNecessary(false);
+		}
+	}
+
+
+	@Override
+	public int size() {
+		int size = 0;
+		for (Segment segment : this.segments) {
+			size += segment.getCount();
+		}
+		return size;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		for (Segment segment : this.segments) {
+			if (segment.getCount() > 0) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public Set<Map.Entry<K, V>> entrySet() {
+		Set<Map.Entry<K, V>> entrySet = this.entrySet;
+		if (entrySet == null) {
+			entrySet = new EntrySet();
+			this.entrySet = entrySet;
+		}
+		return entrySet;
+	}
+
+	@Nullable
+	private <T> T doTask(@Nullable Object key, Task<T> task) {
+		int hash = getHash(key);
+		return getSegmentForHash(hash).doTask(hash, key, task);
+	}
+
+	private Segment getSegmentForHash(int hash) {
+		return this.segments[(hash >>> (32 - this.shift)) & (this.segments.length - 1)];
+	}
+
+	/**
+	 * Calculate a shift value that can be used to create a power-of-two value between
+	 * the specified maximum and minimum values.
+	 * @param minimumValue the minimum value
+	 * @param maximumValue the maximum value
+	 * @return the calculated shift (use {@code 1 << shift} to obtain a value)
+	 */
+	protected static int calculateShift(int minimumValue, int maximumValue) {
+		int shift = 0;
+		int value = 1;
+		while (value < minimumValue && value < maximumValue) {
+			value <<= 1;
+			shift++;
+		}
+		return shift;
+	}
+
+
+	/**
+	 * Various reference types supported by this map.
+	 */
+	public enum ReferenceType {
+
+		/** Use {@link SoftReference SoftReferences}. */
+		SOFT,
+
+		/** Use {@link WeakReference WeakReferences}. */
+		WEAK
+	}
+
+
+	/**
+	 * A single segment used to divide the map to allow better concurrent performance.
+	 */
+	@SuppressWarnings("serial")
+	protected final class Segment extends ReentrantLock {
+
+		private final ReferenceManager referenceManager;
+
+		private final int initialSize;
+
+		/**
+		 * Array of references indexed using the low order bits from the hash.
+		 * This property should only be set along with {@code resizeThreshold}.
+		 */
+		private volatile Reference<K, V>[] references;
+
+		/**
+		 * The total number of references contained in this segment. This includes chained
+		 * references and references that have been garbage collected but not purged.
+		 */
+		private final AtomicInteger count = new AtomicInteger();
+
+		/**
+		 * The threshold when resizing of the references should occur. When {@code count}
+		 * exceeds this value references will be resized.
+		 */
+		private int resizeThreshold;
+
+		public Segment(int initialSize, int resizeThreshold) {
+			this.referenceManager = createReferenceManager();
+			this.initialSize = initialSize;
+			this.references = createReferenceArray(initialSize);
+			this.resizeThreshold = resizeThreshold;
+		}
+
+		@Nullable
+		public Reference<K, V> getReference(@Nullable Object key, int hash, Restructure restructure) {
+			if (restructure == Restructure.WHEN_NECESSARY) {
+				restructureIfNecessary(false);
+			}
+			if (this.count.get() == 0) {
+				return null;
+			}
+			// Use a local copy to protect against other threads writing
+			Reference<K, V>[] references = this.references;
+			int index = getIndex(hash, references);
+			Reference<K, V> head = references[index];
+			return findInChain(head, key, hash);
+		}
+
+		/**
+		 * Apply an update operation to this segment.
+		 * The segment will be locked during the update.
+		 * @param hash the hash of the key
+		 * @param key the key
+		 * @param task the update operation
+		 * @return the result of the operation
+		 */
+		@Nullable
+		public <T> T doTask(final int hash, @Nullable final Object key, final Task<T> task) {
+			boolean resize = task.hasOption(TaskOption.RESIZE);
+			if (task.hasOption(TaskOption.RESTRUCTURE_BEFORE)) {
+				restructureIfNecessary(resize);
+			}
+			if (task.hasOption(TaskOption.SKIP_IF_EMPTY) && this.count.get() == 0) {
+				return task.execute(null, null, null);
+			}
+			lock();
+			try {
+				final int index = getIndex(hash, this.references);
+				final Reference<K, V> head = this.references[index];
+				Reference<K, V> ref = findInChain(head, key, hash);
+				Entry<K, V> entry = (ref != null ? ref.get() : null);
+				Entries<V> entries = value -> {
+					@SuppressWarnings("unchecked")
+					Entry<K, V> newEntry = new Entry<>((K) key, value);
+					Reference<K, V> newReference = Segment.this.referenceManager.createReference(newEntry, hash, head);
+					Segment.this.references[index] = newReference;
+					Segment.this.count.incrementAndGet();
+				};
+				return task.execute(ref, entry, entries);
+			}
+			finally {
+				unlock();
+				if (task.hasOption(TaskOption.RESTRUCTURE_AFTER)) {
+					restructureIfNecessary(resize);
+				}
+			}
+		}
+
+		/**
+		 * Clear all items from this segment.
+		 */
+		public void clear() {
+			if (this.count.get() == 0) {
+				return;
+			}
+			lock();
+			try {
+				this.references = createReferenceArray(this.initialSize);
+				this.resizeThreshold = (int) (this.references.length * getLoadFactor());
+				this.count.set(0);
+			}
+			finally {
+				unlock();
+			}
+		}
+
+		/**
+		 * Restructure the underlying data structure when it becomes necessary. This
+		 * method can increase the size of the references table as well as purge any
+		 * references that have been garbage collected.
+		 * @param allowResize if resizing is permitted
+		 */
+		protected final void restructureIfNecessary(boolean allowResize) {
+			int currCount = this.count.get();
+			boolean needsResize = allowResize && (currCount > 0 && currCount >= this.resizeThreshold);
+			Reference<K, V> ref = this.referenceManager.pollForPurge();
+			if (ref != null || (needsResize)) {
+				restructure(allowResize, ref);
+			}
+		}
+
+		private void restructure(boolean allowResize, @Nullable Reference<K, V> ref) {
+			boolean needsResize;
+			lock();
+			try {
+				int countAfterRestructure = this.count.get();
+				Set<Reference<K, V>> toPurge = Collections.emptySet();
+				if (ref != null) {
+					toPurge = new HashSet<>();
+					while (ref != null) {
+						toPurge.add(ref);
+						ref = this.referenceManager.pollForPurge();
+					}
+				}
+				countAfterRestructure -= toPurge.size();
+
+				// Recalculate taking into account count inside lock and items that
+				// will be purged
+				needsResize = (countAfterRestructure > 0 && countAfterRestructure >= this.resizeThreshold);
+				boolean resizing = false;
+				int restructureSize = this.references.length;
+				if (allowResize && needsResize && restructureSize < MAXIMUM_SEGMENT_SIZE) {
+					restructureSize <<= 1;
+					resizing = true;
+				}
+
+				// Either create a new table or reuse the existing one
+				Reference<K, V>[] restructured =
+						(resizing ? createReferenceArray(restructureSize) : this.references);
+
+				// Restructure
+				for (int i = 0; i < this.references.length; i++) {
+					ref = this.references[i];
+					if (!resizing) {
+						restructured[i] = null;
+					}
+					while (ref != null) {
+						if (!toPurge.contains(ref)) {
+							Entry<K, V> entry = ref.get();
+							if (entry != null) {
+								int index = getIndex(ref.getHash(), restructured);
+								restructured[index] = this.referenceManager.createReference(
+										entry, ref.getHash(), restructured[index]);
+							}
+						}
+						ref = ref.getNext();
+					}
+				}
+
+				// Replace volatile members
+				if (resizing) {
+					this.references = restructured;
+					this.resizeThreshold = (int) (this.references.length * getLoadFactor());
+				}
+				this.count.set(Math.max(countAfterRestructure, 0));
+			}
+			finally {
+				unlock();
+			}
+		}
+
+		@Nullable
+		private Reference<K, V> findInChain(Reference<K, V> ref, @Nullable Object key, int hash) {
+			Reference<K, V> currRef = ref;
+			while (currRef != null) {
+				if (currRef.getHash() == hash) {
+					Entry<K, V> entry = currRef.get();
+					if (entry != null) {
+						K entryKey = entry.getKey();
+						if (ObjectUtils.nullSafeEquals(entryKey, key)) {
+							return currRef;
+						}
+					}
+				}
+				currRef = currRef.getNext();
+			}
+			return null;
+		}
+
+		@SuppressWarnings({"rawtypes", "unchecked"})
+		private Reference<K, V>[] createReferenceArray(int size) {
+			return new Reference[size];
+		}
+
+		private int getIndex(int hash, Reference<K, V>[] references) {
+			return (hash & (references.length - 1));
+		}
+
+		/**
+		 * Return the size of the current references array.
+		 */
+		public final int getSize() {
+			return this.references.length;
+		}
+
+		/**
+		 * Return the total number of references in this segment.
+		 */
+		public final int getCount() {
+			return this.count.get();
+		}
+	}
+
+
+	/**
+	 * A reference to an {@link Entry} contained in the map. Implementations are usually
+	 * wrappers around specific Java reference implementations (e.g., {@link SoftReference}).
+	 * @param <K> the key type
+	 * @param <V> the value type
+	 */
+	protected interface Reference<K, V> {
+
+		/**
+		 * Return the referenced entry, or {@code null} if the entry is no longer available.
+		 */
+		@Nullable
+		Entry<K, V> get();
+
+		/**
+		 * Return the hash for the reference.
+		 */
+		int getHash();
+
+		/**
+		 * Return the next reference in the chain, or {@code null} if none.
+		 */
+		@Nullable
+		Reference<K, V> getNext();
+
+		/**
+		 * Release this entry and ensure that it will be returned from
+		 * {@code ReferenceManager#pollForPurge()}.
+		 */
+		void release();
+	}
+
+
+	/**
+	 * A single map entry.
+	 * @param <K> the key type
+	 * @param <V> the value type
+	 */
+	protected static final class Entry<K, V> implements Map.Entry<K, V> {
+
+		@Nullable
+		private final K key;
+
+		@Nullable
+		private volatile V value;
+
+		public Entry(@Nullable K key, @Nullable V value) {
+			this.key = key;
+			this.value = value;
+		}
+
+		@Override
+		@Nullable
+		public K getKey() {
+			return this.key;
+		}
+
+		@Override
+		@Nullable
+		public V getValue() {
+			return this.value;
+		}
+
+		@Override
+		@Nullable
+		public V setValue(@Nullable V value) {
+			V previous = this.value;
+			this.value = value;
+			return previous;
+		}
+
+		@Override
+		public boolean equals(@Nullable Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!(other instanceof Map.Entry<?, ?>)) {
+				return false;
+			}
+			Map.Entry<?, ?> otherEntry = (Map.Entry<?, ?>) other;
+			return (ObjectUtils.nullSafeEquals(getKey(), otherEntry.getKey()) &&
+					ObjectUtils.nullSafeEquals(getValue(), otherEntry.getValue()));
+		}
+
+		@Override
+		public int hashCode() {
+			return (ObjectUtils.nullSafeHashCode(this.key) ^ ObjectUtils.nullSafeHashCode(this.value));
+		}
+
+		@Override
+		public String toString() {
+			return (this.key + "=" + this.value);
+		}
+	}
+
+
+	/**
+	 * A task that can be {@link Segment#doTask run} against a {@link Segment}.
+	 */
+	private abstract class Task<T> {
+
+		private final EnumSet<TaskOption> options;
+
+		public Task(TaskOption... options) {
+			this.options = (options.length == 0 ? EnumSet.noneOf(TaskOption.class) : EnumSet.of(options[0], options));
+		}
+
+		public boolean hasOption(TaskOption option) {
+			return this.options.contains(option);
+		}
+
+		/**
+		 * Execute the task.
+		 * @param ref the found reference (or {@code null})
+		 * @param entry the found entry (or {@code null})
+		 * @param entries access to the underlying entries
+		 * @return the result of the task
+		 * @see #execute(Reference, Entry)
+		 */
+		@Nullable
+		protected T execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
+			return execute(ref, entry);
+		}
+
+		/**
+		 * Convenience method that can be used for tasks that do not need access to {@link Entries}.
+		 * @param ref the found reference (or {@code null})
+		 * @param entry the found entry (or {@code null})
+		 * @return the result of the task
+		 * @see #execute(Reference, Entry, Entries)
+		 */
+		@Nullable
+		protected T execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
+			return null;
+		}
+	}
+
+
+	/**
+	 * Various options supported by a {@code Task}.
+	 */
+	private enum TaskOption {
+
+		RESTRUCTURE_BEFORE, RESTRUCTURE_AFTER, SKIP_IF_EMPTY, RESIZE
+	}
+
+
+	/**
+	 * Allows a task access to {@link Segment} entries.
+	 */
+	private interface Entries<V> {
+
+		/**
+		 * Add a new entry with the specified value.
+		 * @param value the value to add
+		 */
+		void add(@Nullable V value);
+	}
+
+
+	/**
+	 * Internal entry-set implementation.
+	 */
+	private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
+
+		@Override
+		public Iterator<Map.Entry<K, V>> iterator() {
+			return new EntryIterator();
+		}
+
+		@Override
+		public boolean contains(@Nullable Object o) {
+			if (o instanceof Map.Entry<?, ?>) {
+				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+				Reference<K, V> ref = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
+				Entry<K, V> otherEntry = (ref != null ? ref.get() : null);
+				if (otherEntry != null) {
+					return ObjectUtils.nullSafeEquals(entry.getValue(), otherEntry.getValue());
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public boolean remove(Object o) {
+			if (o instanceof Map.Entry<?, ?>) {
+				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+				return ConcurrentReferenceHashMap.this.remove(entry.getKey(), entry.getValue());
+			}
+			return false;
+		}
+
+		@Override
+		public int size() {
+			return ConcurrentReferenceHashMap.this.size();
+		}
+
+		@Override
+		public void clear() {
+			ConcurrentReferenceHashMap.this.clear();
+		}
+	}
+
+
+	/**
+	 * Internal entry iterator implementation.
+	 */
+	private class EntryIterator implements Iterator<Map.Entry<K, V>> {
+
+		private int segmentIndex;
+
+		private int referenceIndex;
+
+		@Nullable
+		private Reference<K, V>[] references;
+
+		@Nullable
+		private Reference<K, V> reference;
+
+		@Nullable
+		private Entry<K, V> next;
+
+		@Nullable
+		private Entry<K, V> last;
+
+		public EntryIterator() {
+			moveToNextSegment();
+		}
+
+		@Override
+		public boolean hasNext() {
+			getNextIfNecessary();
+			return (this.next != null);
+		}
+
+		@Override
+		public Entry<K, V> next() {
+			getNextIfNecessary();
+			if (this.next == null) {
+				throw new NoSuchElementException();
+			}
+			this.last = this.next;
+			this.next = null;
+			return this.last;
+		}
+
+		private void getNextIfNecessary() {
+			while (this.next == null) {
+				moveToNextReference();
+				if (this.reference == null) {
+					return;
+				}
+				this.next = this.reference.get();
+			}
+		}
+
+		private void moveToNextReference() {
+			if (this.reference != null) {
+				this.reference = this.reference.getNext();
+			}
+			while (this.reference == null && this.references != null) {
+				if (this.referenceIndex >= this.references.length) {
+					moveToNextSegment();
+					this.referenceIndex = 0;
+				}
+				else {
+					this.reference = this.references[this.referenceIndex];
+					this.referenceIndex++;
+				}
+			}
+		}
+
+		private void moveToNextSegment() {
+			this.reference = null;
+			this.references = null;
+			if (this.segmentIndex < ConcurrentReferenceHashMap.this.segments.length) {
+				this.references = ConcurrentReferenceHashMap.this.segments[this.segmentIndex].references;
+				this.segmentIndex++;
+			}
+		}
+
+		@Override
+		public void remove() {
+			Assert.state(this.last != null, "No element to remove");
+			ConcurrentReferenceHashMap.this.remove(this.last.getKey());
+			this.last = null;
+		}
+	}
+
+
+	/**
+	 * The types of restructuring that can be performed.
+	 */
+	protected enum Restructure {
+
+		WHEN_NECESSARY, NEVER
+	}
+
+
+	/**
+	 * Strategy class used to manage {@link Reference References}.
+	 * This class can be overridden if alternative reference types need to be supported.
+	 */
+	protected class ReferenceManager {
+
+		private final ReferenceQueue<Entry<K, V>> queue = new ReferenceQueue<>();
+
+		/**
+		 * Factory method used to create a new {@link Reference}.
+		 * @param entry the entry contained in the reference
+		 * @param hash the hash
+		 * @param next the next reference in the chain, or {@code null} if none
+		 * @return a new {@link Reference}
+		 */
+		public Reference<K, V> createReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next) {
+			if (ConcurrentReferenceHashMap.this.referenceType == ReferenceType.WEAK) {
+				return new WeakEntryReference<>(entry, hash, next, this.queue);
+			}
+			return new SoftEntryReference<>(entry, hash, next, this.queue);
+		}
+
+		/**
+		 * Return any reference that has been garbage collected and can be purged from the
+		 * underlying structure or {@code null} if no references need purging. This
+		 * method must be thread safe and ideally should not block when returning
+		 * {@code null}. References should be returned once and only once.
+		 * @return a reference to purge or {@code null}
+		 */
+		@SuppressWarnings("unchecked")
+		@Nullable
+		public Reference<K, V> pollForPurge() {
+			return (Reference<K, V>) this.queue.poll();
+		}
+	}
+
+
+	/**
+	 * Internal {@link Reference} implementation for {@link SoftReference SoftReferences}.
+	 */
+	private static final class SoftEntryReference<K, V> extends SoftReference<Entry<K, V>> implements Reference<K, V> {
+
+		private final int hash;
+
+		@Nullable
+		private final Reference<K, V> nextReference;
+
+		public SoftEntryReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next,
+				ReferenceQueue<Entry<K, V>> queue) {
+
+			super(entry, queue);
+			this.hash = hash;
+			this.nextReference = next;
+		}
+
+		@Override
+		public int getHash() {
+			return this.hash;
+		}
+
+		@Override
+		@Nullable
+		public Reference<K, V> getNext() {
+			return this.nextReference;
+		}
+
+		@Override
+		public void release() {
+			enqueue();
+			clear();
+		}
+	}
+
+
+	/**
+	 * Internal {@link Reference} implementation for {@link WeakReference WeakReferences}.
+	 */
+	private static final class WeakEntryReference<K, V> extends WeakReference<Entry<K, V>> implements Reference<K, V> {
+
+		private final int hash;
+
+		@Nullable
+		private final Reference<K, V> nextReference;
+
+		public WeakEntryReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next,
+				ReferenceQueue<Entry<K, V>> queue) {
+
+			super(entry, queue);
+			this.hash = hash;
+			this.nextReference = next;
+		}
+
+		@Override
+		public int getHash() {
+			return this.hash;
+		}
+
+		@Override
+		@Nullable
+		public Reference<K, V> getNext() {
+			return this.nextReference;
+		}
+
+		@Override
+		public void release() {
+			enqueue();
+			clear();
+		}
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
new file mode 100644
index 00000000..051119e4
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2002-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Extension of the {@code Map} interface that stores multiple values.
+ *
+ * @author Arjen Poutsma
+ * @since 3.0
+ * @param <K> the key type
+ * @param <V> the value element type
+ */
+public interface MultiValueMap<K, V> extends Map<K, List<V>> {
+
+	/**
+	 * Return the first value for the given key.
+	 * @param key the key
+	 * @return the first value for the specified key, or {@code null} if none
+	 */
+	@Nullable
+	V getFirst(K key);
+
+	/**
+	 * Add the given single value to the current list of values for the given key.
+	 * @param key the key
+	 * @param value the value to be added
+	 */
+	void add(K key, @Nullable V value);
+
+	/**
+	 * Add all the values of the given list to the current list of values for the given key.
+	 * @param key they key
+	 * @param values the values to be added
+	 * @since 5.0
+	 */
+	void addAll(K key, List<? extends V> values);
+
+	/**
+	 * Add all the values of the given {@code MultiValueMap} to the current values.
+	 * @param values the values to be added
+	 * @since 5.0
+	 */
+	void addAll(MultiValueMap<K, V> values);
+
+	/**
+	 * {@link #add(Object, Object) Add} the given value, only when the map does not
+	 * {@link #containsKey(Object) contain} the given key.
+	 * @param key the key
+	 * @param value the value to be added
+	 * @since 5.2
+	 */
+	default void addIfAbsent(K key, @Nullable V value) {
+		if (!containsKey(key)) {
+			add(key, value);
+		}
+	}
+
+	/**
+	 * Set the given single value under the given key.
+	 * @param key the key
+	 * @param value the value to set
+	 */
+	void set(K key, @Nullable V value);
+
+	/**
+	 * Set the given values under.
+	 * @param values the values.
+	 */
+	void setAll(Map<K, V> values);
+
+	/**
+	 * Return a {@code Map} with the first values contained in this {@code MultiValueMap}.
+	 * @return a single value representation of this map
+	 */
+	Map<K, V> toSingleValueMap();
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
new file mode 100644
index 00000000..2a303c6b
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Adapts a given {@link Map} to the {@link MultiValueMap} contract.
+ *
+ * @author Arjen Poutsma
+ * @author Juergen Hoeller
+ * @since 5.3
+ * @param <K> the key type
+ * @param <V> the value element type
+ * @see CollectionUtils#toMultiValueMap
+ * @see LinkedMultiValueMap
+ */
+@SuppressWarnings("serial")
+public class MultiValueMapAdapter<K, V> implements MultiValueMap<K, V>, Serializable {
+
+    private final Map<K, List<V>> targetMap;
+
+
+    /**
+     * Wrap the given target {@link Map} as a {@link MultiValueMap} adapter.
+     * @param targetMap the plain target {@code Map}
+     */
+    public MultiValueMapAdapter(Map<K, List<V>> targetMap) {
+        Assert.notNull(targetMap, "'targetMap' must not be null");
+        this.targetMap = targetMap;
+    }
+
+
+    // MultiValueMap implementation
+
+    @Override
+    @Nullable
+    public V getFirst(K key) {
+        List<V> values = this.targetMap.get(key);
+        return (!CollectionUtils.isEmpty(values) ? values.get(0) : null);
+    }
+
+    @Override
+    public void add(K key, @Nullable V value) {
+        List<V> values = this.targetMap.computeIfAbsent(key, k -> new ArrayList<>(1));
+        values.add(value);
+    }
+
+    @Override
+    public void addAll(K key, List<? extends V> values) {
+        List<V> currentValues = this.targetMap.computeIfAbsent(key, k -> new ArrayList<>(values.size()));
+        currentValues.addAll(values);
+    }
+
+    @Override
+    public void addAll(MultiValueMap<K, V> values) {
+        for (Entry<K, List<V>> entry : values.entrySet()) {
+            addAll(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public void set(K key, @Nullable V value) {
+        List<V> values = new ArrayList<>(1);
+        values.add(value);
+        this.targetMap.put(key, values);
+    }
+
+    @Override
+    public void setAll(Map<K, V> values) {
+        values.forEach(this::set);
+    }
+
+    @Override
+    public Map<K, V> toSingleValueMap() {
+        Map<K, V> singleValueMap = CollectionUtils.newLinkedHashMap(this.targetMap.size());
+        this.targetMap.forEach((key, values) -> {
+            if (!CollectionUtils.isEmpty(values)) {
+                singleValueMap.put(key, values.get(0));
+            }
+        });
+        return singleValueMap;
+    }
+
+
+    // Map implementation
+
+    @Override
+    public int size() {
+        return this.targetMap.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.targetMap.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return this.targetMap.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return this.targetMap.containsValue(value);
+    }
+
+    @Override
+    @Nullable
+    public List<V> get(Object key) {
+        return this.targetMap.get(key);
+    }
+
+    @Override
+    @Nullable
+    public List<V> put(K key, List<V> value) {
+        return this.targetMap.put(key, value);
+    }
+
+    @Override
+    @Nullable
+    public List<V> remove(Object key) {
+        return this.targetMap.remove(key);
+    }
+
+    @Override
+    public void putAll(Map<? extends K, ? extends List<V>> map) {
+        this.targetMap.putAll(map);
+    }
+
+    @Override
+    public void clear() {
+        this.targetMap.clear();
+    }
+
+    @Override
+    public Set<K> keySet() {
+        return this.targetMap.keySet();
+    }
+
+    @Override
+    public Collection<List<V>> values() {
+        return this.targetMap.values();
+    }
+
+    @Override
+    public Set<Entry<K, List<V>>> entrySet() {
+        return this.targetMap.entrySet();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object other) {
+        return (this == other || this.targetMap.equals(other));
+    }
+
+    @Override
+    public int hashCode() {
+        return this.targetMap.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return this.targetMap.toString();
+    }
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
new file mode 100644
index 00000000..06c564f1
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
@@ -0,0 +1,1040 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.io.File;
+import java.lang.reflect.Array;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.time.ZoneId;
+import java.time.temporal.Temporal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Currency;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.TimeZone;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+/**
+ * Miscellaneous object utility methods.
+ *
+ * <p>Mainly for internal use within the framework.
+ *
+ * <p>Thanks to Alex Ruiz for contributing several enhancements to this class!
+ *
+ * @author Juergen Hoeller
+ * @author Keith Donald
+ * @author Rod Johnson
+ * @author Rob Harrop
+ * @author Chris Beams
+ * @author Sam Brannen
+ * @since 19.03.2004
+ * @see ClassUtils
+ * @see CollectionUtils
+ * @see StringUtils
+ */
+public abstract class ObjectUtils {
+
+	private static final int INITIAL_HASH = 7;
+	private static final int MULTIPLIER = 31;
+
+	private static final String EMPTY_STRING = "";
+	private static final String NULL_STRING = "null";
+	private static final String ARRAY_START = "{";
+	private static final String ARRAY_END = "}";
+	private static final String EMPTY_ARRAY = ARRAY_START + ARRAY_END;
+	private static final String ARRAY_ELEMENT_SEPARATOR = ", ";
+	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+	private static final String NON_EMPTY_ARRAY = ARRAY_START + "..." + ARRAY_END;
+	private static final String COLLECTION = "[...]";
+	private static final String MAP = NON_EMPTY_ARRAY;
+
+
+	/**
+	 * Return whether the given throwable is a checked exception:
+	 * that is, neither a RuntimeException nor an Error.
+	 * @param ex the throwable to check
+	 * @return whether the throwable is a checked exception
+	 * @see Exception
+	 * @see RuntimeException
+	 * @see Error
+	 */
+	public static boolean isCheckedException(Throwable ex) {
+		return !(ex instanceof RuntimeException || ex instanceof Error);
+	}
+
+	/**
+	 * Check whether the given exception is compatible with the specified
+	 * exception types, as declared in a throws clause.
+	 * @param ex the exception to check
+	 * @param declaredExceptions the exception types declared in the throws clause
+	 * @return whether the given exception is compatible
+	 */
+	public static boolean isCompatibleWithThrowsClause(Throwable ex, @Nullable Class<?>... declaredExceptions) {
+		if (!isCheckedException(ex)) {
+			return true;
+		}
+		if (declaredExceptions != null) {
+			for (Class<?> declaredException : declaredExceptions) {
+				if (declaredException.isInstance(ex)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Determine whether the given object is an array:
+	 * either an Object array or a primitive array.
+	 * @param obj the object to check
+	 */
+	public static boolean isArray(@Nullable Object obj) {
+		return (obj != null && obj.getClass().isArray());
+	}
+
+	/**
+	 * Determine whether the given array is empty:
+	 * i.e. {@code null} or of zero length.
+	 * @param array the array to check
+	 * @see #isEmpty(Object)
+	 */
+	public static boolean isEmpty(@Nullable Object[] array) {
+		return (array == null || array.length == 0);
+	}
+
+	/**
+	 * Determine whether the given object is empty.
+	 * <p>This method supports the following object types.
+	 * <ul>
+	 * <li>{@code Optional}: considered empty if not {@link Optional#isPresent()}</li>
+	 * <li>{@code Array}: considered empty if its length is zero</li>
+	 * <li>{@link CharSequence}: considered empty if its length is zero</li>
+	 * <li>{@link Collection}: delegates to {@link Collection#isEmpty()}</li>
+	 * <li>{@link Map}: delegates to {@link Map#isEmpty()}</li>
+	 * </ul>
+	 * <p>If the given object is non-null and not one of the aforementioned
+	 * supported types, this method returns {@code false}.
+	 * @param obj the object to check
+	 * @return {@code true} if the object is {@code null} or <em>empty</em>
+	 * @since 4.2
+	 * @see Optional#isPresent()
+	 * @see ObjectUtils#isEmpty(Object[])
+	 * @see StringUtils#hasLength(CharSequence)
+	 * @see CollectionUtils#isEmpty(Collection)
+	 * @see CollectionUtils#isEmpty(Map)
+	 */
+	public static boolean isEmpty(@Nullable Object obj) {
+		if (obj == null) {
+			return true;
+		}
+
+		if (obj instanceof Optional) {
+			return !((Optional<?>) obj).isPresent();
+		}
+		if (obj instanceof CharSequence) {
+			return ((CharSequence) obj).length() == 0;
+		}
+		if (obj.getClass().isArray()) {
+			return Array.getLength(obj) == 0;
+		}
+		if (obj instanceof Collection) {
+			return ((Collection<?>) obj).isEmpty();
+		}
+		if (obj instanceof Map) {
+			return ((Map<?, ?>) obj).isEmpty();
+		}
+
+		// else
+		return false;
+	}
+
+	/**
+	 * Unwrap the given object which is potentially a {@link Optional}.
+	 * @param obj the candidate object
+	 * @return either the value held within the {@code Optional}, {@code null}
+	 * if the {@code Optional} is empty, or simply the given object as-is
+	 * @since 5.0
+	 */
+	@Nullable
+	public static Object unwrapOptional(@Nullable Object obj) {
+		if (obj instanceof Optional) {
+			Optional<?> optional = (Optional<?>) obj;
+			if (!optional.isPresent()) {
+				return null;
+			}
+			Object result = optional.get();
+			Assert.isTrue(!(result instanceof Optional), "Multi-level Optional usage not supported");
+			return result;
+		}
+		return obj;
+	}
+
+	/**
+	 * Check whether the given array contains the given element.
+	 * @param array the array to check (may be {@code null},
+	 * in which case the return value will always be {@code false})
+	 * @param element the element to check for
+	 * @return whether the element has been found in the given array
+	 */
+	public static boolean containsElement(@Nullable Object[] array, Object element) {
+		if (array == null) {
+			return false;
+		}
+		for (Object arrayEle : array) {
+			if (nullSafeEquals(arrayEle, element)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the given array of enum constants contains a constant with the given name,
+	 * ignoring case when determining a match.
+	 * @param enumValues the enum values to check, typically obtained via {@code MyEnum.values()}
+	 * @param constant the constant name to find (must not be null or empty string)
+	 * @return whether the constant has been found in the given array
+	 */
+	public static boolean containsConstant(Enum<?>[] enumValues, String constant) {
+		return containsConstant(enumValues, constant, false);
+	}
+
+	/**
+	 * Check whether the given array of enum constants contains a constant with the given name.
+	 * @param enumValues the enum values to check, typically obtained via {@code MyEnum.values()}
+	 * @param constant the constant name to find (must not be null or empty string)
+	 * @param caseSensitive whether case is significant in determining a match
+	 * @return whether the constant has been found in the given array
+	 */
+	public static boolean containsConstant(Enum<?>[] enumValues, String constant, boolean caseSensitive) {
+		for (Enum<?> candidate : enumValues) {
+			if (caseSensitive ? candidate.toString().equals(constant) :
+					candidate.toString().equalsIgnoreCase(constant)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Case insensitive alternative to {@link Enum#valueOf(Class, String)}.
+	 * @param <E> the concrete Enum type
+	 * @param enumValues the array of all Enum constants in question, usually per {@code Enum.values()}
+	 * @param constant the constant to get the enum value of
+	 * @throws IllegalArgumentException if the given constant is not found in the given array
+	 * of enum values. Use {@link #containsConstant(Enum[], String)} as a guard to avoid this exception.
+	 */
+	public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, String constant) {
+		for (E candidate : enumValues) {
+			if (candidate.toString().equalsIgnoreCase(constant)) {
+				return candidate;
+			}
+		}
+		throw new IllegalArgumentException("Constant [" + constant + "] does not exist in enum type " +
+				enumValues.getClass().getComponentType().getName());
+	}
+
+	/**
+	 * Append the given object to the given array, returning a new array
+	 * consisting of the input array contents plus the given object.
+	 * @param array the array to append to (can be {@code null})
+	 * @param obj the object to append
+	 * @return the new array (of the same component type; never {@code null})
+	 */
+	public static <A, O extends A> A[] addObjectToArray(@Nullable A[] array, @Nullable O obj) {
+		Class<?> compType = Object.class;
+		if (array != null) {
+			compType = array.getClass().getComponentType();
+		}
+		else if (obj != null) {
+			compType = obj.getClass();
+		}
+		int newArrLength = (array != null ? array.length + 1 : 1);
+		@SuppressWarnings("unchecked")
+		A[] newArr = (A[]) Array.newInstance(compType, newArrLength);
+		if (array != null) {
+			System.arraycopy(array, 0, newArr, 0, array.length);
+		}
+		newArr[newArr.length - 1] = obj;
+		return newArr;
+	}
+
+	/**
+	 * Convert the given array (which may be a primitive array) to an
+	 * object array (if necessary of primitive wrapper objects).
+	 * <p>A {@code null} source value will be converted to an
+	 * empty Object array.
+	 * @param source the (potentially primitive) array
+	 * @return the corresponding object array (never {@code null})
+	 * @throws IllegalArgumentException if the parameter is not an array
+	 */
+	public static Object[] toObjectArray(@Nullable Object source) {
+		if (source instanceof Object[]) {
+			return (Object[]) source;
+		}
+		if (source == null) {
+			return EMPTY_OBJECT_ARRAY;
+		}
+		if (!source.getClass().isArray()) {
+			throw new IllegalArgumentException("Source is not an array: " + source);
+		}
+		int length = Array.getLength(source);
+		if (length == 0) {
+			return EMPTY_OBJECT_ARRAY;
+		}
+		Class<?> wrapperType = Array.get(source, 0).getClass();
+		Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);
+		for (int i = 0; i < length; i++) {
+			newArray[i] = Array.get(source, i);
+		}
+		return newArray;
+	}
+
+
+	//---------------------------------------------------------------------
+	// Convenience methods for content-based equality/hash-code handling
+	//---------------------------------------------------------------------
+
+	/**
+	 * Determine if the given objects are equal, returning {@code true} if
+	 * both are {@code null} or {@code false} if only one is {@code null}.
+	 * <p>Compares arrays with {@code Arrays.equals}, performing an equality
+	 * check based on the array elements rather than the array reference.
+	 * @param o1 first Object to compare
+	 * @param o2 second Object to compare
+	 * @return whether the given objects are equal
+	 * @see Object#equals(Object)
+	 * @see Arrays#equals
+	 */
+	public static boolean nullSafeEquals(@Nullable Object o1, @Nullable Object o2) {
+		if (o1 == o2) {
+			return true;
+		}
+		if (o1 == null || o2 == null) {
+			return false;
+		}
+		if (o1.equals(o2)) {
+			return true;
+		}
+		if (o1.getClass().isArray() && o2.getClass().isArray()) {
+			return arrayEquals(o1, o2);
+		}
+		return false;
+	}
+
+	/**
+	 * Compare the given arrays with {@code Arrays.equals}, performing an equality
+	 * check based on the array elements rather than the array reference.
+	 * @param o1 first array to compare
+	 * @param o2 second array to compare
+	 * @return whether the given objects are equal
+	 * @see #nullSafeEquals(Object, Object)
+	 * @see Arrays#equals
+	 */
+	private static boolean arrayEquals(Object o1, Object o2) {
+		if (o1 instanceof Object[] && o2 instanceof Object[]) {
+			return Arrays.equals((Object[]) o1, (Object[]) o2);
+		}
+		if (o1 instanceof boolean[] && o2 instanceof boolean[]) {
+			return Arrays.equals((boolean[]) o1, (boolean[]) o2);
+		}
+		if (o1 instanceof byte[] && o2 instanceof byte[]) {
+			return Arrays.equals((byte[]) o1, (byte[]) o2);
+		}
+		if (o1 instanceof char[] && o2 instanceof char[]) {
+			return Arrays.equals((char[]) o1, (char[]) o2);
+		}
+		if (o1 instanceof double[] && o2 instanceof double[]) {
+			return Arrays.equals((double[]) o1, (double[]) o2);
+		}
+		if (o1 instanceof float[] && o2 instanceof float[]) {
+			return Arrays.equals((float[]) o1, (float[]) o2);
+		}
+		if (o1 instanceof int[] && o2 instanceof int[]) {
+			return Arrays.equals((int[]) o1, (int[]) o2);
+		}
+		if (o1 instanceof long[] && o2 instanceof long[]) {
+			return Arrays.equals((long[]) o1, (long[]) o2);
+		}
+		if (o1 instanceof short[] && o2 instanceof short[]) {
+			return Arrays.equals((short[]) o1, (short[]) o2);
+		}
+		return false;
+	}
+
+	/**
+	 * Return as hash code for the given object; typically the value of
+	 * {@code Object#hashCode()}}. If the object is an array,
+	 * this method will delegate to any of the {@code nullSafeHashCode}
+	 * methods for arrays in this class. If the object is {@code null},
+	 * this method returns 0.
+	 * @see Object#hashCode()
+	 * @see #nullSafeHashCode(Object[])
+	 * @see #nullSafeHashCode(boolean[])
+	 * @see #nullSafeHashCode(byte[])
+	 * @see #nullSafeHashCode(char[])
+	 * @see #nullSafeHashCode(double[])
+	 * @see #nullSafeHashCode(float[])
+	 * @see #nullSafeHashCode(int[])
+	 * @see #nullSafeHashCode(long[])
+	 * @see #nullSafeHashCode(short[])
+	 */
+	public static int nullSafeHashCode(@Nullable Object obj) {
+		if (obj == null) {
+			return 0;
+		}
+		if (obj.getClass().isArray()) {
+			if (obj instanceof Object[]) {
+				return nullSafeHashCode((Object[]) obj);
+			}
+			if (obj instanceof boolean[]) {
+				return nullSafeHashCode((boolean[]) obj);
+			}
+			if (obj instanceof byte[]) {
+				return nullSafeHashCode((byte[]) obj);
+			}
+			if (obj instanceof char[]) {
+				return nullSafeHashCode((char[]) obj);
+			}
+			if (obj instanceof double[]) {
+				return nullSafeHashCode((double[]) obj);
+			}
+			if (obj instanceof float[]) {
+				return nullSafeHashCode((float[]) obj);
+			}
+			if (obj instanceof int[]) {
+				return nullSafeHashCode((int[]) obj);
+			}
+			if (obj instanceof long[]) {
+				return nullSafeHashCode((long[]) obj);
+			}
+			if (obj instanceof short[]) {
+				return nullSafeHashCode((short[]) obj);
+			}
+		}
+		return obj.hashCode();
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable Object[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (Object element : array) {
+			hash = MULTIPLIER * hash + nullSafeHashCode(element);
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable boolean[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (boolean element : array) {
+			hash = MULTIPLIER * hash + Boolean.hashCode(element);
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable byte[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (byte element : array) {
+			hash = MULTIPLIER * hash + element;
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable char[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (char element : array) {
+			hash = MULTIPLIER * hash + element;
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable double[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (double element : array) {
+			hash = MULTIPLIER * hash + Double.hashCode(element);
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable float[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (float element : array) {
+			hash = MULTIPLIER * hash + Float.hashCode(element);
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable int[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (int element : array) {
+			hash = MULTIPLIER * hash + element;
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable long[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (long element : array) {
+			hash = MULTIPLIER * hash + Long.hashCode(element);
+		}
+		return hash;
+	}
+
+	/**
+	 * Return a hash code based on the contents of the specified array.
+	 * If {@code array} is {@code null}, this method returns 0.
+	 */
+	public static int nullSafeHashCode(@Nullable short[] array) {
+		if (array == null) {
+			return 0;
+		}
+		int hash = INITIAL_HASH;
+		for (short element : array) {
+			hash = MULTIPLIER * hash + element;
+		}
+		return hash;
+	}
+
+	/**
+	 * Return the same value as {@link Boolean#hashCode(boolean)}}.
+	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
+	 */
+	@Deprecated
+	public static int hashCode(boolean bool) {
+		return Boolean.hashCode(bool);
+	}
+
+	/**
+	 * Return the same value as {@link Double#hashCode(double)}}.
+	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
+	 */
+	@Deprecated
+	public static int hashCode(double dbl) {
+		return Double.hashCode(dbl);
+	}
+
+	/**
+	 * Return the same value as {@link Float#hashCode(float)}}.
+	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
+	 */
+	@Deprecated
+	public static int hashCode(float flt) {
+		return Float.hashCode(flt);
+	}
+
+	/**
+	 * Return the same value as {@link Long#hashCode(long)}}.
+	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
+	 */
+	@Deprecated
+	public static int hashCode(long lng) {
+		return Long.hashCode(lng);
+	}
+
+
+	//---------------------------------------------------------------------
+	// Convenience methods for toString output
+	//---------------------------------------------------------------------
+
+	/**
+	 * Return a String representation of an object's overall identity.
+	 * @param obj the object (may be {@code null})
+	 * @return the object's identity as String representation,
+	 * or an empty String if the object was {@code null}
+	 */
+	public static String identityToString(@Nullable Object obj) {
+		if (obj == null) {
+			return EMPTY_STRING;
+		}
+		return obj.getClass().getName() + "@" + getIdentityHexString(obj);
+	}
+
+	/**
+	 * Return a hex String form of an object's identity hash code.
+	 * @param obj the object
+	 * @return the object's identity code in hex notation
+	 */
+	public static String getIdentityHexString(Object obj) {
+		return Integer.toHexString(System.identityHashCode(obj));
+	}
+
+	/**
+	 * Return a content-based String representation if {@code obj} is
+	 * not {@code null}; otherwise returns an empty String.
+	 * <p>Differs from {@link #nullSafeToString(Object)} in that it returns
+	 * an empty String rather than "null" for a {@code null} value.
+	 * @param obj the object to build a display String for
+	 * @return a display String representation of {@code obj}
+	 * @see #nullSafeToString(Object)
+	 */
+	public static String getDisplayString(@Nullable Object obj) {
+		if (obj == null) {
+			return EMPTY_STRING;
+		}
+		return nullSafeToString(obj);
+	}
+
+	/**
+	 * Determine the class name for the given object.
+	 * <p>Returns a {@code "null"} String if {@code obj} is {@code null}.
+	 * @param obj the object to introspect (may be {@code null})
+	 * @return the corresponding class name
+	 */
+	public static String nullSafeClassName(@Nullable Object obj) {
+		return (obj != null ? obj.getClass().getName() : NULL_STRING);
+	}
+
+	/**
+	 * Return a String representation of the specified Object.
+	 * <p>Builds a String representation of the contents in case of an array.
+	 * Returns a {@code "null"} String if {@code obj} is {@code null}.
+	 * @param obj the object to build a String representation for
+	 * @return a String representation of {@code obj}
+	 * @see #nullSafeConciseToString(Object)
+	 */
+	public static String nullSafeToString(@Nullable Object obj) {
+		if (obj == null) {
+			return NULL_STRING;
+		}
+		if (obj instanceof String) {
+			return (String) obj;
+		}
+		if (obj instanceof Object[]) {
+			return nullSafeToString((Object[]) obj);
+		}
+		if (obj instanceof boolean[]) {
+			return nullSafeToString((boolean[]) obj);
+		}
+		if (obj instanceof byte[]) {
+			return nullSafeToString((byte[]) obj);
+		}
+		if (obj instanceof char[]) {
+			return nullSafeToString((char[]) obj);
+		}
+		if (obj instanceof double[]) {
+			return nullSafeToString((double[]) obj);
+		}
+		if (obj instanceof float[]) {
+			return nullSafeToString((float[]) obj);
+		}
+		if (obj instanceof int[]) {
+			return nullSafeToString((int[]) obj);
+		}
+		if (obj instanceof long[]) {
+			return nullSafeToString((long[]) obj);
+		}
+		if (obj instanceof short[]) {
+			return nullSafeToString((short[]) obj);
+		}
+		String str = obj.toString();
+		return (str != null ? str : EMPTY_STRING);
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable Object[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (Object o : array) {
+			stringJoiner.add(String.valueOf(o));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable boolean[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (boolean b : array) {
+			stringJoiner.add(String.valueOf(b));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable byte[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (byte b : array) {
+			stringJoiner.add(String.valueOf(b));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable char[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (char c : array) {
+			stringJoiner.add('\'' + String.valueOf(c) + '\'');
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable double[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (double d : array) {
+			stringJoiner.add(String.valueOf(d));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable float[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (float f : array) {
+			stringJoiner.add(String.valueOf(f));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable int[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (int i : array) {
+			stringJoiner.add(String.valueOf(i));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable long[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (long l : array) {
+			stringJoiner.add(String.valueOf(l));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Return a String representation of the contents of the specified array.
+	 * <p>The String representation consists of a list of the array's elements,
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space).
+	 * Returns a {@code "null"} String if {@code array} is {@code null}.
+	 * @param array the array to build a String representation for
+	 * @return a String representation of {@code array}
+	 */
+	public static String nullSafeToString(@Nullable short[] array) {
+		if (array == null) {
+			return NULL_STRING;
+		}
+		int length = array.length;
+		if (length == 0) {
+			return EMPTY_ARRAY;
+		}
+		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
+		for (short s : array) {
+			stringJoiner.add(String.valueOf(s));
+		}
+		return stringJoiner.toString();
+	}
+
+	/**
+	 * Generate a null-safe, concise string representation of the supplied object
+	 * as described below.
+	 * <p>Favor this method over {@link #nullSafeToString(Object)} when you need
+	 * the length of the generated string to be limited.
+	 * <p>Returns:
+	 * <ul>
+	 * <li>{@code "null"} if {@code obj} is {@code null}</li>
+	 * <li>{@code"Optional.empty"} if {@code obj} is an empty {@link Optional}</li>
+	 * <li>{@code"Optional[<concise-string>]"} if {@code obj} is a non-empty {@code Optional},
+	 * where {@code <concise-string>} is the result of invoking {@link #nullSafeConciseToString}
+	 * on the object contained in the {@code Optional}</li>
+	 * <li>{@code "{}"} if {@code obj} is an empty array</li>
+	 * <li>{@code "{...}"} if {@code obj} is a {@link Map} or a non-empty array</li>
+	 * <li>{@code "[...]"} if {@code obj} is a {@link Collection}</li>
+	 * <li>{@linkplain Class#getName() Class name} if {@code obj} is a {@link Class}</li>
+	 * <li>{@linkplain Charset#name() Charset name} if {@code obj} is a {@link Charset}</li>
+	 * <li>{@linkplain TimeZone#getID() TimeZone ID} if {@code obj} is a {@link TimeZone}</li>
+	 * <li>{@linkplain ZoneId#getId() Zone ID} if {@code obj} is a {@link ZoneId}</li>
+	 * <li>Potentially {@linkplain StringUtils#truncate(CharSequence) truncated string}
+	 * if {@code obj} is a {@link String} or {@link CharSequence}</li>
+	 * <li>Potentially {@linkplain StringUtils#truncate(CharSequence) truncated string}
+	 * if {@code obj} is a <em>simple value type</em> whose {@code toString()} method
+	 * returns a non-null value</li>
+	 * <li>Otherwise, a string representation of the object's type name concatenated
+	 * with {@code "@"} and a hex string form of the object's identity hash code</li>
+	 * </ul>
+	 * <p>In the context of this method, a <em>simple value type</em> is any of the following:
+	 * primitive wrapper (excluding {@link Void}), {@link Enum}, {@link Number},
+	 * {@link Date}, {@link Temporal}, {@link File}, {@link Path}, {@link URI},
+	 * {@link URL}, {@link InetAddress}, {@link Currency}, {@link Locale},
+	 * {@link UUID}, {@link Pattern}.
+	 * @param obj the object to build a string representation for
+	 * @return a concise string representation of the supplied object
+	 * @since 5.3.27
+	 * @see #nullSafeToString(Object)
+	 * @see StringUtils#truncate(CharSequence)
+	 */
+	public static String nullSafeConciseToString(@Nullable Object obj) {
+		if (obj == null) {
+			return "null";
+		}
+		if (obj instanceof Optional<?>) {
+			Optional<?> optional = (Optional<?>) obj;
+			return (!optional.isPresent() ? "Optional.empty" :
+					String.format("Optional[%s]", nullSafeConciseToString(optional.get())));
+		}
+		if (obj.getClass().isArray()) {
+			return (Array.getLength(obj) == 0 ? EMPTY_ARRAY : NON_EMPTY_ARRAY);
+		}
+		if (obj instanceof Collection) {
+			return COLLECTION;
+		}
+		if (obj instanceof Map) {
+			return MAP;
+		}
+		if (obj instanceof Class<?>) {
+			return ((Class<?>) obj).getName();
+		}
+		if (obj instanceof Charset) {
+			return ((Charset) obj).name();
+		}
+		if (obj instanceof TimeZone) {
+			return ((TimeZone) obj).getID();
+		}
+		if (obj instanceof ZoneId) {
+			return ((ZoneId) obj).getId();
+		}
+		if (obj instanceof CharSequence) {
+			return StringUtils.truncate((CharSequence) obj);
+		}
+		Class<?> type = obj.getClass();
+		if (isSimpleValueType(type)) {
+			String str = obj.toString();
+			if (str != null) {
+				return StringUtils.truncate(str);
+			}
+		}
+		return type.getTypeName() + "@" + getIdentityHexString(obj);
+	}
+
+	/**
+	 * Derived from {@link org.springframework.beans.BeanUtils#isSimpleValueType}.
+	 * <p>As of 5.3.28, considering {@link UUID} in addition to the bean-level check.
+	 * <p>As of 5.3.29, additionally considering {@link File}, {@link Path},
+	 * {@link InetAddress}, {@link Charset}, {@link Currency}, {@link TimeZone},
+	 * {@link ZoneId}, {@link Pattern}.
+	 */
+	private static boolean isSimpleValueType(Class<?> type) {
+		return (Void.class != type && void.class != type &&
+				(ClassUtils.isPrimitiveOrWrapper(type) ||
+				Enum.class.isAssignableFrom(type) ||
+				CharSequence.class.isAssignableFrom(type) ||
+				Number.class.isAssignableFrom(type) ||
+				Date.class.isAssignableFrom(type) ||
+				Temporal.class.isAssignableFrom(type) ||
+				ZoneId.class.isAssignableFrom(type) ||
+				TimeZone.class.isAssignableFrom(type) ||
+				File.class.isAssignableFrom(type) ||
+				Path.class.isAssignableFrom(type) ||
+				Charset.class.isAssignableFrom(type) ||
+				Currency.class.isAssignableFrom(type) ||
+				InetAddress.class.isAssignableFrom(type) ||
+				URI.class == type ||
+				URL.class == type ||
+				UUID.class == type ||
+				Locale.class == type ||
+				Pattern.class == type ||
+				Class.class == type));
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
new file mode 100644
index 00000000..bcdd6b68
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -0,0 +1,881 @@
+/*
+ * Copyright 2002-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple utility class for working with the reflection API and handling
+ * reflection exceptions.
+ *
+ * <p>Only intended for internal use.
+ *
+ * @author Juergen Hoeller
+ * @author Rob Harrop
+ * @author Rod Johnson
+ * @author Costin Leau
+ * @author Sam Brannen
+ * @author Chris Beams
+ * @since 1.2.2
+ */
+public abstract class ReflectionUtils {
+
+	/**
+	 * Pre-built {@link MethodFilter} that matches all non-bridge non-synthetic methods
+	 * which are not declared on {@code java.lang.Object}.
+	 * @since 3.0.5
+	 */
+	public static final MethodFilter USER_DECLARED_METHODS =
+			(method -> !method.isBridge() && !method.isSynthetic() && (method.getDeclaringClass() != Object.class));
+
+	/**
+	 * Pre-built FieldFilter that matches all non-static, non-final fields.
+	 */
+	public static final FieldFilter COPYABLE_FIELDS =
+			(field -> !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())));
+
+
+	/**
+	 * Naming prefix for CGLIB-renamed methods.
+	 * @see #isCglibRenamedMethod
+	 */
+	private static final String CGLIB_RENAMED_METHOD_PREFIX = "CGLIB$";
+
+	private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
+
+	private static final Method[] EMPTY_METHOD_ARRAY = new Method[0];
+
+	private static final Field[] EMPTY_FIELD_ARRAY = new Field[0];
+
+	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+
+
+	/**
+	 * Cache for {@link Class#getDeclaredMethods()} plus equivalent default methods
+	 * from Java 8 based interfaces, allowing for fast iteration.
+	 */
+	private static final Map<Class<?>, Method[]> declaredMethodsCache = new ConcurrentReferenceHashMap<>(256);
+
+	/**
+	 * Cache for {@link Class#getDeclaredFields()}, allowing for fast iteration.
+	 */
+	private static final Map<Class<?>, Field[]> declaredFieldsCache = new ConcurrentReferenceHashMap<>(256);
+
+
+	// Exception handling
+
+	/**
+	 * Handle the given reflection exception.
+	 * <p>Should only be called if no checked exception is expected to be thrown
+	 * by a target method, or if an error occurs while accessing a method or field.
+	 * <p>Throws the underlying RuntimeException or Error in case of an
+	 * InvocationTargetException with such a root cause. Throws an
+	 * IllegalStateException with an appropriate message or
+	 * UndeclaredThrowableException otherwise.
+	 * @param ex the reflection exception to handle
+	 */
+	public static void handleReflectionException(Exception ex) {
+		if (ex instanceof NoSuchMethodException) {
+			throw new IllegalStateException("Method not found: " + ex.getMessage());
+		}
+		if (ex instanceof IllegalAccessException) {
+			throw new IllegalStateException("Could not access method or field: " + ex.getMessage());
+		}
+		if (ex instanceof InvocationTargetException) {
+			handleInvocationTargetException((InvocationTargetException) ex);
+		}
+		if (ex instanceof RuntimeException) {
+			throw (RuntimeException) ex;
+		}
+		throw new UndeclaredThrowableException(ex);
+	}
+
+	/**
+	 * Handle the given invocation target exception. Should only be called if no
+	 * checked exception is expected to be thrown by the target method.
+	 * <p>Throws the underlying RuntimeException or Error in case of such a root
+	 * cause. Throws an UndeclaredThrowableException otherwise.
+	 * @param ex the invocation target exception to handle
+	 */
+	public static void handleInvocationTargetException(InvocationTargetException ex) {
+		rethrowRuntimeException(ex.getTargetException());
+	}
+
+	/**
+	 * Rethrow the given {@link Throwable exception}, which is presumably the
+	 * <em>target exception</em> of an {@link InvocationTargetException}.
+	 * Should only be called if no checked exception is expected to be thrown
+	 * by the target method.
+	 * <p>Rethrows the underlying exception cast to a {@link RuntimeException} or
+	 * {@link Error} if appropriate; otherwise, throws an
+	 * {@link UndeclaredThrowableException}.
+	 * @param ex the exception to rethrow
+	 * @throws RuntimeException the rethrown exception
+	 */
+	public static void rethrowRuntimeException(Throwable ex) {
+		if (ex instanceof RuntimeException) {
+			throw (RuntimeException) ex;
+		}
+		if (ex instanceof Error) {
+			throw (Error) ex;
+		}
+		throw new UndeclaredThrowableException(ex);
+	}
+
+	/**
+	 * Rethrow the given {@link Throwable exception}, which is presumably the
+	 * <em>target exception</em> of an {@link InvocationTargetException}.
+	 * Should only be called if no checked exception is expected to be thrown
+	 * by the target method.
+	 * <p>Rethrows the underlying exception cast to an {@link Exception} or
+	 * {@link Error} if appropriate; otherwise, throws an
+	 * {@link UndeclaredThrowableException}.
+	 * @param ex the exception to rethrow
+	 * @throws Exception the rethrown exception (in case of a checked exception)
+	 */
+	public static void rethrowException(Throwable ex) throws Exception {
+		if (ex instanceof Exception) {
+			throw (Exception) ex;
+		}
+		if (ex instanceof Error) {
+			throw (Error) ex;
+		}
+		throw new UndeclaredThrowableException(ex);
+	}
+
+
+	// Constructor handling
+
+	/**
+	 * Obtain an accessible constructor for the given class and parameters.
+	 * @param clazz the clazz to check
+	 * @param parameterTypes the parameter types of the desired constructor
+	 * @return the constructor reference
+	 * @throws NoSuchMethodException if no such constructor exists
+	 * @since 5.0
+	 */
+	public static <T> Constructor<T> accessibleConstructor(Class<T> clazz, Class<?>... parameterTypes)
+			throws NoSuchMethodException {
+
+		Constructor<T> ctor = clazz.getDeclaredConstructor(parameterTypes);
+		makeAccessible(ctor);
+		return ctor;
+	}
+
+	/**
+	 * Make the given constructor accessible, explicitly setting it accessible
+	 * if necessary. The {@code setAccessible(true)} method is only called
+	 * when actually necessary, to avoid unnecessary conflicts with a JVM
+	 * SecurityManager (if active).
+	 * @param ctor the constructor to make accessible
+	 * @see Constructor#setAccessible
+	 */
+	@SuppressWarnings("deprecation")  // on JDK 9
+	public static void makeAccessible(Constructor<?> ctor) {
+		if ((!Modifier.isPublic(ctor.getModifiers()) ||
+				!Modifier.isPublic(ctor.getDeclaringClass().getModifiers())) && !ctor.isAccessible()) {
+			ctor.setAccessible(true);
+		}
+	}
+
+
+	// Method handling
+
+	/**
+	 * Attempt to find a {@link Method} on the supplied class with the supplied name
+	 * and no parameters. Searches all superclasses up to {@code Object}.
+	 * <p>Returns {@code null} if no {@link Method} can be found.
+	 * @param clazz the class to introspect
+	 * @param name the name of the method
+	 * @return the Method object, or {@code null} if none found
+	 */
+	@Nullable
+	public static Method findMethod(Class<?> clazz, String name) {
+		return findMethod(clazz, name, EMPTY_CLASS_ARRAY);
+	}
+
+	/**
+	 * Attempt to find a {@link Method} on the supplied class with the supplied name
+	 * and parameter types. Searches all superclasses up to {@code Object}.
+	 * <p>Returns {@code null} if no {@link Method} can be found.
+	 * @param clazz the class to introspect
+	 * @param name the name of the method
+	 * @param paramTypes the parameter types of the method
+	 * (may be {@code null} to indicate any signature)
+	 * @return the Method object, or {@code null} if none found
+	 */
+	@Nullable
+	public static Method findMethod(Class<?> clazz, String name, @Nullable Class<?>... paramTypes) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.notNull(name, "Method name must not be null");
+		Class<?> searchType = clazz;
+		while (searchType != null) {
+			Method[] methods = (searchType.isInterface() ? searchType.getMethods() :
+					getDeclaredMethods(searchType, false));
+			for (Method method : methods) {
+				if (name.equals(method.getName()) && (paramTypes == null || hasSameParams(method, paramTypes))) {
+					return method;
+				}
+			}
+			searchType = searchType.getSuperclass();
+		}
+		return null;
+	}
+
+	private static boolean hasSameParams(Method method, Class<?>[] paramTypes) {
+		return (paramTypes.length == method.getParameterCount() &&
+				Arrays.equals(paramTypes, method.getParameterTypes()));
+	}
+
+	/**
+	 * Invoke the specified {@link Method} against the supplied target object with no arguments.
+	 * The target object can be {@code null} when invoking a static {@link Method}.
+	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
+	 * @param method the method to invoke
+	 * @param target the target object to invoke the method on
+	 * @return the invocation result, if any
+	 * @see #invokeMethod(Method, Object, Object[])
+	 */
+	@Nullable
+	public static Object invokeMethod(Method method, @Nullable Object target) {
+		return invokeMethod(method, target, EMPTY_OBJECT_ARRAY);
+	}
+
+	/**
+	 * Invoke the specified {@link Method} against the supplied target object with the
+	 * supplied arguments. The target object can be {@code null} when invoking a
+	 * static {@link Method}.
+	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
+	 * @param method the method to invoke
+	 * @param target the target object to invoke the method on
+	 * @param args the invocation arguments (may be {@code null})
+	 * @return the invocation result, if any
+	 */
+	@Nullable
+	public static Object invokeMethod(Method method, @Nullable Object target, @Nullable Object... args) {
+		try {
+			return method.invoke(target, args);
+		}
+		catch (Exception ex) {
+			handleReflectionException(ex);
+		}
+		throw new IllegalStateException("Should never get here");
+	}
+
+	/**
+	 * Determine whether the given method explicitly declares the given
+	 * exception or one of its superclasses, which means that an exception
+	 * of that type can be propagated as-is within a reflective invocation.
+	 * @param method the declaring method
+	 * @param exceptionType the exception to throw
+	 * @return {@code true} if the exception can be thrown as-is;
+	 * {@code false} if it needs to be wrapped
+	 */
+	public static boolean declaresException(Method method, Class<?> exceptionType) {
+		Assert.notNull(method, "Method must not be null");
+		Class<?>[] declaredExceptions = method.getExceptionTypes();
+		for (Class<?> declaredException : declaredExceptions) {
+			if (declaredException.isAssignableFrom(exceptionType)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Perform the given callback operation on all matching methods of the given
+	 * class, as locally declared or equivalent thereof (such as default methods
+	 * on Java 8 based interfaces that the given class implements).
+	 * @param clazz the class to introspect
+	 * @param mc the callback to invoke for each method
+	 * @throws IllegalStateException if introspection fails
+	 * @since 4.2
+	 * @see #doWithMethods
+	 */
+	public static void doWithLocalMethods(Class<?> clazz, MethodCallback mc) {
+		Method[] methods = getDeclaredMethods(clazz, false);
+		for (Method method : methods) {
+			try {
+				mc.doWith(method);
+			}
+			catch (IllegalAccessException ex) {
+				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
+			}
+		}
+	}
+
+	/**
+	 * Perform the given callback operation on all matching methods of the given
+	 * class and superclasses.
+	 * <p>The same named method occurring on subclass and superclass will appear
+	 * twice, unless excluded by a {@link MethodFilter}.
+	 * @param clazz the class to introspect
+	 * @param mc the callback to invoke for each method
+	 * @throws IllegalStateException if introspection fails
+	 * @see #doWithMethods(Class, MethodCallback, MethodFilter)
+	 */
+	public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
+		doWithMethods(clazz, mc, null);
+	}
+
+	/**
+	 * Perform the given callback operation on all matching methods of the given
+	 * class and superclasses (or given interface and super-interfaces).
+	 * <p>The same named method occurring on subclass and superclass will appear
+	 * twice, unless excluded by the specified {@link MethodFilter}.
+	 * @param clazz the class to introspect
+	 * @param mc the callback to invoke for each method
+	 * @param mf the filter that determines the methods to apply the callback to
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static void doWithMethods(Class<?> clazz, MethodCallback mc, @Nullable MethodFilter mf) {
+		if (mf == USER_DECLARED_METHODS && clazz == Object.class) {
+			// nothing to introspect
+			return;
+		}
+		Method[] methods = getDeclaredMethods(clazz, false);
+		for (Method method : methods) {
+			if (mf != null && !mf.matches(method)) {
+				continue;
+			}
+			try {
+				mc.doWith(method);
+			}
+			catch (IllegalAccessException ex) {
+				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
+			}
+		}
+		// Keep backing up the inheritance hierarchy.
+		if (clazz.getSuperclass() != null && (mf != USER_DECLARED_METHODS || clazz.getSuperclass() != Object.class)) {
+			doWithMethods(clazz.getSuperclass(), mc, mf);
+		}
+		else if (clazz.isInterface()) {
+			for (Class<?> superIfc : clazz.getInterfaces()) {
+				doWithMethods(superIfc, mc, mf);
+			}
+		}
+	}
+
+	/**
+	 * Get all declared methods on the leaf class and all superclasses.
+	 * Leaf class methods are included first.
+	 * @param leafClass the class to introspect
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static Method[] getAllDeclaredMethods(Class<?> leafClass) {
+		final List<Method> methods = new ArrayList<>(20);
+		doWithMethods(leafClass, methods::add);
+		return methods.toArray(EMPTY_METHOD_ARRAY);
+	}
+
+	/**
+	 * Get the unique set of declared methods on the leaf class and all superclasses.
+	 * Leaf class methods are included first and while traversing the superclass hierarchy
+	 * any methods found with signatures matching a method already included are filtered out.
+	 * @param leafClass the class to introspect
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass) {
+		return getUniqueDeclaredMethods(leafClass, null);
+	}
+
+	/**
+	 * Get the unique set of declared methods on the leaf class and all superclasses.
+	 * Leaf class methods are included first and while traversing the superclass hierarchy
+	 * any methods found with signatures matching a method already included are filtered out.
+	 * @param leafClass the class to introspect
+	 * @param mf the filter that determines the methods to take into account
+	 * @throws IllegalStateException if introspection fails
+	 * @since 5.2
+	 */
+	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass, @Nullable MethodFilter mf) {
+		final List<Method> methods = new ArrayList<>(20);
+		doWithMethods(leafClass, method -> {
+			boolean knownSignature = false;
+			Method methodBeingOverriddenWithCovariantReturnType = null;
+			for (Method existingMethod : methods) {
+				if (method.getName().equals(existingMethod.getName()) &&
+						method.getParameterCount() == existingMethod.getParameterCount() &&
+						Arrays.equals(method.getParameterTypes(), existingMethod.getParameterTypes())) {
+					// Is this a covariant return type situation?
+					if (existingMethod.getReturnType() != method.getReturnType() &&
+							existingMethod.getReturnType().isAssignableFrom(method.getReturnType())) {
+						methodBeingOverriddenWithCovariantReturnType = existingMethod;
+					}
+					else {
+						knownSignature = true;
+					}
+					break;
+				}
+			}
+			if (methodBeingOverriddenWithCovariantReturnType != null) {
+				methods.remove(methodBeingOverriddenWithCovariantReturnType);
+			}
+			if (!knownSignature && !isCglibRenamedMethod(method)) {
+				methods.add(method);
+			}
+		}, mf);
+		return methods.toArray(EMPTY_METHOD_ARRAY);
+	}
+
+	/**
+	 * Variant of {@link Class#getDeclaredMethods()} that uses a local cache in
+	 * order to avoid the JVM's SecurityManager check and new Method instances.
+	 * In addition, it also includes Java 8 default methods from locally
+	 * implemented interfaces, since those are effectively to be treated just
+	 * like declared methods.
+	 * @param clazz the class to introspect
+	 * @return the cached array of methods
+	 * @throws IllegalStateException if introspection fails
+	 * @since 5.2
+	 * @see Class#getDeclaredMethods()
+	 */
+	public static Method[] getDeclaredMethods(Class<?> clazz) {
+		return getDeclaredMethods(clazz, true);
+	}
+
+	private static Method[] getDeclaredMethods(Class<?> clazz, boolean defensive) {
+		Assert.notNull(clazz, "Class must not be null");
+		Method[] result = declaredMethodsCache.get(clazz);
+		if (result == null) {
+			try {
+				Method[] declaredMethods = clazz.getDeclaredMethods();
+				List<Method> defaultMethods = findConcreteMethodsOnInterfaces(clazz);
+				if (defaultMethods != null) {
+					result = new Method[declaredMethods.length + defaultMethods.size()];
+					System.arraycopy(declaredMethods, 0, result, 0, declaredMethods.length);
+					int index = declaredMethods.length;
+					for (Method defaultMethod : defaultMethods) {
+						result[index] = defaultMethod;
+						index++;
+					}
+				}
+				else {
+					result = declaredMethods;
+				}
+				declaredMethodsCache.put(clazz, (result.length == 0 ? EMPTY_METHOD_ARRAY : result));
+			}
+			catch (Throwable ex) {
+				throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
+						"] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
+			}
+		}
+		return (result.length == 0 || !defensive) ? result : result.clone();
+	}
+
+	@Nullable
+	private static List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
+		List<Method> result = null;
+		for (Class<?> ifc : clazz.getInterfaces()) {
+			for (Method ifcMethod : ifc.getMethods()) {
+				if (!Modifier.isAbstract(ifcMethod.getModifiers())) {
+					if (result == null) {
+						result = new ArrayList<>();
+					}
+					result.add(ifcMethod);
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Determine whether the given method is an "equals" method.
+	 * @see Object#equals(Object)
+	 */
+	public static boolean isEqualsMethod(@Nullable Method method) {
+		return (method != null && method.getParameterCount() == 1 && method.getName().equals("equals") &&
+				method.getParameterTypes()[0] == Object.class);
+	}
+
+	/**
+	 * Determine whether the given method is a "hashCode" method.
+	 * @see Object#hashCode()
+	 */
+	public static boolean isHashCodeMethod(@Nullable Method method) {
+		return (method != null && method.getParameterCount() == 0 && method.getName().equals("hashCode"));
+	}
+
+	/**
+	 * Determine whether the given method is a "toString" method.
+	 * @see Object#toString()
+	 */
+	public static boolean isToStringMethod(@Nullable Method method) {
+		return (method != null && method.getParameterCount() == 0 && method.getName().equals("toString"));
+	}
+
+	/**
+	 * Determine whether the given method is originally declared by {@link Object}.
+	 */
+	public static boolean isObjectMethod(@Nullable Method method) {
+		return (method != null && (method.getDeclaringClass() == Object.class ||
+				isEqualsMethod(method) || isHashCodeMethod(method) || isToStringMethod(method)));
+	}
+
+	/**
+	 * Determine whether the given method is a CGLIB 'renamed' method,
+	 * following the pattern "CGLIB$methodName$0".
+	 * @param renamedMethod the method to check
+	 */
+	public static boolean isCglibRenamedMethod(Method renamedMethod) {
+		String name = renamedMethod.getName();
+		if (name.startsWith(CGLIB_RENAMED_METHOD_PREFIX)) {
+			int i = name.length() - 1;
+			while (i >= 0 && Character.isDigit(name.charAt(i))) {
+				i--;
+			}
+			return (i > CGLIB_RENAMED_METHOD_PREFIX.length() && (i < name.length() - 1) && name.charAt(i) == '$');
+		}
+		return false;
+	}
+
+	/**
+	 * Make the given method accessible, explicitly setting it accessible if
+	 * necessary. The {@code setAccessible(true)} method is only called
+	 * when actually necessary, to avoid unnecessary conflicts with a JVM
+	 * SecurityManager (if active).
+	 * @param method the method to make accessible
+	 * @see Method#setAccessible
+	 */
+	@SuppressWarnings("deprecation")  // on JDK 9
+	public static void makeAccessible(Method method) {
+		if ((!Modifier.isPublic(method.getModifiers()) ||
+				!Modifier.isPublic(method.getDeclaringClass().getModifiers())) && !method.isAccessible()) {
+			method.setAccessible(true);
+		}
+	}
+
+
+	// Field handling
+
+	/**
+	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
+	 * supplied {@code name}. Searches all superclasses up to {@link Object}.
+	 * @param clazz the class to introspect
+	 * @param name the name of the field
+	 * @return the corresponding Field object, or {@code null} if not found
+	 */
+	@Nullable
+	public static Field findField(Class<?> clazz, String name) {
+		return findField(clazz, name, null);
+	}
+
+	/**
+	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
+	 * supplied {@code name} and/or {@link Class type}. Searches all superclasses
+	 * up to {@link Object}.
+	 * @param clazz the class to introspect
+	 * @param name the name of the field (may be {@code null} if type is specified)
+	 * @param type the type of the field (may be {@code null} if name is specified)
+	 * @return the corresponding Field object, or {@code null} if not found
+	 */
+	@Nullable
+	public static Field findField(Class<?> clazz, @Nullable String name, @Nullable Class<?> type) {
+		Assert.notNull(clazz, "Class must not be null");
+		Assert.isTrue(name != null || type != null, "Either name or type of the field must be specified");
+		Class<?> searchType = clazz;
+		while (Object.class != searchType && searchType != null) {
+			Field[] fields = getDeclaredFields(searchType);
+			for (Field field : fields) {
+				if ((name == null || name.equals(field.getName())) &&
+						(type == null || type.equals(field.getType()))) {
+					return field;
+				}
+			}
+			searchType = searchType.getSuperclass();
+		}
+		return null;
+	}
+
+	/**
+	 * Set the field represented by the supplied {@linkplain Field field object} on
+	 * the specified {@linkplain Object target object} to the specified {@code value}.
+	 * <p>In accordance with {@link Field#set(Object, Object)} semantics, the new value
+	 * is automatically unwrapped if the underlying field has a primitive type.
+	 * <p>This method does not support setting {@code static final} fields.
+	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
+	 * @param field the field to set
+	 * @param target the target object on which to set the field
+	 * (or {@code null} for a static field)
+	 * @param value the value to set (may be {@code null})
+	 */
+	public static void setField(Field field, @Nullable Object target, @Nullable Object value) {
+		try {
+			field.set(target, value);
+		}
+		catch (IllegalAccessException ex) {
+			handleReflectionException(ex);
+		}
+	}
+
+	/**
+	 * Get the field represented by the supplied {@link Field field object} on the
+	 * specified {@link Object target object}. In accordance with {@link Field#get(Object)}
+	 * semantics, the returned value is automatically wrapped if the underlying field
+	 * has a primitive type.
+	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
+	 * @param field the field to get
+	 * @param target the target object from which to get the field
+	 * (or {@code null} for a static field)
+	 * @return the field's current value
+	 */
+	@Nullable
+	public static Object getField(Field field, @Nullable Object target) {
+		try {
+			return field.get(target);
+		}
+		catch (IllegalAccessException ex) {
+			handleReflectionException(ex);
+		}
+		throw new IllegalStateException("Should never get here");
+	}
+
+	/**
+	 * Invoke the given callback on all locally declared fields in the given class.
+	 * @param clazz the target class to analyze
+	 * @param fc the callback to invoke for each field
+	 * @throws IllegalStateException if introspection fails
+	 * @since 4.2
+	 * @see #doWithFields
+	 */
+	public static void doWithLocalFields(Class<?> clazz, FieldCallback fc) {
+		for (Field field : getDeclaredFields(clazz)) {
+			try {
+				fc.doWith(field);
+			}
+			catch (IllegalAccessException ex) {
+				throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
+			}
+		}
+	}
+
+	/**
+	 * Invoke the given callback on all fields in the target class, going up the
+	 * class hierarchy to get all declared fields.
+	 * @param clazz the target class to analyze
+	 * @param fc the callback to invoke for each field
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static void doWithFields(Class<?> clazz, FieldCallback fc) {
+		doWithFields(clazz, fc, null);
+	}
+
+	/**
+	 * Invoke the given callback on all fields in the target class, going up the
+	 * class hierarchy to get all declared fields.
+	 * @param clazz the target class to analyze
+	 * @param fc the callback to invoke for each field
+	 * @param ff the filter that determines the fields to apply the callback to
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static void doWithFields(Class<?> clazz, FieldCallback fc, @Nullable FieldFilter ff) {
+		// Keep backing up the inheritance hierarchy.
+		Class<?> targetClass = clazz;
+		do {
+			Field[] fields = getDeclaredFields(targetClass);
+			for (Field field : fields) {
+				if (ff != null && !ff.matches(field)) {
+					continue;
+				}
+				try {
+					fc.doWith(field);
+				}
+				catch (IllegalAccessException ex) {
+					throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
+				}
+			}
+			targetClass = targetClass.getSuperclass();
+		}
+		while (targetClass != null && targetClass != Object.class);
+	}
+
+	/**
+	 * This variant retrieves {@link Class#getDeclaredFields()} from a local cache
+	 * in order to avoid the JVM's SecurityManager check and defensive array copying.
+	 * @param clazz the class to introspect
+	 * @return the cached array of fields
+	 * @throws IllegalStateException if introspection fails
+	 * @see Class#getDeclaredFields()
+	 */
+	private static Field[] getDeclaredFields(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		Field[] result = declaredFieldsCache.get(clazz);
+		if (result == null) {
+			try {
+				result = clazz.getDeclaredFields();
+				declaredFieldsCache.put(clazz, (result.length == 0 ? EMPTY_FIELD_ARRAY : result));
+			}
+			catch (Throwable ex) {
+				throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
+						"] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Given the source object and the destination, which must be the same class
+	 * or a subclass, copy all fields, including inherited fields. Designed to
+	 * work on objects with public no-arg constructors.
+	 * @throws IllegalStateException if introspection fails
+	 */
+	public static void shallowCopyFieldState(final Object src, final Object dest) {
+		Assert.notNull(src, "Source for field copy cannot be null");
+		Assert.notNull(dest, "Destination for field copy cannot be null");
+		if (!src.getClass().isAssignableFrom(dest.getClass())) {
+			throw new IllegalArgumentException("Destination class [" + dest.getClass().getName() +
+					"] must be same or subclass as source class [" + src.getClass().getName() + "]");
+		}
+		doWithFields(src.getClass(), field -> {
+			makeAccessible(field);
+			Object srcValue = field.get(src);
+			field.set(dest, srcValue);
+		}, COPYABLE_FIELDS);
+	}
+
+	/**
+	 * Determine whether the given field is a "public static final" constant.
+	 * @param field the field to check
+	 */
+	public static boolean isPublicStaticFinal(Field field) {
+		int modifiers = field.getModifiers();
+		return (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers));
+	}
+
+	/**
+	 * Make the given field accessible, explicitly setting it accessible if
+	 * necessary. The {@code setAccessible(true)} method is only called
+	 * when actually necessary, to avoid unnecessary conflicts with a JVM
+	 * SecurityManager (if active).
+	 * @param field the field to make accessible
+	 * @see Field#setAccessible
+	 */
+	@SuppressWarnings("deprecation")  // on JDK 9
+	public static void makeAccessible(Field field) {
+		if ((!Modifier.isPublic(field.getModifiers()) ||
+				!Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
+				Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
+			field.setAccessible(true);
+		}
+	}
+
+
+	// Cache handling
+
+	/**
+	 * Clear the internal method/field cache.
+	 * @since 4.2.4
+	 */
+	public static void clearCache() {
+		declaredMethodsCache.clear();
+		declaredFieldsCache.clear();
+	}
+
+
+	/**
+	 * Action to take on each method.
+	 */
+	@FunctionalInterface
+	public interface MethodCallback {
+
+		/**
+		 * Perform an operation using the given method.
+		 * @param method the method to operate on
+		 */
+		void doWith(Method method) throws IllegalArgumentException, IllegalAccessException;
+	}
+
+
+	/**
+	 * Callback optionally used to filter methods to be operated on by a method callback.
+	 */
+	@FunctionalInterface
+	public interface MethodFilter {
+
+		/**
+		 * Determine whether the given method matches.
+		 * @param method the method to check
+		 */
+		boolean matches(Method method);
+
+		/**
+		 * Create a composite filter based on this filter <em>and</em> the provided filter.
+		 * <p>If this filter does not match, the next filter will not be applied.
+		 * @param next the next {@code MethodFilter}
+		 * @return a composite {@code MethodFilter}
+		 * @throws IllegalArgumentException if the MethodFilter argument is {@code null}
+		 * @since 5.3.2
+		 */
+		default MethodFilter and(MethodFilter next) {
+			Assert.notNull(next, "Next MethodFilter must not be null");
+			return method -> matches(method) && next.matches(method);
+		}
+	}
+
+
+	/**
+	 * Callback interface invoked on each field in the hierarchy.
+	 */
+	@FunctionalInterface
+	public interface FieldCallback {
+
+		/**
+		 * Perform an operation using the given field.
+		 * @param field the field to operate on
+		 */
+		void doWith(Field field) throws IllegalArgumentException, IllegalAccessException;
+	}
+
+
+	/**
+	 * Callback optionally used to filter fields to be operated on by a field callback.
+	 */
+	@FunctionalInterface
+	public interface FieldFilter {
+
+		/**
+		 * Determine whether the given field matches.
+		 * @param field the field to check
+		 */
+		boolean matches(Field field);
+
+		/**
+		 * Create a composite filter based on this filter <em>and</em> the provided filter.
+		 * <p>If this filter does not match, the next filter will not be applied.
+		 * @param next the next {@code FieldFilter}
+		 * @return a composite {@code FieldFilter}
+		 * @throws IllegalArgumentException if the FieldFilter argument is {@code null}
+		 * @since 5.3.2
+		 */
+		default FieldFilter and(FieldFilter next) {
+			Assert.notNull(next, "Next FieldFilter must not be null");
+			return field -> matches(field) && next.matches(field);
+		}
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
new file mode 100644
index 00000000..f8af0f49
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2002-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.nio.charset.Charset;
+
+/**
+ * Simple utility methods for dealing with streams. The copy methods of this class are
+ * similar to those defined in {@link FileCopyUtils} except that all affected streams are
+ * left open when done. All copy methods use a block size of 4096 bytes.
+ *
+ * <p>Mainly for use within the framework, but also useful for application code.
+ *
+ * @author Juergen Hoeller
+ * @author Phillip Webb
+ * @author Brian Clozel
+ * @since 3.2.2
+ * @see FileCopyUtils
+ */
+public abstract class StreamUtils {
+
+	/**
+	 * The default buffer size used when copying bytes.
+	 */
+	public static final int BUFFER_SIZE = 4096;
+
+	private static final byte[] EMPTY_CONTENT = new byte[0];
+
+
+	/**
+	 * Copy the contents of the given InputStream into a new byte array.
+	 * <p>Leaves the stream open when done.
+	 * @param in the stream to copy from (may be {@code null} or empty)
+	 * @return the new byte array that has been copied to (possibly empty)
+	 * @throws IOException in case of I/O errors
+	 */
+	public static byte[] copyToByteArray(@Nullable InputStream in) throws IOException {
+		if (in == null) {
+			return new byte[0];
+		}
+
+		ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE);
+		copy(in, out);
+		return out.toByteArray();
+	}
+
+	/**
+	 * Copy the contents of the given InputStream into a String.
+	 * <p>Leaves the stream open when done.
+	 * @param in the InputStream to copy from (may be {@code null} or empty)
+	 * @param charset the {@link Charset} to use to decode the bytes
+	 * @return the String that has been copied to (possibly empty)
+	 * @throws IOException in case of I/O errors
+	 */
+	public static String copyToString(@Nullable InputStream in, Charset charset) throws IOException {
+		if (in == null) {
+			return "";
+		}
+
+		StringBuilder out = new StringBuilder(BUFFER_SIZE);
+		InputStreamReader reader = new InputStreamReader(in, charset);
+		char[] buffer = new char[BUFFER_SIZE];
+		int charsRead;
+		while ((charsRead = reader.read(buffer)) != -1) {
+			out.append(buffer, 0, charsRead);
+		}
+		return out.toString();
+	}
+
+	/**
+	 * Copy the contents of the given {@link ByteArrayOutputStream} into a {@link String}.
+	 * <p>This is a more effective equivalent of {@code new String(baos.toByteArray(), charset)}.
+	 * @param baos the {@code ByteArrayOutputStream} to be copied into a String
+	 * @param charset the {@link Charset} to use to decode the bytes
+	 * @return the String that has been copied to (possibly empty)
+	 * @since 5.2.6
+	 */
+	public static String copyToString(ByteArrayOutputStream baos, Charset charset) {
+		Assert.notNull(baos, "No ByteArrayOutputStream specified");
+		Assert.notNull(charset, "No Charset specified");
+		try {
+			// Can be replaced with toString(Charset) call in Java 10+
+			return baos.toString(charset.name());
+		}
+		catch (UnsupportedEncodingException ex) {
+			// Should never happen
+			throw new IllegalArgumentException("Invalid charset name: " + charset, ex);
+		}
+	}
+
+	/**
+	 * Copy the contents of the given byte array to the given OutputStream.
+	 * <p>Leaves the stream open when done.
+	 * @param in the byte array to copy from
+	 * @param out the OutputStream to copy to
+	 * @throws IOException in case of I/O errors
+	 */
+	public static void copy(byte[] in, OutputStream out) throws IOException {
+		Assert.notNull(in, "No input byte array specified");
+		Assert.notNull(out, "No OutputStream specified");
+
+		out.write(in);
+		out.flush();
+	}
+
+	/**
+	 * Copy the contents of the given String to the given OutputStream.
+	 * <p>Leaves the stream open when done.
+	 * @param in the String to copy from
+	 * @param charset the Charset
+	 * @param out the OutputStream to copy to
+	 * @throws IOException in case of I/O errors
+	 */
+	public static void copy(String in, Charset charset, OutputStream out) throws IOException {
+		Assert.notNull(in, "No input String specified");
+		Assert.notNull(charset, "No Charset specified");
+		Assert.notNull(out, "No OutputStream specified");
+
+		Writer writer = new OutputStreamWriter(out, charset);
+		writer.write(in);
+		writer.flush();
+	}
+
+	/**
+	 * Copy the contents of the given InputStream to the given OutputStream.
+	 * <p>Leaves both streams open when done.
+	 * @param in the InputStream to copy from
+	 * @param out the OutputStream to copy to
+	 * @return the number of bytes copied
+	 * @throws IOException in case of I/O errors
+	 */
+	public static int copy(InputStream in, OutputStream out) throws IOException {
+		Assert.notNull(in, "No InputStream specified");
+		Assert.notNull(out, "No OutputStream specified");
+
+		int byteCount = 0;
+		byte[] buffer = new byte[BUFFER_SIZE];
+		int bytesRead;
+		while ((bytesRead = in.read(buffer)) != -1) {
+			out.write(buffer, 0, bytesRead);
+			byteCount += bytesRead;
+		}
+		out.flush();
+		return byteCount;
+	}
+
+	/**
+	 * Copy a range of content of the given InputStream to the given OutputStream.
+	 * <p>If the specified range exceeds the length of the InputStream, this copies
+	 * up to the end of the stream and returns the actual number of copied bytes.
+	 * <p>Leaves both streams open when done.
+	 * @param in the InputStream to copy from
+	 * @param out the OutputStream to copy to
+	 * @param start the position to start copying from
+	 * @param end the position to end copying
+	 * @return the number of bytes copied
+	 * @throws IOException in case of I/O errors
+	 * @since 4.3
+	 */
+	public static long copyRange(InputStream in, OutputStream out, long start, long end) throws IOException {
+		Assert.notNull(in, "No InputStream specified");
+		Assert.notNull(out, "No OutputStream specified");
+
+		long skipped = in.skip(start);
+		if (skipped < start) {
+			throw new IOException("Skipped only " + skipped + " bytes out of " + start + " required");
+		}
+
+		long bytesToCopy = end - start + 1;
+		byte[] buffer = new byte[(int) Math.min(StreamUtils.BUFFER_SIZE, bytesToCopy)];
+		while (bytesToCopy > 0) {
+			int bytesRead = in.read(buffer);
+			if (bytesRead == -1) {
+				break;
+			}
+			else if (bytesRead <= bytesToCopy) {
+				out.write(buffer, 0, bytesRead);
+				bytesToCopy -= bytesRead;
+			}
+			else {
+				out.write(buffer, 0, (int) bytesToCopy);
+				bytesToCopy = 0;
+			}
+		}
+		return (end - start + 1 - bytesToCopy);
+	}
+
+	/**
+	 * Drain the remaining content of the given InputStream.
+	 * <p>Leaves the InputStream open when done.
+	 * @param in the InputStream to drain
+	 * @return the number of bytes read
+	 * @throws IOException in case of I/O errors
+	 * @since 4.3
+	 */
+	public static int drain(InputStream in) throws IOException {
+		Assert.notNull(in, "No InputStream specified");
+		byte[] buffer = new byte[BUFFER_SIZE];
+		int bytesRead = -1;
+		int byteCount = 0;
+		while ((bytesRead = in.read(buffer)) != -1) {
+			byteCount += bytesRead;
+		}
+		return byteCount;
+	}
+
+	/**
+	 * Return an efficient empty {@link InputStream}.
+	 * @return a {@link ByteArrayInputStream} based on an empty byte array
+	 * @since 4.2.2
+	 */
+	public static InputStream emptyInput() {
+		return new ByteArrayInputStream(EMPTY_CONTENT);
+	}
+
+	/**
+	 * Return a variant of the given {@link InputStream} where calling
+	 * {@link InputStream#close() close()} has no effect.
+	 * @param in the InputStream to decorate
+	 * @return a version of the InputStream that ignores calls to close
+	 */
+	public static InputStream nonClosing(InputStream in) {
+		Assert.notNull(in, "No InputStream specified");
+		return new NonClosingInputStream(in);
+	}
+
+	/**
+	 * Return a variant of the given {@link OutputStream} where calling
+	 * {@link OutputStream#close() close()} has no effect.
+	 * @param out the OutputStream to decorate
+	 * @return a version of the OutputStream that ignores calls to close
+	 */
+	public static OutputStream nonClosing(OutputStream out) {
+		Assert.notNull(out, "No OutputStream specified");
+		return new NonClosingOutputStream(out);
+	}
+
+
+	private static class NonClosingInputStream extends FilterInputStream {
+
+		public NonClosingInputStream(InputStream in) {
+			super(in);
+		}
+
+		@Override
+		public void close() throws IOException {
+		}
+	}
+
+
+	private static class NonClosingOutputStream extends FilterOutputStream {
+
+		public NonClosingOutputStream(OutputStream out) {
+			super(out);
+		}
+
+		@Override
+		public void write(byte[] b, int off, int let) throws IOException {
+			// It is critical that we override this method for performance
+			this.out.write(b, off, let);
+		}
+
+		@Override
+		public void close() throws IOException {
+		}
+	}
+
+}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java
new file mode 100644
index 00000000..0e239bf9
--- /dev/null
+++ b/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java
@@ -0,0 +1,1433 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import org.springframework.lang.Nullable;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+
+/**
+ * Miscellaneous {@link String} utility methods.
+ *
+ * <p>Mainly for internal use within the framework; consider
+ * <a href="https://commons.apache.org/proper/commons-lang/">Apache's Commons Lang</a>
+ * for a more comprehensive suite of {@code String} utilities.
+ *
+ * <p>This class delivers some simple functionality that should really be
+ * provided by the core Java {@link String} and {@link StringBuilder}
+ * classes. It also provides easy-to-use methods to convert between
+ * delimited strings, such as CSV strings, and collections and arrays.
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @author Keith Donald
+ * @author Rob Harrop
+ * @author Rick Evans
+ * @author Arjen Poutsma
+ * @author Sam Brannen
+ * @author Brian Clozel
+ * @since 16 April 2001
+ */
+public abstract class StringUtils {
+
+	private static final String[] EMPTY_STRING_ARRAY = {};
+
+	private static final String FOLDER_SEPARATOR = "/";
+
+	private static final char FOLDER_SEPARATOR_CHAR = '/';
+
+	private static final String WINDOWS_FOLDER_SEPARATOR = "\\";
+
+	private static final String TOP_PATH = "..";
+
+	private static final String CURRENT_PATH = ".";
+
+	private static final char EXTENSION_SEPARATOR = '.';
+
+	private static final int DEFAULT_TRUNCATION_THRESHOLD = 100;
+
+	private static final String TRUNCATION_SUFFIX = " (truncated)...";
+
+
+	//---------------------------------------------------------------------
+	// General convenience methods for working with Strings
+	//---------------------------------------------------------------------
+
+	/**
+	 * Check whether the given object (possibly a {@code String}) is empty.
+	 * This is effectively a shortcut for {@code !hasLength(String)}.
+	 * <p>This method accepts any Object as an argument, comparing it to
+	 * {@code null} and the empty String. As a consequence, this method
+	 * will never return {@code true} for a non-null non-String object.
+	 * <p>The Object signature is useful for general attribute handling code
+	 * that commonly deals with Strings but generally has to iterate over
+	 * Objects since attributes may e.g. be primitive value objects as well.
+	 * <p><b>Note: If the object is typed to {@code String} upfront, prefer
+	 * {@link #hasLength(String)} or {@link #hasText(String)} instead.</b>
+	 * @param str the candidate object (possibly a {@code String})
+	 * @since 3.2.1
+	 * @deprecated as of 5.3, in favor of {@link #hasLength(String)} and
+	 * {@link #hasText(String)} (or {@link ObjectUtils#isEmpty(Object)})
+	 */
+	@Deprecated
+	public static boolean isEmpty(@Nullable Object str) {
+		return (str == null || "".equals(str));
+	}
+
+	/**
+	 * Check that the given {@code CharSequence} is neither {@code null} nor
+	 * of length 0.
+	 * <p>Note: this method returns {@code true} for a {@code CharSequence}
+	 * that purely consists of whitespace.
+	 * <p><pre class="code">
+	 * StringUtils.hasLength(null) = false
+	 * StringUtils.hasLength("") = false
+	 * StringUtils.hasLength(" ") = true
+	 * StringUtils.hasLength("Hello") = true
+	 * </pre>
+	 * @param str the {@code CharSequence} to check (may be {@code null})
+	 * @return {@code true} if the {@code CharSequence} is not {@code null} and has length
+	 * @see #hasLength(String)
+	 * @see #hasText(CharSequence)
+	 */
+	public static boolean hasLength(@Nullable CharSequence str) {
+		return (str != null && str.length() > 0);
+	}
+
+	/**
+	 * Check that the given {@code String} is neither {@code null} nor of length 0.
+	 * <p>Note: this method returns {@code true} for a {@code String} that
+	 * purely consists of whitespace.
+	 * @param str the {@code String} to check (may be {@code null})
+	 * @return {@code true} if the {@code String} is not {@code null} and has length
+	 * @see #hasLength(CharSequence)
+	 * @see #hasText(String)
+	 */
+	public static boolean hasLength(@Nullable String str) {
+		return (str != null && !str.isEmpty());
+	}
+
+	/**
+	 * Check whether the given {@code CharSequence} contains actual <em>text</em>.
+	 * <p>More specifically, this method returns {@code true} if the
+	 * {@code CharSequence} is not {@code null}, its length is greater than
+	 * 0, and it contains at least one non-whitespace character.
+	 * <p><pre class="code">
+	 * StringUtils.hasText(null) = false
+	 * StringUtils.hasText("") = false
+	 * StringUtils.hasText(" ") = false
+	 * StringUtils.hasText("12345") = true
+	 * StringUtils.hasText(" 12345 ") = true
+	 * </pre>
+	 * @param str the {@code CharSequence} to check (may be {@code null})
+	 * @return {@code true} if the {@code CharSequence} is not {@code null},
+	 * its length is greater than 0, and it does not contain whitespace only
+	 * @see #hasText(String)
+	 * @see #hasLength(CharSequence)
+	 * @see Character#isWhitespace
+	 */
+	public static boolean hasText(@Nullable CharSequence str) {
+		return (str != null && str.length() > 0 && containsText(str));
+	}
+
+	/**
+	 * Check whether the given {@code String} contains actual <em>text</em>.
+	 * <p>More specifically, this method returns {@code true} if the
+	 * {@code String} is not {@code null}, its length is greater than 0,
+	 * and it contains at least one non-whitespace character.
+	 * @param str the {@code String} to check (may be {@code null})
+	 * @return {@code true} if the {@code String} is not {@code null}, its
+	 * length is greater than 0, and it does not contain whitespace only
+	 * @see #hasText(CharSequence)
+	 * @see #hasLength(String)
+	 * @see Character#isWhitespace
+	 */
+	public static boolean hasText(@Nullable String str) {
+		return (str != null && !str.isEmpty() && containsText(str));
+	}
+
+	private static boolean containsText(CharSequence str) {
+		int strLen = str.length();
+		for (int i = 0; i < strLen; i++) {
+			if (!Character.isWhitespace(str.charAt(i))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the given {@code CharSequence} contains any whitespace characters.
+	 * @param str the {@code CharSequence} to check (may be {@code null})
+	 * @return {@code true} if the {@code CharSequence} is not empty and
+	 * contains at least 1 whitespace character
+	 * @see Character#isWhitespace
+	 */
+	public static boolean containsWhitespace(@Nullable CharSequence str) {
+		if (!hasLength(str)) {
+			return false;
+		}
+
+		int strLen = str.length();
+		for (int i = 0; i < strLen; i++) {
+			if (Character.isWhitespace(str.charAt(i))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the given {@code String} contains any whitespace characters.
+	 * @param str the {@code String} to check (may be {@code null})
+	 * @return {@code true} if the {@code String} is not empty and
+	 * contains at least 1 whitespace character
+	 * @see #containsWhitespace(CharSequence)
+	 */
+	public static boolean containsWhitespace(@Nullable String str) {
+		return containsWhitespace((CharSequence) str);
+	}
+
+	/**
+	 * Trim leading and trailing whitespace from the given {@code String}.
+	 * @param str the {@code String} to check
+	 * @return the trimmed {@code String}
+	 * @see Character#isWhitespace
+	 */
+	public static String trimWhitespace(String str) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int beginIndex = 0;
+		int endIndex = str.length() - 1;
+
+		while (beginIndex <= endIndex && Character.isWhitespace(str.charAt(beginIndex))) {
+			beginIndex++;
+		}
+
+		while (endIndex > beginIndex && Character.isWhitespace(str.charAt(endIndex))) {
+			endIndex--;
+		}
+
+		return str.substring(beginIndex, endIndex + 1);
+	}
+
+	/**
+	 * Trim <em>all</em> whitespace from the given {@code CharSequence}:
+	 * leading, trailing, and in between characters.
+	 * @param str the {@code CharSequence} to check
+	 * @return the trimmed {@code CharSequence}
+	 * @since 5.3.22
+	 * @see #trimAllWhitespace(String)
+	 * @see Character#isWhitespace
+	 */
+	public static CharSequence trimAllWhitespace(CharSequence str) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int len = str.length();
+		StringBuilder sb = new StringBuilder(str.length());
+		for (int i = 0; i < len; i++) {
+			char c = str.charAt(i);
+			if (!Character.isWhitespace(c)) {
+				sb.append(c);
+			}
+		}
+		return sb;
+	}
+
+	/**
+	 * Trim <em>all</em> whitespace from the given {@code String}:
+	 * leading, trailing, and in between characters.
+	 * @param str the {@code String} to check
+	 * @return the trimmed {@code String}
+	 * @see #trimAllWhitespace(CharSequence)
+	 * @see Character#isWhitespace
+	 */
+	public static String trimAllWhitespace(String str) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		return trimAllWhitespace((CharSequence) str).toString();
+	}
+
+	/**
+	 * Trim leading whitespace from the given {@code String}.
+	 * @param str the {@code String} to check
+	 * @return the trimmed {@code String}
+	 * @see Character#isWhitespace
+	 */
+	public static String trimLeadingWhitespace(String str) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int beginIdx = 0;
+		while (beginIdx < str.length() && Character.isWhitespace(str.charAt(beginIdx))) {
+			beginIdx++;
+		}
+		return str.substring(beginIdx);
+	}
+
+	/**
+	 * Trim trailing whitespace from the given {@code String}.
+	 * @param str the {@code String} to check
+	 * @return the trimmed {@code String}
+	 * @see Character#isWhitespace
+	 */
+	public static String trimTrailingWhitespace(String str) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int endIdx = str.length() - 1;
+		while (endIdx >= 0 && Character.isWhitespace(str.charAt(endIdx))) {
+			endIdx--;
+		}
+		return str.substring(0, endIdx + 1);
+	}
+
+	/**
+	 * Trim all occurrences of the supplied leading character from the given {@code String}.
+	 * @param str the {@code String} to check
+	 * @param leadingCharacter the leading character to be trimmed
+	 * @return the trimmed {@code String}
+	 */
+	public static String trimLeadingCharacter(String str, char leadingCharacter) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int beginIdx = 0;
+		while (beginIdx < str.length() && leadingCharacter == str.charAt(beginIdx)) {
+			beginIdx++;
+		}
+		return str.substring(beginIdx);
+	}
+
+	/**
+	 * Trim all occurrences of the supplied trailing character from the given {@code String}.
+	 * @param str the {@code String} to check
+	 * @param trailingCharacter the trailing character to be trimmed
+	 * @return the trimmed {@code String}
+	 */
+	public static String trimTrailingCharacter(String str, char trailingCharacter) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		int endIdx = str.length() - 1;
+		while (endIdx >= 0 && trailingCharacter == str.charAt(endIdx)) {
+			endIdx--;
+		}
+		return str.substring(0, endIdx + 1);
+	}
+
+	/**
+	 * Test if the given {@code String} matches the given single character.
+	 * @param str the {@code String} to check
+	 * @param singleCharacter the character to compare to
+	 * @since 5.2.9
+	 */
+	public static boolean matchesCharacter(@Nullable String str, char singleCharacter) {
+		return (str != null && str.length() == 1 && str.charAt(0) == singleCharacter);
+	}
+
+	/**
+	 * Test if the given {@code String} starts with the specified prefix,
+	 * ignoring upper/lower case.
+	 * @param str the {@code String} to check
+	 * @param prefix the prefix to look for
+	 * @see String#startsWith
+	 */
+	public static boolean startsWithIgnoreCase(@Nullable String str, @Nullable String prefix) {
+		return (str != null && prefix != null && str.length() >= prefix.length() &&
+				str.regionMatches(true, 0, prefix, 0, prefix.length()));
+	}
+
+	/**
+	 * Test if the given {@code String} ends with the specified suffix,
+	 * ignoring upper/lower case.
+	 * @param str the {@code String} to check
+	 * @param suffix the suffix to look for
+	 * @see String#endsWith
+	 */
+	public static boolean endsWithIgnoreCase(@Nullable String str, @Nullable String suffix) {
+		return (str != null && suffix != null && str.length() >= suffix.length() &&
+				str.regionMatches(true, str.length() - suffix.length(), suffix, 0, suffix.length()));
+	}
+
+	/**
+	 * Test whether the given string matches the given substring
+	 * at the given index.
+	 * @param str the original string (or StringBuilder)
+	 * @param index the index in the original string to start matching against
+	 * @param substring the substring to match at the given index
+	 */
+	public static boolean substringMatch(CharSequence str, int index, CharSequence substring) {
+		if (index + substring.length() > str.length()) {
+			return false;
+		}
+		for (int i = 0; i < substring.length(); i++) {
+			if (str.charAt(index + i) != substring.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Count the occurrences of the substring {@code sub} in string {@code str}.
+	 * @param str string to search in
+	 * @param sub string to search for
+	 */
+	public static int countOccurrencesOf(String str, String sub) {
+		if (!hasLength(str) || !hasLength(sub)) {
+			return 0;
+		}
+
+		int count = 0;
+		int pos = 0;
+		int idx;
+		while ((idx = str.indexOf(sub, pos)) != -1) {
+			++count;
+			pos = idx + sub.length();
+		}
+		return count;
+	}
+
+	/**
+	 * Replace all occurrences of a substring within a string with another string.
+	 * @param inString {@code String} to examine
+	 * @param oldPattern {@code String} to replace
+	 * @param newPattern {@code String} to insert
+	 * @return a {@code String} with the replacements
+	 */
+	public static String replace(String inString, String oldPattern, @Nullable String newPattern) {
+		if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {
+			return inString;
+		}
+		int index = inString.indexOf(oldPattern);
+		if (index == -1) {
+			// no occurrence -> can return input as-is
+			return inString;
+		}
+
+		int capacity = inString.length();
+		if (newPattern.length() > oldPattern.length()) {
+			capacity += 16;
+		}
+		StringBuilder sb = new StringBuilder(capacity);
+
+		int pos = 0;  // our position in the old string
+		int patLen = oldPattern.length();
+		while (index >= 0) {
+			sb.append(inString, pos, index);
+			sb.append(newPattern);
+			pos = index + patLen;
+			index = inString.indexOf(oldPattern, pos);
+		}
+
+		// append any characters to the right of a match
+		sb.append(inString, pos, inString.length());
+		return sb.toString();
+	}
+
+	/**
+	 * Delete all occurrences of the given substring.
+	 * @param inString the original {@code String}
+	 * @param pattern the pattern to delete all occurrences of
+	 * @return the resulting {@code String}
+	 */
+	public static String delete(String inString, String pattern) {
+		return replace(inString, pattern, "");
+	}
+
+	/**
+	 * Delete any character in a given {@code String}.
+	 * @param inString the original {@code String}
+	 * @param charsToDelete a set of characters to delete.
+	 * E.g. "az\n" will delete 'a's, 'z's and new lines.
+	 * @return the resulting {@code String}
+	 */
+	public static String deleteAny(String inString, @Nullable String charsToDelete) {
+		if (!hasLength(inString) || !hasLength(charsToDelete)) {
+			return inString;
+		}
+
+		int lastCharIndex = 0;
+		char[] result = new char[inString.length()];
+		for (int i = 0; i < inString.length(); i++) {
+			char c = inString.charAt(i);
+			if (charsToDelete.indexOf(c) == -1) {
+				result[lastCharIndex++] = c;
+			}
+		}
+		if (lastCharIndex == inString.length()) {
+			return inString;
+		}
+		return new String(result, 0, lastCharIndex);
+	}
+
+	//---------------------------------------------------------------------
+	// Convenience methods for working with formatted Strings
+	//---------------------------------------------------------------------
+
+	/**
+	 * Quote the given {@code String} with single quotes.
+	 * @param str the input {@code String} (e.g. "myString")
+	 * @return the quoted {@code String} (e.g. "'myString'"),
+	 * or {@code null} if the input was {@code null}
+	 */
+	@Nullable
+	public static String quote(@Nullable String str) {
+		return (str != null ? "'" + str + "'" : null);
+	}
+
+	/**
+	 * Turn the given Object into a {@code String} with single quotes
+	 * if it is a {@code String}; keeping the Object as-is else.
+	 * @param obj the input Object (e.g. "myString")
+	 * @return the quoted {@code String} (e.g. "'myString'"),
+	 * or the input object as-is if not a {@code String}
+	 */
+	@Nullable
+	public static Object quoteIfString(@Nullable Object obj) {
+		return (obj instanceof String ? quote((String) obj) : obj);
+	}
+
+	/**
+	 * Unqualify a string qualified by a '.' dot character. For example,
+	 * "this.name.is.qualified", returns "qualified".
+	 * @param qualifiedName the qualified name
+	 */
+	public static String unqualify(String qualifiedName) {
+		return unqualify(qualifiedName, '.');
+	}
+
+	/**
+	 * Unqualify a string qualified by a separator character. For example,
+	 * "this:name:is:qualified" returns "qualified" if using a ':' separator.
+	 * @param qualifiedName the qualified name
+	 * @param separator the separator
+	 */
+	public static String unqualify(String qualifiedName, char separator) {
+		return qualifiedName.substring(qualifiedName.lastIndexOf(separator) + 1);
+	}
+
+	/**
+	 * Capitalize a {@code String}, changing the first letter to
+	 * upper case as per {@link Character#toUpperCase(char)}.
+	 * No other letters are changed.
+	 * @param str the {@code String} to capitalize
+	 * @return the capitalized {@code String}
+	 */
+	public static String capitalize(String str) {
+		return changeFirstCharacterCase(str, true);
+	}
+
+	/**
+	 * Uncapitalize a {@code String}, changing the first letter to
+	 * lower case as per {@link Character#toLowerCase(char)}.
+	 * No other letters are changed.
+	 * @param str the {@code String} to uncapitalize
+	 * @return the uncapitalized {@code String}
+	 */
+	public static String uncapitalize(String str) {
+		return changeFirstCharacterCase(str, false);
+	}
+
+	private static String changeFirstCharacterCase(String str, boolean capitalize) {
+		if (!hasLength(str)) {
+			return str;
+		}
+
+		char baseChar = str.charAt(0);
+		char updatedChar;
+		if (capitalize) {
+			updatedChar = Character.toUpperCase(baseChar);
+		}
+		else {
+			updatedChar = Character.toLowerCase(baseChar);
+		}
+		if (baseChar == updatedChar) {
+			return str;
+		}
+
+		char[] chars = str.toCharArray();
+		chars[0] = updatedChar;
+		return new String(chars);
+	}
+
+	/**
+	 * Extract the filename from the given Java resource path,
+	 * e.g. {@code "mypath/myfile.txt" &rarr; "myfile.txt"}.
+	 * @param path the file path (may be {@code null})
+	 * @return the extracted filename, or {@code null} if none
+	 */
+	@Nullable
+	public static String getFilename(@Nullable String path) {
+		if (path == null) {
+			return null;
+		}
+
+		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
+		return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);
+	}
+
+	/**
+	 * Extract the filename extension from the given Java resource path,
+	 * e.g. "mypath/myfile.txt" &rarr; "txt".
+	 * @param path the file path (may be {@code null})
+	 * @return the extracted filename extension, or {@code null} if none
+	 */
+	@Nullable
+	public static String getFilenameExtension(@Nullable String path) {
+		if (path == null) {
+			return null;
+		}
+
+		int extIndex = path.lastIndexOf(EXTENSION_SEPARATOR);
+		if (extIndex == -1) {
+			return null;
+		}
+
+		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
+		if (folderIndex > extIndex) {
+			return null;
+		}
+
+		return path.substring(extIndex + 1);
+	}
+
+	/**
+	 * Strip the filename extension from the given Java resource path,
+	 * e.g. "mypath/myfile.txt" &rarr; "mypath/myfile".
+	 * @param path the file path
+	 * @return the path with stripped filename extension
+	 */
+	public static String stripFilenameExtension(String path) {
+		int extIndex = path.lastIndexOf(EXTENSION_SEPARATOR);
+		if (extIndex == -1) {
+			return path;
+		}
+
+		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
+		if (folderIndex > extIndex) {
+			return path;
+		}
+
+		return path.substring(0, extIndex);
+	}
+
+	/**
+	 * Apply the given relative path to the given Java resource path,
+	 * assuming standard Java folder separation (i.e. "/" separators).
+	 * @param path the path to start from (usually a full file path)
+	 * @param relativePath the relative path to apply
+	 * (relative to the full file path above)
+	 * @return the full file path that results from applying the relative path
+	 */
+	public static String applyRelativePath(String path, String relativePath) {
+		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
+		if (separatorIndex != -1) {
+			String newPath = path.substring(0, separatorIndex);
+			if (!relativePath.startsWith(FOLDER_SEPARATOR)) {
+				newPath += FOLDER_SEPARATOR_CHAR;
+			}
+			return newPath + relativePath;
+		}
+		else {
+			return relativePath;
+		}
+	}
+
+	/**
+	 * Normalize the path by suppressing sequences like "path/.." and
+	 * inner simple dots.
+	 * <p>The result is convenient for path comparison. For other uses,
+	 * notice that Windows separators ("\") are replaced by simple slashes.
+	 * <p><strong>NOTE</strong> that {@code cleanPath} should not be depended
+	 * upon in a security context. Other mechanisms should be used to prevent
+	 * path-traversal issues.
+	 * @param path the original path
+	 * @return the normalized path
+	 */
+	public static String cleanPath(String path) {
+		if (!hasLength(path)) {
+			return path;
+		}
+
+		String normalizedPath = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
+		String pathToUse = normalizedPath;
+
+		// Shortcut if there is no work to do
+		if (pathToUse.indexOf('.') == -1) {
+			return pathToUse;
+		}
+
+		// Strip prefix from path to analyze, to not treat it as part of the
+		// first path element. This is necessary to correctly parse paths like
+		// "file:core/../core/io/Resource.class", where the ".." should just
+		// strip the first "core" directory while keeping the "file:" prefix.
+		int prefixIndex = pathToUse.indexOf(':');
+		String prefix = "";
+		if (prefixIndex != -1) {
+			prefix = pathToUse.substring(0, prefixIndex + 1);
+			if (prefix.contains(FOLDER_SEPARATOR)) {
+				prefix = "";
+			}
+			else {
+				pathToUse = pathToUse.substring(prefixIndex + 1);
+			}
+		}
+		if (pathToUse.startsWith(FOLDER_SEPARATOR)) {
+			prefix = prefix + FOLDER_SEPARATOR;
+			pathToUse = pathToUse.substring(1);
+		}
+
+		String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);
+		// we never require more elements than pathArray and in the common case the same number
+		Deque<String> pathElements = new ArrayDeque<>(pathArray.length);
+		int tops = 0;
+
+		for (int i = pathArray.length - 1; i >= 0; i--) {
+			String element = pathArray[i];
+			if (CURRENT_PATH.equals(element)) {
+				// Points to current directory - drop it.
+			}
+			else if (TOP_PATH.equals(element)) {
+				// Registering top path found.
+				tops++;
+			}
+			else {
+				if (tops > 0) {
+					// Merging path element with element corresponding to top path.
+					tops--;
+				}
+				else {
+					// Normal path element found.
+					pathElements.addFirst(element);
+				}
+			}
+		}
+
+		// All path elements stayed the same - shortcut
+		if (pathArray.length == pathElements.size()) {
+			return normalizedPath;
+		}
+		// Remaining top paths need to be retained.
+		for (int i = 0; i < tops; i++) {
+			pathElements.addFirst(TOP_PATH);
+		}
+		// If nothing else left, at least explicitly point to current path.
+		if (pathElements.size() == 1 && pathElements.getLast().isEmpty() && !prefix.endsWith(FOLDER_SEPARATOR)) {
+			pathElements.addFirst(CURRENT_PATH);
+		}
+
+		final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
+		// avoid string concatenation with empty prefix
+		return prefix.isEmpty() ? joined : prefix + joined;
+	}
+
+	/**
+	 * Compare two paths after normalization of them.
+	 * @param path1 first path for comparison
+	 * @param path2 second path for comparison
+	 * @return whether the two paths are equivalent after normalization
+	 */
+	public static boolean pathEquals(String path1, String path2) {
+		return cleanPath(path1).equals(cleanPath(path2));
+	}
+
+	/**
+	 * Decode the given encoded URI component value. Based on the following rules:
+	 * <ul>
+	 * <li>Alphanumeric characters {@code "a"} through {@code "z"}, {@code "A"} through {@code "Z"},
+	 * and {@code "0"} through {@code "9"} stay the same.</li>
+	 * <li>Special characters {@code "-"}, {@code "_"}, {@code "."}, and {@code "*"} stay the same.</li>
+	 * <li>A sequence "{@code %<i>xy</i>}" is interpreted as a hexadecimal representation of the character.</li>
+	 * <li>For all other characters (including those already decoded), the output is undefined.</li>
+	 * </ul>
+	 * @param source the encoded String
+	 * @param charset the character set
+	 * @return the decoded value
+	 * @throws IllegalArgumentException when the given source contains invalid encoded sequences
+	 * @since 5.0
+	 * @see java.net.URLDecoder#decode(String, String)
+	 */
+	public static String uriDecode(String source, Charset charset) {
+		int length = source.length();
+		if (length == 0) {
+			return source;
+		}
+		Assert.notNull(charset, "Charset must not be null");
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(length);
+		boolean changed = false;
+		for (int i = 0; i < length; i++) {
+			int ch = source.charAt(i);
+			if (ch == '%') {
+				if (i + 2 < length) {
+					char hex1 = source.charAt(i + 1);
+					char hex2 = source.charAt(i + 2);
+					int u = Character.digit(hex1, 16);
+					int l = Character.digit(hex2, 16);
+					if (u == -1 || l == -1) {
+						throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
+					}
+					baos.write((char) ((u << 4) + l));
+					i += 2;
+					changed = true;
+				}
+				else {
+					throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
+				}
+			}
+			else {
+				baos.write(ch);
+			}
+		}
+		return (changed ? StreamUtils.copyToString(baos, charset) : source);
+	}
+
+	/**
+	 * Parse the given {@code String} value into a {@link Locale}, accepting
+	 * the {@link Locale#toString} format as well as BCP 47 language tags as
+	 * specified by {@link Locale#forLanguageTag}.
+	 * @param localeValue the locale value: following either {@code Locale's}
+	 * {@code toString()} format ("en", "en_UK", etc.), also accepting spaces as
+	 * separators (as an alternative to underscores), or BCP 47 (e.g. "en-UK")
+	 * @return a corresponding {@code Locale} instance, or {@code null} if none
+	 * @throws IllegalArgumentException in case of an invalid locale specification
+	 * @since 5.0.4
+	 * @see #parseLocaleString
+	 * @see Locale#forLanguageTag
+	 */
+	@Nullable
+	public static Locale parseLocale(String localeValue) {
+		String[] tokens = tokenizeLocaleSource(localeValue);
+		if (tokens.length == 1) {
+			validateLocalePart(localeValue);
+			Locale resolved = Locale.forLanguageTag(localeValue);
+			if (resolved.getLanguage().length() > 0) {
+				return resolved;
+			}
+		}
+		return parseLocaleTokens(localeValue, tokens);
+	}
+
+	/**
+	 * Parse the given {@code String} representation into a {@link Locale}.
+	 * <p>For many parsing scenarios, this is an inverse operation of
+	 * {@link Locale#toString Locale's toString}, in a lenient sense.
+	 * This method does not aim for strict {@code Locale} design compliance;
+	 * it is rather specifically tailored for typical Spring parsing needs.
+	 * <p><b>Note: This delegate does not accept the BCP 47 language tag format.
+	 * Please use {@link #parseLocale} for lenient parsing of both formats.</b>
+	 * @param localeString the locale {@code String}: following {@code Locale's}
+	 * {@code toString()} format ("en", "en_UK", etc.), also accepting spaces as
+	 * separators (as an alternative to underscores)
+	 * @return a corresponding {@code Locale} instance, or {@code null} if none
+	 * @throws IllegalArgumentException in case of an invalid locale specification
+	 */
+	@Nullable
+	public static Locale parseLocaleString(String localeString) {
+		return parseLocaleTokens(localeString, tokenizeLocaleSource(localeString));
+	}
+
+	private static String[] tokenizeLocaleSource(String localeSource) {
+		return tokenizeToStringArray(localeSource, "_ ", false, false);
+	}
+
+	@Nullable
+	private static Locale parseLocaleTokens(String localeString, String[] tokens) {
+		String language = (tokens.length > 0 ? tokens[0] : "");
+		String country = (tokens.length > 1 ? tokens[1] : "");
+		validateLocalePart(language);
+		validateLocalePart(country);
+
+		String variant = "";
+		if (tokens.length > 2) {
+			// There is definitely a variant, and it is everything after the country
+			// code sans the separator between the country code and the variant.
+			int endIndexOfCountryCode = localeString.indexOf(country, language.length()) + country.length();
+			// Strip off any leading '_' and whitespace, what's left is the variant.
+			variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));
+			if (variant.startsWith("_")) {
+				variant = trimLeadingCharacter(variant, '_');
+			}
+		}
+
+		if (variant.isEmpty() && country.startsWith("#")) {
+			variant = country;
+			country = "";
+		}
+
+		return (language.length() > 0 ? new Locale(language, country, variant) : null);
+	}
+
+	private static void validateLocalePart(String localePart) {
+		for (int i = 0; i < localePart.length(); i++) {
+			char ch = localePart.charAt(i);
+			if (ch != ' ' && ch != '_' && ch != '-' && ch != '#' && !Character.isLetterOrDigit(ch)) {
+				throw new IllegalArgumentException(
+						"Locale part \"" + localePart + "\" contains invalid characters");
+			}
+		}
+	}
+
+	/**
+	 * Determine the RFC 3066 compliant language tag,
+	 * as used for the HTTP "Accept-Language" header.
+	 * @param locale the Locale to transform to a language tag
+	 * @return the RFC 3066 compliant language tag as {@code String}
+	 * @deprecated as of 5.0.4, in favor of {@link Locale#toLanguageTag()}
+	 */
+	@Deprecated
+	public static String toLanguageTag(Locale locale) {
+		return locale.getLanguage() + (hasText(locale.getCountry()) ? "-" + locale.getCountry() : "");
+	}
+
+	/**
+	 * Parse the given {@code timeZoneString} value into a {@link TimeZone}.
+	 * @param timeZoneString the time zone {@code String}, following {@link TimeZone#getTimeZone(String)}
+	 * but throwing {@link IllegalArgumentException} in case of an invalid time zone specification
+	 * @return a corresponding {@link TimeZone} instance
+	 * @throws IllegalArgumentException in case of an invalid time zone specification
+	 */
+	public static TimeZone parseTimeZoneString(String timeZoneString) {
+		TimeZone timeZone = TimeZone.getTimeZone(timeZoneString);
+		if ("GMT".equals(timeZone.getID()) && !timeZoneString.startsWith("GMT")) {
+			// We don't want that GMT fallback...
+			throw new IllegalArgumentException("Invalid time zone specification '" + timeZoneString + "'");
+		}
+		return timeZone;
+	}
+
+
+	//---------------------------------------------------------------------
+	// Convenience methods for working with String arrays
+	//---------------------------------------------------------------------
+
+	/**
+	 * Copy the given {@link Collection} into a {@code String} array.
+	 * <p>The {@code Collection} must contain {@code String} elements only.
+	 * @param collection the {@code Collection} to copy
+	 * (potentially {@code null} or empty)
+	 * @return the resulting {@code String} array
+	 */
+	public static String[] toStringArray(@Nullable Collection<String> collection) {
+		return (!CollectionUtils.isEmpty(collection) ? collection.toArray(EMPTY_STRING_ARRAY) : EMPTY_STRING_ARRAY);
+	}
+
+	/**
+	 * Copy the given {@link Enumeration} into a {@code String} array.
+	 * <p>The {@code Enumeration} must contain {@code String} elements only.
+	 * @param enumeration the {@code Enumeration} to copy
+	 * (potentially {@code null} or empty)
+	 * @return the resulting {@code String} array
+	 */
+	public static String[] toStringArray(@Nullable Enumeration<String> enumeration) {
+		return (enumeration != null ? toStringArray(Collections.list(enumeration)) : EMPTY_STRING_ARRAY);
+	}
+
+	/**
+	 * Append the given {@code String} to the given {@code String} array,
+	 * returning a new array consisting of the input array contents plus
+	 * the given {@code String}.
+	 * @param array the array to append to (can be {@code null})
+	 * @param str the {@code String} to append
+	 * @return the new array (never {@code null})
+	 */
+	public static String[] addStringToArray(@Nullable String[] array, String str) {
+		if (ObjectUtils.isEmpty(array)) {
+			return new String[] {str};
+		}
+
+		String[] newArr = new String[array.length + 1];
+		System.arraycopy(array, 0, newArr, 0, array.length);
+		newArr[array.length] = str;
+		return newArr;
+	}
+
+	/**
+	 * Concatenate the given {@code String} arrays into one,
+	 * with overlapping array elements included twice.
+	 * <p>The order of elements in the original arrays is preserved.
+	 * @param array1 the first array (can be {@code null})
+	 * @param array2 the second array (can be {@code null})
+	 * @return the new array ({@code null} if both given arrays were {@code null})
+	 */
+	@Nullable
+	public static String[] concatenateStringArrays(@Nullable String[] array1, @Nullable String[] array2) {
+		if (ObjectUtils.isEmpty(array1)) {
+			return array2;
+		}
+		if (ObjectUtils.isEmpty(array2)) {
+			return array1;
+		}
+
+		String[] newArr = new String[array1.length + array2.length];
+		System.arraycopy(array1, 0, newArr, 0, array1.length);
+		System.arraycopy(array2, 0, newArr, array1.length, array2.length);
+		return newArr;
+	}
+
+	/**
+	 * Merge the given {@code String} arrays into one, with overlapping
+	 * array elements only included once.
+	 * <p>The order of elements in the original arrays is preserved
+	 * (with the exception of overlapping elements, which are only
+	 * included on their first occurrence).
+	 * @param array1 the first array (can be {@code null})
+	 * @param array2 the second array (can be {@code null})
+	 * @return the new array ({@code null} if both given arrays were {@code null})
+	 * @deprecated as of 4.3.15, in favor of manual merging via {@link LinkedHashSet}
+	 * (with every entry included at most once, even entries within the first array)
+	 */
+	@Deprecated
+	@Nullable
+	public static String[] mergeStringArrays(@Nullable String[] array1, @Nullable String[] array2) {
+		if (ObjectUtils.isEmpty(array1)) {
+			return array2;
+		}
+		if (ObjectUtils.isEmpty(array2)) {
+			return array1;
+		}
+
+		List<String> result = new ArrayList<>(Arrays.asList(array1));
+		for (String str : array2) {
+			if (!result.contains(str)) {
+				result.add(str);
+			}
+		}
+		return toStringArray(result);
+	}
+
+	/**
+	 * Sort the given {@code String} array if necessary.
+	 * @param array the original array (potentially empty)
+	 * @return the array in sorted form (never {@code null})
+	 */
+	public static String[] sortStringArray(String[] array) {
+		if (ObjectUtils.isEmpty(array)) {
+			return array;
+		}
+
+		Arrays.sort(array);
+		return array;
+	}
+
+	/**
+	 * Trim the elements of the given {@code String} array, calling
+	 * {@code String.trim()} on each non-null element.
+	 * @param array the original {@code String} array (potentially empty)
+	 * @return the resulting array (of the same size) with trimmed elements
+	 */
+	public static String[] trimArrayElements(String[] array) {
+		if (ObjectUtils.isEmpty(array)) {
+			return array;
+		}
+
+		String[] result = new String[array.length];
+		for (int i = 0; i < array.length; i++) {
+			String element = array[i];
+			result[i] = (element != null ? element.trim() : null);
+		}
+		return result;
+	}
+
+	/**
+	 * Remove duplicate strings from the given array.
+	 * <p>As of 4.2, it preserves the original order, as it uses a {@link LinkedHashSet}.
+	 * @param array the {@code String} array (potentially empty)
+	 * @return an array without duplicates, in natural sort order
+	 */
+	public static String[] removeDuplicateStrings(String[] array) {
+		if (ObjectUtils.isEmpty(array)) {
+			return array;
+		}
+
+		Set<String> set = new LinkedHashSet<>(Arrays.asList(array));
+		return toStringArray(set);
+	}
+
+	/**
+	 * Split a {@code String} at the first occurrence of the delimiter.
+	 * Does not include the delimiter in the result.
+	 * @param toSplit the string to split (potentially {@code null} or empty)
+	 * @param delimiter to split the string up with (potentially {@code null} or empty)
+	 * @return a two element array with index 0 being before the delimiter, and
+	 * index 1 being after the delimiter (neither element includes the delimiter);
+	 * or {@code null} if the delimiter wasn't found in the given input {@code String}
+	 */
+	@Nullable
+	public static String[] split(@Nullable String toSplit, @Nullable String delimiter) {
+		if (!hasLength(toSplit) || !hasLength(delimiter)) {
+			return null;
+		}
+		int offset = toSplit.indexOf(delimiter);
+		if (offset < 0) {
+			return null;
+		}
+
+		String beforeDelimiter = toSplit.substring(0, offset);
+		String afterDelimiter = toSplit.substring(offset + delimiter.length());
+		return new String[] {beforeDelimiter, afterDelimiter};
+	}
+
+	/**
+	 * Take an array of strings and split each element based on the given delimiter.
+	 * A {@code Properties} instance is then generated, with the left of the delimiter
+	 * providing the key, and the right of the delimiter providing the value.
+	 * <p>Will trim both the key and value before adding them to the {@code Properties}.
+	 * @param array the array to process
+	 * @param delimiter to split each element using (typically the equals symbol)
+	 * @return a {@code Properties} instance representing the array contents,
+	 * or {@code null} if the array to process was {@code null} or empty
+	 */
+	@Nullable
+	public static Properties splitArrayElementsIntoProperties(String[] array, String delimiter) {
+		return splitArrayElementsIntoProperties(array, delimiter, null);
+	}
+
+	/**
+	 * Take an array of strings and split each element based on the given delimiter.
+	 * A {@code Properties} instance is then generated, with the left of the
+	 * delimiter providing the key, and the right of the delimiter providing the value.
+	 * <p>Will trim both the key and value before adding them to the
+	 * {@code Properties} instance.
+	 * @param array the array to process
+	 * @param delimiter to split each element using (typically the equals symbol)
+	 * @param charsToDelete one or more characters to remove from each element
+	 * prior to attempting the split operation (typically the quotation mark
+	 * symbol), or {@code null} if no removal should occur
+	 * @return a {@code Properties} instance representing the array contents,
+	 * or {@code null} if the array to process was {@code null} or empty
+	 */
+	@Nullable
+	public static Properties splitArrayElementsIntoProperties(
+			String[] array, String delimiter, @Nullable String charsToDelete) {
+
+		if (ObjectUtils.isEmpty(array)) {
+			return null;
+		}
+
+		Properties result = new Properties();
+		for (String element : array) {
+			if (charsToDelete != null) {
+				element = deleteAny(element, charsToDelete);
+			}
+			String[] splittedElement = split(element, delimiter);
+			if (splittedElement == null) {
+				continue;
+			}
+			result.setProperty(splittedElement[0].trim(), splittedElement[1].trim());
+		}
+		return result;
+	}
+
+	/**
+	 * Tokenize the given {@code String} into a {@code String} array via a
+	 * {@link StringTokenizer}.
+	 * <p>Trims tokens and omits empty tokens.
+	 * <p>The given {@code delimiters} string can consist of any number of
+	 * delimiter characters. Each of those characters can be used to separate
+	 * tokens. A delimiter is always a single character; for multi-character
+	 * delimiters, consider using {@link #delimitedListToStringArray}.
+	 * @param str the {@code String} to tokenize (potentially {@code null} or empty)
+	 * @param delimiters the delimiter characters, assembled as a {@code String}
+	 * (each of the characters is individually considered as a delimiter)
+	 * @return an array of the tokens
+	 * @see StringTokenizer
+	 * @see String#trim()
+	 * @see #delimitedListToStringArray
+	 */
+	public static String[] tokenizeToStringArray(@Nullable String str, String delimiters) {
+		return tokenizeToStringArray(str, delimiters, true, true);
+	}
+
+	/**
+	 * Tokenize the given {@code String} into a {@code String} array via a
+	 * {@link StringTokenizer}.
+	 * <p>The given {@code delimiters} string can consist of any number of
+	 * delimiter characters. Each of those characters can be used to separate
+	 * tokens. A delimiter is always a single character; for multi-character
+	 * delimiters, consider using {@link #delimitedListToStringArray}.
+	 * @param str the {@code String} to tokenize (potentially {@code null} or empty)
+	 * @param delimiters the delimiter characters, assembled as a {@code String}
+	 * (each of the characters is individually considered as a delimiter)
+	 * @param trimTokens trim the tokens via {@link String#trim()}
+	 * @param ignoreEmptyTokens omit empty tokens from the result array
+	 * (only applies to tokens that are empty after trimming; StringTokenizer
+	 * will not consider subsequent delimiters as token in the first place).
+	 * @return an array of the tokens
+	 * @see StringTokenizer
+	 * @see String#trim()
+	 * @see #delimitedListToStringArray
+	 */
+	public static String[] tokenizeToStringArray(
+			@Nullable String str, String delimiters, boolean trimTokens, boolean ignoreEmptyTokens) {
+
+		if (str == null) {
+			return EMPTY_STRING_ARRAY;
+		}
+
+		StringTokenizer st = new StringTokenizer(str, delimiters);
+		List<String> tokens = new ArrayList<>();
+		while (st.hasMoreTokens()) {
+			String token = st.nextToken();
+			if (trimTokens) {
+				token = token.trim();
+			}
+			if (!ignoreEmptyTokens || token.length() > 0) {
+				tokens.add(token);
+			}
+		}
+		return toStringArray(tokens);
+	}
+
+	/**
+	 * Take a {@code String} that is a delimited list and convert it into a
+	 * {@code String} array.
+	 * <p>A single {@code delimiter} may consist of more than one character,
+	 * but it will still be considered as a single delimiter string, rather
+	 * than as a bunch of potential delimiter characters, in contrast to
+	 * {@link #tokenizeToStringArray}.
+	 * @param str the input {@code String} (potentially {@code null} or empty)
+	 * @param delimiter the delimiter between elements (this is a single delimiter,
+	 * rather than a bunch individual delimiter characters)
+	 * @return an array of the tokens in the list
+	 * @see #tokenizeToStringArray
+	 */
+	public static String[] delimitedListToStringArray(@Nullable String str, @Nullable String delimiter) {
+		return delimitedListToStringArray(str, delimiter, null);
+	}
+
+	/**
+	 * Take a {@code String} that is a delimited list and convert it into
+	 * a {@code String} array.
+	 * <p>A single {@code delimiter} may consist of more than one character,
+	 * but it will still be considered as a single delimiter string, rather
+	 * than as a bunch of potential delimiter characters, in contrast to
+	 * {@link #tokenizeToStringArray}.
+	 * @param str the input {@code String} (potentially {@code null} or empty)
+	 * @param delimiter the delimiter between elements (this is a single delimiter,
+	 * rather than a bunch individual delimiter characters)
+	 * @param charsToDelete a set of characters to delete; useful for deleting unwanted
+	 * line breaks: e.g. "\r\n\f" will delete all new lines and line feeds in a {@code String}
+	 * @return an array of the tokens in the list
+	 * @see #tokenizeToStringArray
+	 */
+	public static String[] delimitedListToStringArray(
+			@Nullable String str, @Nullable String delimiter, @Nullable String charsToDelete) {
+
+		if (str == null) {
+			return EMPTY_STRING_ARRAY;
+		}
+		if (delimiter == null) {
+			return new String[] {str};
+		}
+
+		List<String> result = new ArrayList<>();
+		if (delimiter.isEmpty()) {
+			for (int i = 0; i < str.length(); i++) {
+				result.add(deleteAny(str.substring(i, i + 1), charsToDelete));
+			}
+		}
+		else {
+			int pos = 0;
+			int delPos;
+			while ((delPos = str.indexOf(delimiter, pos)) != -1) {
+				result.add(deleteAny(str.substring(pos, delPos), charsToDelete));
+				pos = delPos + delimiter.length();
+			}
+			if (str.length() > 0 && pos <= str.length()) {
+				// Add rest of String, but not in case of empty input.
+				result.add(deleteAny(str.substring(pos), charsToDelete));
+			}
+		}
+		return toStringArray(result);
+	}
+
+	/**
+	 * Convert a comma delimited list (e.g., a row from a CSV file) into an
+	 * array of strings.
+	 * @param str the input {@code String} (potentially {@code null} or empty)
+	 * @return an array of strings, or the empty array in case of empty input
+	 */
+	public static String[] commaDelimitedListToStringArray(@Nullable String str) {
+		return delimitedListToStringArray(str, ",");
+	}
+
+	/**
+	 * Convert a comma delimited list (e.g., a row from a CSV file) into a set.
+	 * <p>Note that this will suppress duplicates, and as of 4.2, the elements in
+	 * the returned set will preserve the original order in a {@link LinkedHashSet}.
+	 * @param str the input {@code String} (potentially {@code null} or empty)
+	 * @return a set of {@code String} entries in the list
+	 * @see #removeDuplicateStrings(String[])
+	 */
+	public static Set<String> commaDelimitedListToSet(@Nullable String str) {
+		String[] tokens = commaDelimitedListToStringArray(str);
+		return new LinkedHashSet<>(Arrays.asList(tokens));
+	}
+
+	/**
+	 * Convert a {@link Collection} to a delimited {@code String} (e.g. CSV).
+	 * <p>Useful for {@code toString()} implementations.
+	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
+	 * @param delim the delimiter to use (typically a ",")
+	 * @param prefix the {@code String} to start each element with
+	 * @param suffix the {@code String} to end each element with
+	 * @return the delimited {@code String}
+	 */
+	public static String collectionToDelimitedString(
+			@Nullable Collection<?> coll, String delim, String prefix, String suffix) {
+
+		if (CollectionUtils.isEmpty(coll)) {
+			return "";
+		}
+
+		int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length();
+		for (Object element : coll) {
+			totalLength += String.valueOf(element).length();
+		}
+
+		StringBuilder sb = new StringBuilder(totalLength);
+		Iterator<?> it = coll.iterator();
+		while (it.hasNext()) {
+			sb.append(prefix).append(it.next()).append(suffix);
+			if (it.hasNext()) {
+				sb.append(delim);
+			}
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * Convert a {@code Collection} into a delimited {@code String} (e.g. CSV).
+	 * <p>Useful for {@code toString()} implementations.
+	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
+	 * @param delim the delimiter to use (typically a ",")
+	 * @return the delimited {@code String}
+	 */
+	public static String collectionToDelimitedString(@Nullable Collection<?> coll, String delim) {
+		return collectionToDelimitedString(coll, delim, "", "");
+	}
+
+	/**
+	 * Convert a {@code Collection} into a delimited {@code String} (e.g., CSV).
+	 * <p>Useful for {@code toString()} implementations.
+	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
+	 * @return the delimited {@code String}
+	 */
+	public static String collectionToCommaDelimitedString(@Nullable Collection<?> coll) {
+		return collectionToDelimitedString(coll, ",");
+	}
+
+	/**
+	 * Convert a {@code String} array into a delimited {@code String} (e.g. CSV).
+	 * <p>Useful for {@code toString()} implementations.
+	 * @param arr the array to display (potentially {@code null} or empty)
+	 * @param delim the delimiter to use (typically a ",")
+	 * @return the delimited {@code String}
+	 */
+	public static String arrayToDelimitedString(@Nullable Object[] arr, String delim) {
+		if (ObjectUtils.isEmpty(arr)) {
+			return "";
+		}
+		if (arr.length == 1) {
+			return ObjectUtils.nullSafeToString(arr[0]);
+		}
+
+		StringJoiner sj = new StringJoiner(delim);
+		for (Object elem : arr) {
+			sj.add(String.valueOf(elem));
+		}
+		return sj.toString();
+	}
+
+	/**
+	 * Convert a {@code String} array into a comma delimited {@code String}
+	 * (i.e., CSV).
+	 * <p>Useful for {@code toString()} implementations.
+	 * @param arr the array to display (potentially {@code null} or empty)
+	 * @return the delimited {@code String}
+	 */
+	public static String arrayToCommaDelimitedString(@Nullable Object[] arr) {
+		return arrayToDelimitedString(arr, ",");
+	}
+
+	/**
+	 * Truncate the supplied {@link CharSequence}.
+	 * <p>Delegates to {@link #truncate(CharSequence, int)}, supplying {@code 100}
+	 * as the threshold.
+	 * @param charSequence the {@code CharSequence} to truncate
+	 * @return a truncated string, or a string representation of the original
+	 * {@code CharSequence} if its length does not exceed the threshold
+	 * @since 5.3.27
+	 */
+	public static String truncate(CharSequence charSequence) {
+		return truncate(charSequence, DEFAULT_TRUNCATION_THRESHOLD);
+	}
+
+	/**
+	 * Truncate the supplied {@link CharSequence}.
+	 * <p>If the length of the {@code CharSequence} is greater than the threshold,
+	 * this method returns a {@linkplain CharSequence#subSequence(int, int)
+	 * subsequence} of the {@code CharSequence} (up to the threshold) appended
+	 * with the suffix {@code " (truncated)..."}. Otherwise, this method returns
+	 * {@code charSequence.toString()}.
+	 * @param charSequence the {@code CharSequence} to truncate
+	 * @param threshold the maximum length after which to truncate; must be a
+	 * positive number
+	 * @return a truncated string, or a string representation of the original
+	 * {@code CharSequence} if its length does not exceed the threshold
+	 * @since 5.3.27
+	 */
+	public static String truncate(CharSequence charSequence, int threshold) {
+		Assert.isTrue(threshold > 0,
+				() -> "Truncation threshold must be a positive number: " + threshold);
+		if (charSequence.length() > threshold) {
+			return charSequence.subSequence(0, threshold) + TRUNCATION_SUFFIX;
+		}
+		return charSequence.toString();
+	}
+
+}
diff --git a/pom.xml b/pom.xml
index 5f91adec..1c63c2ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
     <modules>
         <module>microsphere-spring-parent</module>
         <module>microsphere-spring-dependencies</module>
+        <module>microsphere-spring-compatible</module>
         <module>microsphere-spring-context</module>
         <module>microsphere-spring-jdbc</module>
         <module>microsphere-spring-web</module>

From 67a8b92c46c7876aac16f54e7e19a948635b36a9 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 21:50:23 +0800
Subject: [PATCH 148/157] Update pom.xml

---
 microsphere-spring-context/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index 910c01fc..b72e50c6 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -127,6 +127,18 @@
 
     <profiles>
 
+        <profile>
+            <id>spring-framework-4.3</id>
+            <dependencies>
+                <dependency>
+                    <groupId>io.github.microsphere-projects</groupId>
+                    <artifactId>microsphere-spring-compatible</artifactId>
+                    <version>${revision}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+
         <profile>
             <id>spring-framework-5.0</id>
             <dependencies>
@@ -135,6 +147,13 @@
                     <artifactId>spring-context-indexer</artifactId>
                     <optional>true</optional>
                 </dependency>
+
+                <dependency>
+                    <groupId>io.github.microsphere-projects</groupId>
+                    <artifactId>microsphere-spring-compatible</artifactId>
+                    <version>${revision}</version>
+                    <optional>true</optional>
+                </dependency>
             </dependencies>
         </profile>
 

From 6429342a1cbc9b5c77d32ccd7f161b0ce44f0463 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 21:50:31 +0800
Subject: [PATCH 149/157] Update pom.xml

---
 microsphere-spring-web/pom.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index 0e861569..915ac640 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -96,4 +96,34 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>spring-framework-4.0</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.1</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.2</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>spring-framework-4.3</id>
+            <properties>
+                <spring.version>5.0.20.RELEASE</spring.version>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file

From 0fde82cd5aa9b22fefa5b0374836528af1ff1a40 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 21:59:28 +0800
Subject: [PATCH 150/157] Polish #34 : Compatible with Spring Framework 4.3

---
 .../io/microsphere/spring/core/io/ResourceUtilsTest.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
index 32c6c842..0c91417e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
@@ -27,6 +27,7 @@
 import java.util.function.Function;
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
+import static io.microsphere.spring.core.io.ResourceUtils.FILE_URL_RESOURCE_CLASS;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -54,13 +55,13 @@ public void init() throws IOException {
     @Test
     public void testIsFileUrlResource() {
         assertResource(this.classPathResource, ResourceUtils::isFileUrlResource, false);
-        assertResource(this.urlResource, ResourceUtils::isFileUrlResource, true);
+        assertResource(this.urlResource, ResourceUtils::isFileUrlResource, FILE_URL_RESOURCE_CLASS != null);
     }
 
     @Test
     public void testIsFileBasedResource() throws IOException {
         assertResource(this.classPathResource, ResourceUtils::isFileBasedResource, false);
-        assertResource(this.urlResource, ResourceUtils::isFileBasedResource, true);
+        assertResource(this.urlResource, ResourceUtils::isFileBasedResource, FILE_URL_RESOURCE_CLASS != null);
         assertResource(new FileSystemResource(this.urlResource.getFile()), ResourceUtils::isFileBasedResource, true);
     }
 

From 7332cab10f1317db6ca7c0e8945983889aa71f4e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Fri, 27 Dec 2024 22:03:41 +0800
Subject: [PATCH 151/157] Polish #34 : Support Spring Framework 4.3

---
 .github/workflows/maven-build.yml  |  3 +--
 microsphere-spring-parent/pom.xml  | 28 ----------------------------
 microsphere-spring-web/pom.xml     | 21 ---------------------
 microsphere-spring-webflux/pom.xml | 21 ---------------------
 4 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index f85569ae..3a77688e 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -22,8 +22,7 @@ jobs:
         java: [ '8', '11' , '17' , '21' ]
         maven-profile-spring-boot: [
           'spring-framework-5.3' , 'spring-framework-5.2', 'spring-framework-5.1' , 'spring-framework-5.0' ,
-#          'spring-framework-4.3' , 'spring-framework-4.2' , 'spring-framework-4.1', 'spring-framework-4.0' ,
-#          'spring-framework-3.2'
+          'spring-framework-4.3'
         ]
     steps:
       - name: Checkout Source
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 73683646..1ad6afcb 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -109,34 +109,6 @@
     </dependencyManagement>
 
     <profiles>
-        <profile>
-            <id>spring-framework-3.2</id>
-            <properties>
-                <spring.version>3.2.18.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.0</id>
-            <properties>
-                <spring.version>4.0.9.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.1</id>
-            <properties>
-                <spring.version>4.1.9.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.2</id>
-            <properties>
-                <spring.version>4.2.9.RELEASE</spring.version>
-            </properties>
-        </profile>
-
         <profile>
             <id>spring-framework-4.3</id>
             <properties>
diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index 915ac640..a5d4b363 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -97,27 +97,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>spring-framework-4.0</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.1</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.2</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
         <profile>
             <id>spring-framework-4.3</id>
             <properties>
diff --git a/microsphere-spring-webflux/pom.xml b/microsphere-spring-webflux/pom.xml
index 9aba58b4..c5f8708a 100644
--- a/microsphere-spring-webflux/pom.xml
+++ b/microsphere-spring-webflux/pom.xml
@@ -50,27 +50,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>spring-framework-4.0</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.1</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-4.2</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
         <profile>
             <id>spring-framework-4.3</id>
             <properties>

From 7aa9c330ef672427ff7beef5e5c499e1b9966e3b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 30 Dec 2024 17:41:46 +0800
Subject: [PATCH 152/157] Polish #33 : Remove microsphere-spring-test

---
 microsphere-spring-test/pom.xml               | 145 -----------------
 .../ClassImportBeanDefinitionRegistrar.java   |  41 -----
 .../AnnotatedTypeMetadataTestFactory.java     |  39 -----
 .../annotation/TestConditionContext.java      |  52 ------
 ...beddedDataBaseBeanDefinitionRegistrar.java | 150 ------------------
 ...eddedDataBaseBeanDefinitionsRegistrar.java |  32 ----
 .../jdbc/embedded/EmbeddedDatabaseType.java   |  17 --
 .../jdbc/embedded/EnableEmbeddedDatabase.java |  52 ------
 .../embedded/EnableEmbeddedDatabases.java     |  30 ----
 .../test/kafka/CompositeMessageListener.java  |  60 -------
 .../spring/test/kafka/EnableKafkaTest.java    |  98 ------------
 .../test/kafka/KafkaTestConfiguration.java    |  85 ----------
 .../kafka/embedded/EmbeddedKafkaHolder.java   |  33 ----
 .../spring/test/redis/EnableRedisTest.java    |  32 ----
 .../test/redis/RedisTestConfiguration.java    |  56 -------
 ...dedRedisServerBeanDefinitionRegistrar.java |  80 ----------
 .../embedded/EnableEmbeddedRedisServer.java   |  56 -------
 .../test/util/CompatibilityTestUtils.java     |  99 ------------
 .../embedded/EnableEmbeddedDatabaseTest.java  |  79 ---------
 .../spring/test/kafka/EmbeddedKafkaTest.java  | 146 -----------------
 .../test/kafka/EnableKafkaTestCase.java       |  76 ---------
 .../spring/test/kafka/KafkaTemplateTests.java |  81 ----------
 .../redis/RedisTestConfigurationTest.java     |  39 -----
 .../EnableEmbeddedRedisServerTest.java        |  30 ----
 .../META-INF/mysql/manual_schema.sql          |  71 ---------
 pom.xml                                       |   1 -
 26 files changed, 1680 deletions(-)
 delete mode 100644 microsphere-spring-test/pom.xml
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
 delete mode 100644 microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
 delete mode 100644 microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
 delete mode 100644 microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql

diff --git a/microsphere-spring-test/pom.xml b/microsphere-spring-test/pom.xml
deleted file mode 100644
index 3c7937b8..00000000
--- a/microsphere-spring-test/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-    <parent>
-        <groupId>io.github.microsphere-projects</groupId>
-        <artifactId>microsphere-spring-parent</artifactId>
-        <version>${revision}</version>
-        <relativePath>../microsphere-spring-parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.github.microsphere-projects</groupId>
-    <artifactId>microsphere-spring-test</artifactId>
-    <version>${revision}</version>
-    <packaging>jar</packaging>
-
-    <name>Microsphere :: Spring :: Test</name>
-    <description>Microsphere Spring Test</description>
-
-    <properties>
-        <zookeeper.version>3.8.1</zookeeper.version>
-        <wix-embedded-mysql.version>4.6.2</wix-embedded-mysql.version>
-    </properties>
-
-    <dependencies>
-
-        <!-- Microsphere -->
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-java-core</artifactId>
-        </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-assertj</artifactId>
-        </dependency>
-
-        <!-- Spring Framework -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Zookeeper -->
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
-
-        <!-- Embedded Redis -->
-        <dependency>
-            <groupId>com.github.kstyrc</groupId>
-            <artifactId>embedded-redis</artifactId>
-        </dependency>
-
-        <!-- Spring Redis -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>io.lettuce</groupId>
-            <artifactId>lettuce-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Spring Kafka -->
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka-test</artifactId>
-        </dependency>
-
-        <!-- SQLite -->
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-        </dependency>
-
-        <!-- Embedded MySQL -->
-        <dependency>
-            <groupId>com.wix</groupId>
-            <artifactId>wix-embedded-mysql</artifactId>
-            <version>${wix-embedded-mysql.version}</version>
-        </dependency>
-
-        <!-- MariaDB Connector/J-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
-
-        <!-- MariaDB4j -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-        </dependency>
-
-        <!-- MySQL JDBC Driver -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
deleted file mode 100644
index aabe47b4..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/ClassImportBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.microsphere.spring.test;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanNameGenerator;
-import org.springframework.context.annotation.AnnotationBeanNameGenerator;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.type.AnnotationMetadata;
-
-/**
- * Class {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class ClassImportBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private final String[] beanClassNames;
-
-    private final BeanNameGenerator beanNameGenerator;
-
-    public ClassImportBeanDefinitionRegistrar(String[] beanClassNames) {
-        this.beanClassNames = beanClassNames;
-        this.beanNameGenerator = new AnnotationBeanNameGenerator();
-    }
-
-    @Override
-    public final void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        for (String beanClassName : beanClassNames) {
-            registerBeanDefinition(beanClassName, registry);
-        }
-    }
-
-    private void registerBeanDefinition(String beanClassName, BeanDefinitionRegistry registry) {
-        BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(beanClassName);
-        BeanDefinition beanDefinition = beanDefinitionBuilder.getBeanDefinition();
-        String beanName = beanNameGenerator.generateBeanName(beanDefinition, registry);
-        registry.registerBeanDefinition(beanName, beanDefinition);
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
deleted file mode 100644
index ccbaf226..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/AnnotatedTypeMetadataTestFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.microsphere.spring.test.context.annotation;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.core.type.StandardMethodMetadata;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Method;
-
-/**
- * {@link AnnotatedTypeMetadata} Test Factory
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class AnnotatedTypeMetadataTestFactory implements BeanClassLoaderAware {
-
-    private ClassLoader classLoader;
-
-    public AnnotatedTypeMetadata createMethodAnnotatedTypeMetadata() {
-        Method method = findTestMethod();
-        return new StandardMethodMetadata(method);
-    }
-
-    private Method findTestMethod() {
-        StackTraceElement[] stackTraces = Thread.currentThread().getStackTrace();
-        StackTraceElement stackTrace = stackTraces[3];
-        String className = stackTrace.getClassName();
-        String methodName = stackTrace.getMethodName();
-        Class<?> targetClass = ClassUtils.resolveClassName(className, classLoader);
-        return ReflectionUtils.findMethod(targetClass, methodName);
-    }
-
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
deleted file mode 100644
index 580e5e68..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/context/annotation/TestConditionContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.microsphere.spring.test.context.annotation;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-
-/**
- * {@link ConditionContext} test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class TestConditionContext implements ConditionContext, ApplicationContextAware {
-
-    private ConfigurableApplicationContext applicationContext;
-
-    @Override
-    public BeanDefinitionRegistry getRegistry() {
-        return (BeanDefinitionRegistry) applicationContext.getBeanFactory();
-    }
-
-    @Override
-    public ConfigurableListableBeanFactory getBeanFactory() {
-        return applicationContext.getBeanFactory();
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        return applicationContext.getEnvironment();
-    }
-
-    @Override
-    public ResourceLoader getResourceLoader() {
-        return applicationContext;
-    }
-
-    @Override
-    public ClassLoader getClassLoader() {
-        return applicationContext.getClassLoader();
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = (ConfigurableApplicationContext) applicationContext;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
deleted file mode 100644
index ff348153..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import ch.vorburger.exec.ManagedProcessException;
-import ch.vorburger.mariadb4j.DB;
-import ch.vorburger.mariadb4j.DBConfigurationBuilder;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.util.StringUtils;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.annotation.Annotation;
-import java.util.Properties;
-import java.util.StringJoiner;
-
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * Embedded database {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedDatabase
- * @since 1.0.0
- */
-class EmbeddedDataBaseBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedDatabase.class;
-
-    private static final String INTERNAL_USE_PROPERTY_NAME_PREFIX = "_";
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        registerBeanDefinitions(attributes, registry);
-    }
-
-    void registerBeanDefinitions(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        EmbeddedDatabaseType type = attributes.getEnum("type");
-
-        switch (type) {
-            case SQLITE:
-                processSQLite(attributes, registry);
-                break;
-            case MARIADB:
-                processMariaDB(attributes, registry);
-                break;
-        }
-    }
-
-    private void processSQLite(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        registerSQLiteDataSourceBeanDefinition(attributes, registry);
-    }
-
-    private void processMariaDB(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        int port = attributes.getNumber("port");
-        Properties properties = resolveProperties(attributes, registry);
-        startEmbeddedMariaDB4j(port, properties);
-        registerMariaDBDataSourceBeanDefinition(port, attributes, registry);
-    }
-
-    private void registerSQLiteDataSourceBeanDefinition(AnnotationAttributes attributes,
-                                                        BeanDefinitionRegistry registry) {
-        registerDataSourceBeanDefinition("jdbc:sqlite::memory:", attributes, registry);
-    }
-
-    private void startEmbeddedMariaDB4j(int port, Properties properties) {
-        DBConfigurationBuilder configBuilder = DBConfigurationBuilder.newBuilder();
-        configBuilder.setPort(port);
-        String sqlSource = properties.getProperty("_sql.source");
-        ResourceLoader resourceLoader = new DefaultResourceLoader();
-        DB db = null;
-        try {
-            db = DB.newEmbeddedDB(configBuilder.build());
-            db.start();
-            if (StringUtils.hasText(sqlSource)) {
-                Resource resource = resourceLoader.getResource(sqlSource);
-                db.source(resource.getInputStream());
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void registerMariaDBDataSourceBeanDefinition(int port,
-                                                         AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        String jdbcURL = "jdbc:mariadb://127.0.0.1:" + port;
-        registerDataSourceBeanDefinition(jdbcURL, attributes, registry);
-    }
-
-    private void registerDataSourceBeanDefinition(String jdbcURL,
-                                                  AnnotationAttributes attributes,
-                                                  BeanDefinitionRegistry registry) {
-        String beanName = attributes.getString("dataSource");
-        boolean primary = attributes.getBoolean("primary");
-        Properties properties = resolveProperties(attributes, registry);
-
-        BeanDefinitionBuilder beanDefinitionBuilder = genericBeanDefinition(DriverManagerDataSource.class);
-        beanDefinitionBuilder.addConstructorArgValue(jdbcURL);
-        beanDefinitionBuilder.addConstructorArgValue(properties);
-        if (registry.containsBeanDefinition(beanName)) {
-            throw new BeanCreationException("The duplicated BeanDefinition with name : " + beanName);
-        }
-        AbstractBeanDefinition beanDefinition = beanDefinitionBuilder.getBeanDefinition();
-        beanDefinition.setPrimary(primary);
-        registry.registerBeanDefinition(beanName, beanDefinition);
-    }
-
-    private Properties resolveProperties(AnnotationAttributes attributes, BeanDefinitionRegistry registry) {
-        ConfigurableBeanFactory beanFactory = null;
-        if (registry instanceof ConfigurableBeanFactory) {
-            beanFactory = (ConfigurableBeanFactory) registry;
-        }
-        String[] values = attributes.getStringArray("properties");
-        if (values.length == 0) {
-            return null;
-        }
-        StringJoiner stringJoiner = new StringJoiner(System.lineSeparator());
-        for (String value : values) {
-            // TODO
-            // Resolve the placeholders
-            // If value starts with "_", ignored
-//            if (value.startsWith(INTERNAL_USE_PROPERTY_NAME_PREFIX)) {
-//                continue;
-//            }
-            String resolvedValue = beanFactory == null ? value :
-                    beanFactory.resolveEmbeddedValue(value);
-            stringJoiner.add(resolvedValue);
-        }
-        Properties properties = new Properties();
-        try {
-            properties.load(new StringReader(stringJoiner.toString()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return properties;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
deleted file mode 100644
index 72c6397a..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDataBaseBeanDefinitionsRegistrar.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.type.AnnotationMetadata;
-
-import java.lang.annotation.Annotation;
-
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * {@link EnableEmbeddedDatabases} {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedDatabases
- * @see EmbeddedDataBaseBeanDefinitionRegistrar
- * @since 1.0.0
- */
-class EmbeddedDataBaseBeanDefinitionsRegistrar implements ImportBeanDefinitionRegistrar {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedDatabases.class;
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        EmbeddedDataBaseBeanDefinitionRegistrar registrar = new EmbeddedDataBaseBeanDefinitionRegistrar();
-        for (AnnotationAttributes valueAttributes : attributes.getAnnotationArray("value")) {
-            registrar.registerBeanDefinitions(valueAttributes, registry);
-        }
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
deleted file mode 100644
index e94e6339..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EmbeddedDatabaseType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-/**
- * Embedded database types
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public enum EmbeddedDatabaseType {
-
-    SQLITE,
-
-    /**
-     * MariaDB
-     */
-    MARIADB
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
deleted file mode 100644
index 25bae8dc..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import javax.sql.DataSource;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable an embedded database
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Import(EmbeddedDataBaseBeanDefinitionRegistrar.class)
-@Repeatable(EnableEmbeddedDatabases.class)
-public @interface EnableEmbeddedDatabase {
-
-    /**
-     * @return Embedded Database Type, SQLite as default
-     */
-    EmbeddedDatabaseType type() default EmbeddedDatabaseType.SQLITE;
-
-    /**
-     * JDBC connection port
-     *
-     * @return if not specified port, return <code>-1</code>
-     */
-    int port() default -1;
-
-    /**
-     * @return {@link DataSource} Bean Name
-     */
-    String dataSource();
-
-    /**
-     * @return Primary Bean or not
-     */
-    boolean primary() default false;
-
-    /**
-     * @return JDBC Properties Properties, Key-value
-     */
-    String[] properties() default {};
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
deleted file mode 100644
index 1cfa729d..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabases.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * {@link Repeatable} {@link EnableEmbeddedDatabase}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(EmbeddedDataBaseBeanDefinitionsRegistrar.class)
-public @interface EnableEmbeddedDatabases {
-
-    /**
-     * @return Multiple {@link EnableEmbeddedDatabase}
-     */
-    EnableEmbeddedDatabase[] value();
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
deleted file mode 100644
index 25c5ee54..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/CompositeMessageListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.support.Acknowledgment;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Composite {@link MessageListener}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class CompositeMessageListener<K, V> implements MessageListener<K, V> {
-
-    private final List<MessageListener<K, V>> messageListeners = new LinkedList<>();
-
-    public CompositeMessageListener<K, V> addMessageListener(MessageListener<K, V> messageListener) {
-        if (messageListener != this) {
-            this.messageListeners.add(messageListener);
-        }
-        return this;
-    }
-
-    public CompositeMessageListener<K, V> addMessageListeners(Iterable<MessageListener<K, V>> messageListeners) {
-        messageListeners.forEach(this::addMessageListener);
-        return this;
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Acknowledgment acknowledgment) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, acknowledgment);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Consumer<?, ?> consumer) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, consumer);
-        });
-    }
-
-    @Override
-    public void onMessage(ConsumerRecord<K, V> data, Acknowledgment acknowledgment, Consumer<?, ?> consumer) {
-        messageListeners.forEach(listener -> {
-            listener.onMessage(data, acknowledgment, consumer);
-        });
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
deleted file mode 100644
index f21403d7..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/EnableKafkaTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AliasFor;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable Kafka Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EmbeddedKafka
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@EmbeddedKafka
-@Import(KafkaTestConfiguration.class)
-public @interface EnableKafkaTest {
-
-    /**
-     * @return the number of brokers
-     */
-    @AliasFor(value = "value", annotation = EmbeddedKafka.class)
-    int brokers() default 1;
-
-    /**
-     * @return passed into {@code kafka.utils.TestUtils.createBrokerConfig()}.
-     */
-    @AliasFor(value = "controlledShutdown", annotation = EmbeddedKafka.class)
-    boolean controlledShutdown() default false;
-
-    /**
-     * Set explicit ports on which the kafka brokers will listen. Useful when running an
-     * embedded broker that you want to access from other processes.
-     * A port must be provided for each instance, which means the number of ports must match the value of the count attribute.
-     *
-     * @return ports for brokers.
-     * @since 2.2.4
-     */
-    @AliasFor(value = "ports", annotation = EmbeddedKafka.class)
-    int[] ports() default {9092};
-
-    /**
-     * @return partitions per topic
-     */
-    @AliasFor(value = "partitions", annotation = EmbeddedKafka.class)
-    int partitions() default 1;
-
-    /**
-     * Topics that should be created Topics may contain property placeholders, e.g.
-     * {@code topics = "${kafka.topic.one:topicOne}"} The topics will be created with
-     * {@link #partitions()} partitions; to provision other topics with other partition
-     * counts call the {@code addTopics(NewTopic... topics)} method on the autowired
-     * broker.
-     *
-     * @return the topics to create
-     */
-    @AliasFor(value = "topics", annotation = EmbeddedKafka.class)
-    String[] topics() default {};
-
-    /**
-     * Properties in form {@literal key=value} that should be added to the broker config
-     * before runs. Properties may contain property placeholders, e.g.
-     * {@code delete.topic.enable=${topic.delete:true}}.
-     *
-     * @return the properties to add
-     * @see #brokerPropertiesLocation()
-     * @see org.springframework.kafka.test.EmbeddedKafkaBroker#brokerProperties(java.util.Map)
-     */
-    @AliasFor(value = "brokerProperties", annotation = EmbeddedKafka.class)
-    String[] brokerProperties() default {
-            "listeners = PLAINTEXT://127.0.0.1:9092",
-            "auto.create.topics.enable = true"
-    };
-
-    /**
-     * Spring {@code Resource} url specifying the location of properties that should be
-     * added to the broker config. The {@code brokerPropertiesLocation} url and the
-     * properties themselves may contain placeholders that are resolved during
-     * initialization. Properties specified by {@link #brokerProperties()} will override
-     * properties found in {@code brokerPropertiesLocation}.
-     *
-     * @return a {@code Resource} url specifying the location of properties to add
-     * @see #brokerProperties()
-     * @see org.springframework.kafka.test.EmbeddedKafkaBroker#brokerProperties(java.util.Map)
-     */
-    @AliasFor(value = "brokerPropertiesLocation", annotation = EmbeddedKafka.class)
-    String brokerPropertiesLocation() default "";
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
deleted file mode 100644
index a1c87e54..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/KafkaTestConfiguration.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.GenericMessageListenerContainer;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.support.LoggingProducerListener;
-import org.springframework.kafka.support.ProducerListener;
-import org.springframework.kafka.support.converter.RecordMessageConverter;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import java.util.Map;
-import java.util.StringJoiner;
-
-/**
- * Kafka Test configuration
- *
- * @param <K> Key type
- * @param <V> Value type
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class KafkaTestConfiguration<K, V> {
-
-    private final RecordMessageConverter messageConverter;
-
-    private final ProducerListener<K, V> kafkaProducerListener;
-
-    public KafkaTestConfiguration(ObjectProvider<RecordMessageConverter> messageConverter,
-                                  ObjectProvider<ProducerListener<K, V>> kafkaProducerListener) {
-        this.messageConverter = messageConverter.getIfAvailable();
-        this.kafkaProducerListener = kafkaProducerListener.getIfAvailable(LoggingProducerListener::new);
-    }
-
-    @Bean
-    public KafkaTemplate<K, V> kafkaTemplate(EmbeddedKafkaBroker embeddedKafka) {
-        Map<String, Object> producerProps = KafkaTestUtils.producerProps(embeddedKafka);
-        ProducerFactory<K, V> pf = new DefaultKafkaProducerFactory<>(producerProps);
-        KafkaTemplate<K, V> kafkaTemplate = new KafkaTemplate(pf);
-        if (messageConverter != null) {
-            kafkaTemplate.setMessageConverter(messageConverter);
-        }
-        kafkaTemplate.setProducerListener(kafkaProducerListener);
-        return kafkaTemplate;
-    }
-
-    @Bean
-    public GenericMessageListenerContainer<K, V> messageListenerContainer(EmbeddedKafkaBroker embeddedKafka,
-                                                                          CompositeMessageListener<K, V> compositeMessageListener) {
-        String[] topics = embeddedKafka.getTopics().toArray(new String[0]);
-        StringJoiner nameBuilder = new StringJoiner("-");
-        nameBuilder.add("group");
-        for (String topic : topics) {
-            nameBuilder.add(topic);
-        }
-        String beanName = nameBuilder.toString();
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps(beanName, "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<K, V> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(topics);
-        KafkaMessageListenerContainer<K, V> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        container.setBeanName(beanName);
-        container.setupMessageListener(compositeMessageListener);
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-        return container;
-    }
-
-    @Bean
-    @Primary
-//    @Autowired(required = false)
-    public CompositeMessageListener<K, V> compositeMessageListener() {
-        CompositeMessageListener<K, V> compositeMessageListener = new CompositeMessageListener<>();
-//        compositeMessageListener.addMessageListeners(messageListeners);
-        return compositeMessageListener;
-    }
-
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
deleted file mode 100644
index d685004b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/kafka/embedded/EmbeddedKafkaHolder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.microsphere.spring.test.kafka.embedded;
-
-import org.apache.kafka.common.KafkaException;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-
-/**
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see <a href="https://docs.spring.io/spring-kafka/docs/current/reference/html/#using-the-same-brokers-for-multiple-test-classes">EmbeddedKafkaHolder</a>
- * @since 1.0.0
- */
-public final class EmbeddedKafkaHolder {
-
-    private static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(1, false);
-
-    private static boolean started;
-
-    private EmbeddedKafkaHolder() {
-        super();
-    }
-
-    public static EmbeddedKafkaRule getEmbeddedKafka() {
-        if (!started) {
-            try {
-                embeddedKafka.before();
-            } catch (Exception e) {
-                throw new KafkaException(e);
-            }
-            started = true;
-        }
-        return embeddedKafka;
-    }
-
-}
\ No newline at end of file
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
deleted file mode 100644
index 0f83c41b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/EnableRedisTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import redis.embedded.RedisServer;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable Redis Test configures the component list:
- * <ul>
- *     <li>{@link RedisTemplate RedisTemplate&lt;Object,Object&gt;}</li>
- *     <li>{@link StringRedisTemplate}</li>
- *     <li>{@link RedisServer}</li>
- * </ul>
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(RedisTestConfiguration.class)
-public @interface EnableRedisTest {
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
deleted file mode 100644
index 3960056d..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/RedisTestConfiguration.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import io.microsphere.spring.test.redis.embedded.EnableEmbeddedRedisServer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import redis.embedded.RedisServer;
-
-/**
- * Redis test configuration class configures the component list：
- * <ul>
- *     <li>{@link RedisTemplate RedisTemplate&lt;Object,Object&gt;}</li>
- *     <li>{@link StringRedisTemplate}</li>
- *     <li>{@link RedisServer}</li>
- * </ul>
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@EnableEmbeddedRedisServer
-class RedisTestConfiguration {
-
-    @Bean
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        redisTemplate.setKeySerializer(stringRedisSerializer);
-        redisTemplate.setHashKeySerializer(stringRedisSerializer);
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-    @Bean
-    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        StringRedisTemplate redisTemplate = new StringRedisTemplate();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        redisTemplate.setKeySerializer(stringRedisSerializer);
-        redisTemplate.setHashKeySerializer(stringRedisSerializer);
-        redisTemplate.afterPropertiesSet();
-
-        return redisTemplate;
-    }
-
-    @Bean(destroyMethod = "destroy")
-    public LettuceConnectionFactory redisConnectionFactory() {
-        return new LettuceConnectionFactory(new RedisStandaloneConfiguration("127.0.0.1", 6379));
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
deleted file mode 100644
index 517ed226..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EmbeddedRedisServerBeanDefinitionRegistrar.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.StringUtils;
-import redis.embedded.RedisServer;
-import redis.embedded.RedisServerBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
-/**
- * Embedded Redis server {@link ImportBeanDefinitionRegistrar}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see EnableEmbeddedRedisServer
- * @since 1.0.0
- */
-class EmbeddedRedisServerBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware {
-
-    private static final Class<? extends Annotation> ANNOTATION_TYPE = EnableEmbeddedRedisServer.class;
-
-    private ResourceLoader resourceLoader;
-
-    @Override
-    public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-        AnnotationAttributes attributes = fromMap(metadata.getAnnotationAttributes(ANNOTATION_TYPE.getName()));
-        RedisServer redisServer = resolveRedisServer(attributes);
-        BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(RedisServer.class, () -> redisServer);
-        beanDefinitionBuilder.setInitMethodName("start");
-        beanDefinitionBuilder.setDestroyMethodName("stop");
-
-        String beanName = attributes.getString("name");
-        registry.registerBeanDefinition(beanName, beanDefinitionBuilder.getBeanDefinition());
-    }
-
-    RedisServer resolveRedisServer(AnnotationAttributes attributes) {
-        RedisServerBuilder builder = RedisServer.builder();
-        Integer port = attributes.getNumber("port");
-        builder.port(port);
-
-        String slaveOf = attributes.getString("slaveOf");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(slaveOf)) {
-            String[] values = StringUtils.split(slaveOf, ":");
-            builder.slaveOf(values[0], Integer.decode(values[1]));
-        }
-
-        String configFile = attributes.getString("configFile");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(configFile)) {
-            Resource resource = resourceLoader.getResource(configFile);
-            try {
-                File redisConfFile = resource.getFile();
-                builder.configFile(redisConfFile.getAbsolutePath());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        String setting = attributes.getString("setting");
-        if (!EnableEmbeddedRedisServer.NO_DEFINITION.equals(setting)) {
-            builder.setting(setting);
-        }
-
-        return builder.build();
-    }
-
-    @Override
-    public void setResourceLoader(ResourceLoader resourceLoader) {
-        this.resourceLoader = resourceLoader;
-    }
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java b/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
deleted file mode 100644
index c8ab4844..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Enable the embedded Redis server
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @see redis.embedded.RedisServer
- * @since 1.0.0
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(EmbeddedRedisServerBeanDefinitionRegistrar.class)
-public @interface EnableEmbeddedRedisServer {
-
-    /**
-     * No Definition
-     */
-    String NO_DEFINITION = "N/D";
-
-    /**
-     * @return Redis Server bean Name
-     */
-    String name() default "redisServer";
-
-    /**
-     * @return Redis Server port, default：6379
-     */
-    int port() default 6379;
-
-    /**
-     * @return Redis Server Slave addresses
-     */
-    String slaveOf() default NO_DEFINITION;
-
-    /**
-     * @return Redis Server config file
-     */
-    String configFile() default NO_DEFINITION;
-
-
-    /**
-     * @return Redis Server settings
-     */
-    String setting() default NO_DEFINITION;
-}
diff --git a/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java b/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
deleted file mode 100644
index 3e98876b..00000000
--- a/microsphere-spring-test/src/main/java/io/microsphere/test/util/CompatibilityTestUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.microsphere.test.util;
-
-import org.slf4j.Logger;
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Compatibility test tool
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-public class CompatibilityTestUtils {
-
-    public static final Predicate<Method> PUBLIC_METHOD_FILTER = method -> Modifier.isPublic(method.getModifiers())
-            && !Object.class.equals(method.getDeclaringClass());
-
-    public static final Predicate<Field> PUBLIC_STATIC_FIELD_FILTER = field -> {
-        int modifiers = field.getModifiers();
-        return Modifier.isStatic(modifiers) &&
-                Modifier.isPublic(modifiers) &&
-                !field.getType().equals(Logger.class) // Excluding log objects
-                ;
-    };
-
-    /**
-     * Test method compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     * @param methodFilter  Method filter
-     */
-    public static void testCompatibilityOnMethods(Class<?> originalClass, Class<?> testedClass, Predicate<Method> methodFilter) {
-        ReflectionUtils.doWithMethods(originalClass, method -> {
-            String methodName = method.getName();
-            Class<?> returnType = method.getReturnType();
-            Class<?>[] parameterTypes = method.getParameterTypes();
-            Method targetMethod = ReflectionUtils.findMethod(testedClass, methodName, parameterTypes);
-            assertNotNull(String.format("Method [Name: %s, parameter: %s] is not defined in target class [%s]!", methodName, Arrays.asList(parameterTypes), testedClass.getName()), targetMethod);
-            assertTrue(String.format("The return type of the original method [Name: %s, parameter: %s] is not compatible with the target method [%s]!", methodName, Arrays.asList(parameterTypes), method),
-                    targetMethod.getReturnType().isAssignableFrom(returnType));
-        }, method -> methodFilter == null ? true : methodFilter.test(method));
-    }
-
-    /**
-     * Testing field Compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     */
-    public static void testCompatibilityOnFields(Class<?> originalClass, Class<?> testedClass) {
-        testCompatibilityOnFields(originalClass, testedClass, null);
-    }
-
-    /**
-     * Testing field Compatibility
-     *
-     * @param originalClass Original defined class
-     * @param testedClass   Class under test
-     * @param fieldFilter   Field filter
-     */
-    public static void testCompatibilityOnFields(Class<?> originalClass, Class<?> testedClass, Predicate<Field> fieldFilter) {
-        List<String> errorMessages = new LinkedList<>();
-        ReflectionUtils.doWithFields(originalClass, field -> {
-            String fieldName = field.getName();
-            Class<?> fieldType = field.getType();
-            Field targetField = ReflectionUtils.findField(testedClass, fieldName, fieldType);
-            if (targetField == null) {
-                errorMessages.add(String.format("Field [Name: %s, Type: %s] not defined in target class [%s]!",
-                        fieldName, fieldType.getName(), testedClass.getName()));
-                return;
-            }
-
-
-            if (Modifier.isStatic(field.getModifiers())) {
-                Object fieldValue = field.get(null);
-                Object targetValue = targetField.get(null);
-                if (!Objects.equals(fieldValue, targetValue)) {
-                    errorMessages.add(originalClass.getName() + " , " + fieldName + " = " + fieldValue);
-                }
-            }
-
-        }, field -> fieldFilter == null ? true : fieldFilter.test(field));
-
-        errorMessages.forEach(System.err::println);
-
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
deleted file mode 100644
index e359f962..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/jdbc/embedded/EnableEmbeddedDatabaseTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.microsphere.spring.test.jdbc.embedded;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static io.microsphere.spring.test.jdbc.embedded.EmbeddedDatabaseType.MARIADB;
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link EnableEmbeddedDatabase} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@Ignore
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = EnableEmbeddedDatabaseTest.class)
-@EnableEmbeddedDatabase(dataSource = "primary", primary = true)
-@EnableEmbeddedDatabase(dataSource = "secondary")
-@EnableEmbeddedDatabase(
-        type = MARIADB, port = 0, dataSource = "mariadbDataSource",
-        properties = {
-                "charset=utf-8",
-                "useSSL=false",
-                "useUnicode=true",
-                "_sql.source=classpath:/META-INF/mysql/manual_schema.sql"
-        }
-)
-public class EnableEmbeddedDatabaseTest {
-
-    private static final Logger logger = LoggerFactory.getLogger(EnableEmbeddedDatabaseTest.class);
-
-    @Autowired
-    @Qualifier("primary")
-    private DataSource dataSource;
-
-    @Autowired
-    @Qualifier("secondary")
-    private DataSource dataSource2;
-
-    @Autowired
-    @Qualifier("mariadbDataSource")
-    private DataSource mariadbDataSource;
-
-    @Test
-    public void test() throws SQLException {
-        Connection connection = dataSource.getConnection();
-        Statement statement = connection.createStatement();
-        statement.close();
-        connection.close();
-    }
-
-    @Test
-    public void testMariadbDataSource() throws Exception {
-        Connection connection = mariadbDataSource.getConnection();
-        Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery("SHOW databases");
-        while (resultSet.next()) {
-            String databaseName = resultSet.getString(1);
-            logger.info("database : {}", databaseName);
-        }
-        statement.close();
-        connection.close();
-    }
-}
-
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
deleted file mode 100644
index 58625218..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EmbeddedKafkaTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * {@link EmbeddedKafka}
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        EmbeddedKafkaTest.class
-})
-@DirtiesContext
-@EmbeddedKafka(partitions = 1,
-        topics = {
-                "test-topic"
-        },
-        brokerProperties = {
-                "listeners = PLAINTEXT://127.0.0.1:9092",
-                "port = 9092",
-                "auto.create.topics.enable = true"
-        })
-public class EmbeddedKafkaTest {
-
-    private static final String TEMPLATE_TOPIC = "topic-EmbeddedKafkaTest";
-
-    @Autowired
-    private EmbeddedKafkaBroker embeddedKafka;
-
-    @Autowired
-    private KafkaTemplate<Object, Object> kafkaTemplate;
-
-    @Test
-    public void test() throws Throwable {
-        assertNotNull(kafkaTemplate);
-
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("test", "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<Object, Object> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Object, Object> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Object, Object>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Object, Object>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Object, Object> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-
-        kafkaTemplate.send(TEMPLATE_TOPIC, "Hello,World");
-
-        records.poll(10, TimeUnit.SECONDS);
-
-
-    }
-
-
-    @Test
-    public void testTemplate() throws Exception {
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("testT", "false", embeddedKafka);
-        DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<Integer, String>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Integer, String> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Integer, String>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Integer, String>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Integer, String> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic());
-//        Map<String, Object> producerProps =
-//                KafkaTestUtils.producerProps(embeddedKafka);
-//        ProducerFactory<Integer, String> pf =
-//                new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-//        KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf);
-
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        kafkaTemplate.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        kafkaTemplate.sendDefault(0, 2, "bar");
-        ConsumerRecord<Integer, String> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        kafkaTemplate.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-
-        kafkaTemplate.sendDefault("Hello,World");
-        records.poll(10, TimeUnit.SECONDS);
-    }
-
-    @Bean
-    public KafkaTemplate<Object, Object> kafkaTemplate(EmbeddedKafkaBroker embeddedKafka) {
-        Map<String, Object> producerProps = KafkaTestUtils.producerProps(embeddedKafka);
-        ProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-        KafkaTemplate<Object, Object> kafkaTemplate = new KafkaTemplate(pf);
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        return kafkaTemplate;
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
deleted file mode 100644
index 946bffc4..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/EnableKafkaTestCase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * {@link EnableKafkaTest} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-        EnableKafkaTestCase.class
-})
-@DirtiesContext
-@EnableKafkaTest(topics = {
-        "test-topic"
-})
-public class EnableKafkaTestCase {
-
-    private static final String TEMPLATE_TOPIC = "topic-EnableKafkaTestCase";
-
-    @Autowired
-    private KafkaTemplate<Object, Object> kafkaTemplate;
-
-    @Autowired
-    private CompositeMessageListener<Object, Object> compositeMessageListener;
-
-    @Test
-    public void test() throws Exception {
-
-        final BlockingQueue<ConsumerRecord<Object, Object>> records = new LinkedBlockingQueue<>();
-        compositeMessageListener.addMessageListener(new MessageListener<Object, Object>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Object, Object> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-        });
-
-        kafkaTemplate.setDefaultTopic(TEMPLATE_TOPIC);
-        kafkaTemplate.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        kafkaTemplate.sendDefault(0, 2, "bar");
-        ConsumerRecord<Object, Object> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        kafkaTemplate.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-
-        kafkaTemplate.sendDefault("Hello,World");
-        records.poll(10, TimeUnit.SECONDS);
-    }
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
deleted file mode 100644
index 31f3d761..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/kafka/KafkaTemplateTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.microsphere.spring.test.kafka;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.listener.KafkaMessageListenerContainer;
-import org.springframework.kafka.listener.MessageListener;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.ContainerTestUtils;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
-/**
- * TODO Comment
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since TODO
- */
-public class KafkaTemplateTests {
-
-    private static final String TEMPLATE_TOPIC = "topic-KafkaTemplateTests";
-
-    @ClassRule
-    public static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(1, true, TEMPLATE_TOPIC);
-
-    @Test
-    public void testTemplate() throws Exception {
-        Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("testT", "false",
-                embeddedKafka.getEmbeddedKafka());
-        DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<Integer, String>(consumerProps);
-        ContainerProperties containerProperties = new ContainerProperties(TEMPLATE_TOPIC);
-        KafkaMessageListenerContainer<Integer, String> container = new KafkaMessageListenerContainer<>(cf, containerProperties);
-        final BlockingQueue<ConsumerRecord<Integer, String>> records = new LinkedBlockingQueue<>();
-        container.setupMessageListener(new MessageListener<Integer, String>() {
-
-            @Override
-            public void onMessage(ConsumerRecord<Integer, String> record) {
-                System.out.println(record);
-                records.add(record);
-            }
-
-        });
-        container.setBeanName("templateTests");
-        container.start();
-        ContainerTestUtils.waitForAssignment(container,
-                embeddedKafka.getEmbeddedKafka().getPartitionsPerTopic());
-        Map<String, Object> producerProps =
-                KafkaTestUtils.producerProps(embeddedKafka.getEmbeddedKafka());
-        ProducerFactory<Integer, String> pf =
-                new DefaultKafkaProducerFactory<Integer, String>(producerProps);
-        KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf);
-        template.setDefaultTopic(TEMPLATE_TOPIC);
-        template.sendDefault("foo");
-        assertThat(records.poll(10, TimeUnit.SECONDS), hasValue("foo"));
-        template.sendDefault(0, 2, "bar");
-        ConsumerRecord<Integer, String> received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("bar"));
-        template.send(TEMPLATE_TOPIC, 0, 2, "baz");
-        received = records.poll(10, TimeUnit.SECONDS);
-        assertThat(received, hasKey(2));
-        assertThat(received, hasPartition(0));
-        assertThat(received, hasValue("baz"));
-    }
-
-}
\ No newline at end of file
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
deleted file mode 100644
index f1370db8..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/RedisTestConfigurationTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.microsphere.spring.test.redis;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link RedisTestConfiguration} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@EnableRedisTest
-@ContextConfiguration(classes = RedisTestConfigurationTest.class)
-public class RedisTestConfigurationTest {
-
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-    @Test
-    public void test() {
-        assertTrue(redisTemplate.opsForValue().setIfAbsent("Hello", "World"));
-        assertEquals("World", redisTemplate.opsForValue().get("Hello"));
-        assertTrue(stringRedisTemplate.opsForValue().setIfPresent("Hello", "World"));
-        assertEquals("World", stringRedisTemplate.opsForValue().get("Hello"));
-    }
-
-}
diff --git a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java b/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
deleted file mode 100644
index 9f79ff62..00000000
--- a/microsphere-spring-test/src/test/java/io/microsphere/spring/test/redis/embedded/EnableEmbeddedRedisServerTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.microsphere.spring.test.redis.embedded;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import redis.embedded.RedisServer;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@link EnableEmbeddedRedisServer} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy<a/>
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = EnableEmbeddedRedisServerTest.class)
-@EnableEmbeddedRedisServer(port = 6380)
-public class EnableEmbeddedRedisServerTest {
-
-    @Autowired
-    private RedisServer redisServer;
-
-    @Test
-    public void test() {
-        assertTrue(redisServer.isActive());
-    }
-}
diff --git a/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql b/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql
deleted file mode 100644
index a8809f5f..00000000
--- a/microsphere-spring-test/src/test/resources/META-INF/mysql/manual_schema.sql
+++ /dev/null
@@ -1,71 +0,0 @@
-DROP SCHEMA IF EXISTS demo_ds;
-DROP SCHEMA IF EXISTS demo_ds_0;
-DROP SCHEMA IF EXISTS demo_ds_1;
-
-DROP SCHEMA IF EXISTS demo_write_ds;
-DROP SCHEMA IF EXISTS demo_read_ds_0;
-DROP SCHEMA IF EXISTS demo_read_ds_1;
-
-DROP SCHEMA IF EXISTS demo_write_ds_0;
-DROP SCHEMA IF EXISTS demo_write_ds_0_read_0;
-DROP SCHEMA IF EXISTS demo_write_ds_0_read_1;
-DROP SCHEMA IF EXISTS demo_write_ds_1;
-DROP SCHEMA IF EXISTS demo_write_ds_1_read_0;
-DROP SCHEMA IF EXISTS demo_write_ds_1_read_1;
-
-DROP SCHEMA IF EXISTS shadow_demo_ds;
-DROP SCHEMA IF EXISTS shadow_demo_ds_0;
-DROP SCHEMA IF EXISTS shadow_demo_ds_1;
-
-DROP SCHEMA IF EXISTS demo_shadow_write_ds;
-DROP SCHEMA IF EXISTS demo_shadow_read_ds;
-DROP SCHEMA IF EXISTS demo_read_ds;
-
-CREATE SCHEMA IF NOT EXISTS demo_ds;
-CREATE SCHEMA IF NOT EXISTS demo_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_write_ds;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_1;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_0;
-CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_1;
-
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds;
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds_0;
-CREATE SCHEMA IF NOT EXISTS shadow_demo_ds_1;
-
-CREATE SCHEMA IF NOT EXISTS demo_shadow_write_ds;
-CREATE SCHEMA IF NOT EXISTS demo_shadow_read_ds;
-CREATE SCHEMA IF NOT EXISTS demo_read_ds;
-
--- Should sync from master-salve automatically
--- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
-
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
-
--- CREATE TABLE IF NOT EXISTS demo_shadow_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
diff --git a/pom.xml b/pom.xml
index 13042ce9..fee251cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,6 @@
         <module>microsphere-spring-webmvc</module>
         <module>microsphere-spring-webflux</module>
         <module>microsphere-spring-guice</module>
-        <module>microsphere-spring-test</module>
     </modules>
 
     <distributionManagement>

From 983e7144a4a12cdc781d11016a043842ae241369 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 30 Dec 2024 17:43:30 +0800
Subject: [PATCH 153/157] Polish #33

---
 microsphere-spring-context/pom.xml      | 8 --------
 microsphere-spring-dependencies/pom.xml | 8 +-------
 microsphere-spring-jdbc/pom.xml         | 7 -------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index 3f77ea26..f1bc10f0 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -123,14 +123,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-spring-test</artifactId>
-            <version>${revision}</version>
-            <scope>test</scope>
-        </dependency>
-
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/microsphere-spring-dependencies/pom.xml b/microsphere-spring-dependencies/pom.xml
index 5e0d485d..639e3133 100644
--- a/microsphere-spring-dependencies/pom.xml
+++ b/microsphere-spring-dependencies/pom.xml
@@ -56,13 +56,7 @@
                 <artifactId>microsphere-spring-webflux</artifactId>
                 <version>${revision}</version>
             </dependency>
-
-            <dependency>
-                <groupId>io.github.microsphere-projects</groupId>
-                <artifactId>microsphere-spring-test</artifactId>
-                <version>${revision}</version>
-                <scope>test</scope>
-            </dependency>
+            
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/microsphere-spring-jdbc/pom.xml b/microsphere-spring-jdbc/pom.xml
index 07c08c55..2d8c8585 100644
--- a/microsphere-spring-jdbc/pom.xml
+++ b/microsphere-spring-jdbc/pom.xml
@@ -67,12 +67,5 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.microsphere-projects</groupId>
-            <artifactId>microsphere-spring-test</artifactId>
-            <version>${revision}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>
\ No newline at end of file

From 210833551ac1cd81a6672bae96c24cd6f5de8855 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Mon, 30 Dec 2024 17:52:51 +0800
Subject: [PATCH 154/157] Update pom.xml

---
 microsphere-spring-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-dependencies/pom.xml b/microsphere-spring-dependencies/pom.xml
index 639e3133..e0d50fd2 100644
--- a/microsphere-spring-dependencies/pom.xml
+++ b/microsphere-spring-dependencies/pom.xml
@@ -56,7 +56,7 @@
                 <artifactId>microsphere-spring-webflux</artifactId>
                 <version>${revision}</version>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file

From 27b5a1fc71dcc410d049d5bb9fdf16561a70ce5e Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 2 Jan 2025 18:51:30 +0800
Subject: [PATCH 155/157] Merge dev-1.x code

---
 microsphere-spring-compatible/pom.xml         |    7 -
 .../springframework/core/env/Profiles.java    |   74 -
 .../core/env/ProfilesParser.java              |  194 ---
 .../org/springframework/lang/NonNull.java     |   53 -
 .../org/springframework/lang/Nullable.java    |   54 -
 .../java/org/springframework/util/Assert.java |  736 ---------
 .../org/springframework/util/ClassUtils.java  | 1449 -----------------
 .../springframework/util/CollectionUtils.java |  516 ------
 .../util/ConcurrentReferenceHashMap.java      | 1092 -------------
 .../springframework/util/MultiValueMap.java   |   96 --
 .../util/MultiValueMapAdapter.java            |  187 ---
 .../org/springframework/util/ObjectUtils.java | 1040 ------------
 .../springframework/util/ReflectionUtils.java |  881 ----------
 .../org/springframework/util/StreamUtils.java |  295 ----
 .../org/springframework/util/StringUtils.java | 1433 ----------------
 microsphere-spring-context/pom.xml            |   36 +-
 .../spring/beans/factory/Dependency.java      |    4 +-
 .../AnnotatedInjectionBeanPostProcessor.java  |    7 +-
 ...onBeanDefinitionRegistryPostProcessor.java |    7 +-
 .../AnnotationInjectedBeanPostProcessor.java  |    4 +-
 .../ConfigurationBeanBindingRegistrar.java    |    7 +-
 .../ConfigurationBeanBindingsRegister.java    |    6 +-
 .../factory/config/BeanDefinitionUtils.java   |    1 -
 .../ListenableAutowireCandidateResolver.java  |    2 -
 ...ctingConfigurationPropertyInitializer.java |    4 +-
 ...llectingConfigurationPropertyListener.java |    6 -
 .../spring/config/ConfigurationProperty.java  |    2 +-
 .../PropertySourceExtensionLoader.java        |    4 +-
 .../BeanCapableImportCandidate.java           |   12 +-
 .../spring/core/env/EnvironmentUtils.java     |    4 +-
 .../ListenableConfigurableEnvironment.java    |   27 +
 .../spring/core/io/ResourceLoaderUtils.java   |    1 -
 .../net/SpringProtocolURLStreamHandler.java   |   10 +-
 ...SpringSubProtocolURLConnectionFactory.java |    5 +-
 .../spring/beans/BeanUtilsTest.java           |   20 +-
 .../spring/beans/PropertyValuesUtilsTest.java |   17 +-
 .../beans/factory/BeanFactoryUtilsTest.java   |   26 +-
 .../spring/beans/factory/DependencyTest.java  |    4 +-
 .../factory/DependencyTreeWalkerTest.java     |    6 +-
 ...actEnableConfigurationBeanBindingTest.java |    8 +-
 ...notatedInjectionBeanPostProcessorTest.java |   42 +-
 ...anDefinitionRegistryPostProcessorTest.java |   12 +-
 ...notationInjectedBeanPostProcessorTest.java |   40 +-
 .../EnableConfigurationBeanBindingTest.java   |    4 +-
 ...eConfigurationBeanBindingTestForAlias.java |    8 +-
 ...tionBeanBindingTestForMultipleBinding.java |   12 +-
 .../EnableConfigurationBeanBindingsTest.java  |    4 +-
 .../config/BeanDefinitionUtilsTest.java       |   14 +-
 .../GenericBeanPostProcessorAdapterTest.java  |   11 +-
 .../factory/support/BeanRegistrarTest.java    |   20 +-
 .../ConfigurationBeanAliasGeneratorTest.java  |    4 +-
 ...stenableAutowireCandidateResolverTest.java |   12 +-
 .../annotation/EnableTTLCachingTest.java      |   10 +-
 .../cache/annotation/TTLCacheableTest.java    |   12 +-
 .../ConfigurationPropertyRepositoryTest.java  |   16 +-
 .../config/ConfigurationPropertyTest.java     |   10 +-
 .../DefaultPropertiesPropertySourceTest.java  |   16 +-
 .../DefaultPropertiesPropertySourcesTest.java |   16 +-
 .../ResourcePropertySourceTest.java           |   10 +-
 .../ResourcePropertySourcesTest.java          |   10 +-
 .../annotation/JsonPropertySourceTest.java    |   10 +-
 .../annotation/YamlPropertySourceTest.java    |   10 +-
 .../constants/PropertyConstantsTest.java      |    4 +-
 .../context/ApplicationContextUtilsTest.java  |   14 +-
 ...otatedBeanDefinitionRegistryUtilsTest.java |   12 +-
 .../BeanCapableImportCandidateTest.java       |   10 +-
 .../annotation/EnableEventExtensionTest.java  |   14 +-
 .../context/event/BeanTimeStatisticsTest.java |    8 +-
 ...DeferredApplicationEventPublisherTest.java |   10 +-
 .../EventPublishingBeanInitializerTest.java   |    8 +-
 ...eptingApplicationEventMulticasterTest.java |   10 +-
 ...eansPropertyChangeListenerAdapterTest.java |   12 +-
 .../event/LoggingBeanFactoryListenerTest.java |    8 +-
 ...ceApplicationContextEventListenerTest.java |    4 +-
 .../spring/core/SpringVersionTest.java        |    6 +-
 .../core/annotation/AnnotationUtilsTest.java  |   26 +-
 .../GenericAnnotationAttributesTest.java      |   12 +-
 ...lePlaceholderAnnotationAttributesTest.java |   10 +-
 .../convert/SpringConverterAdapterTest.java   |    8 +-
 .../EnableSpringConverterAdapterTest.java     |   10 +-
 .../ConversionServiceResolverTest.java        |    8 +-
 .../spring/core/env/EnvironmentUtilsTest.java |   12 +-
 ...ListenableConfigurableEnvironmentTest.java |   20 +-
 .../core/env/PropertySourcesUtilsTest.java    |   14 +-
 .../core/io/ResourceLoaderUtilsTest.java      |    6 +-
 .../spring/core/io/ResourceUtilsTest.java     |    8 +-
 .../SpringFactoriesLoaderUtilsTest.java       |   18 +-
 .../SpringProtocolURLStreamHandlerTest.java   |   10 +-
 .../spring/util/BeanInitializerTest.java      |   12 +-
 .../spring/util/MimeTypeUtilsTest.java        |   10 +-
 .../spring/util/SpringVersionUtilsTest.java   |   21 +-
 microsphere-spring-guice/pom.xml              |    4 +-
 .../guice/annotation/EnableGuiceTest.java     |   12 +-
 microsphere-spring-jdbc/pom.xml               |    4 +-
 .../annotation/EnableP6DataSourceTest.java    |   12 +-
 .../P6DataSourceBeanPostProcessorTest.java    |   10 +-
 microsphere-spring-parent/pom.xml             |   65 +-
 microsphere-spring-web/pom.xml                |   10 +-
 .../web/metadata/WebEndpointMapping.java      |    2 +-
 .../SmartWebEndpointMappingFactoryTest.java   |   16 +-
 .../web/metadata/WebEndpointMappingTest.java  |   14 +-
 .../web/rule/WebRequestMethodsRuleTest.java   |    6 +-
 .../web/rule/WebRequestPattensRuleTest.java   |    4 +-
 ...strationWebEndpointMappingFactoryTest.java |   10 +-
 ...strationWebEndpointMappingFactoryTest.java |   10 +-
 microsphere-spring-webmvc/pom.xml             |    8 +-
 .../webmvc/metadata/HandlerMetadata.java      |    4 +-
 .../spring/webmvc/util/WebMvcUtils.java       |    6 +-
 ...pingInfoWebEndpointMappingFactoryTest.java |   18 +-
 pom.xml                                       |    1 +
 110 files changed, 533 insertions(+), 8648 deletions(-)
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
 delete mode 100644 microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java

diff --git a/microsphere-spring-compatible/pom.xml b/microsphere-spring-compatible/pom.xml
index 1f614bc4..d8c6ac1b 100644
--- a/microsphere-spring-compatible/pom.xml
+++ b/microsphere-spring-compatible/pom.xml
@@ -27,13 +27,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Servlet API -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java b/microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java
deleted file mode 100644
index 97b47eba..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/core/env/Profiles.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.core.env;
-
-import java.util.function.Predicate;
-
-/**
- * Profile predicate that may be {@linkplain Environment#acceptsProfiles(Profiles)
- * accepted} by an {@link Environment}.
- *
- * <p>May be implemented directly or, more usually, created using the
- * {@link #of(String...) of(...)} factory method.
- *
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 5.1
- */
-@FunctionalInterface
-public interface Profiles {
-
-    /**
-     * Test if this {@code Profiles} instance <em>matches</em> against the given
-     * active profiles predicate.
-     * @param activeProfiles a predicate that tests whether a given profile is
-     * currently active
-     */
-    boolean matches(Predicate<String> activeProfiles);
-
-
-    /**
-     * Create a new {@link Profiles} instance that checks for matches against
-     * the given <em>profile expressions</em>.
-     * <p>The returned instance will {@linkplain Profiles#matches(Predicate) match}
-     * if any one of the given profile expressions matches.
-     * <p>A profile expression may contain a simple profile name (for example
-     * {@code "production"}) or a compound expression. A compound expression allows
-     * for more complicated profile logic to be expressed, for example
-     * {@code "production & cloud"}.
-     * <p>The following operators are supported in profile expressions.
-     * <ul>
-     * <li>{@code !} - A logical <em>NOT</em> of the profile name or compound expression</li>
-     * <li>{@code &} - A logical <em>AND</em> of the profile names or compound expressions</li>
-     * <li>{@code |} - A logical <em>OR</em> of the profile names or compound expressions</li>
-     * </ul>
-     * <p>Please note that the {@code &} and {@code |} operators may not be mixed
-     * without using parentheses. For example, {@code "a & b | c"} is not a valid
-     * expression: it must be expressed as {@code "(a & b) | c"} or
-     * {@code "a & (b | c)"}.
-     * <p>As of Spring Framework 5.1.17, two {@code Profiles} instances returned
-     * by this method are considered equivalent to each other (in terms of
-     * {@code equals()} and {@code hashCode()} semantics) if they are created
-     * with identical <em>profile expressions</em>.
-     * @param profileExpressions the <em>profile expressions</em> to include
-     * @return a new {@link Profiles} instance
-     */
-    static Profiles of(String... profileExpressions) {
-        return ProfilesParser.parse(profileExpressions);
-    }
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java b/microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
deleted file mode 100644
index 2512db10..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.core.env;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.function.Predicate;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Internal parser used by {@link Profiles#of}.
- *
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 5.1
- */
-final class ProfilesParser {
-
-    private ProfilesParser() {
-    }
-
-
-    static Profiles parse(String... expressions) {
-        Assert.notEmpty(expressions, "Must specify at least one profile expression");
-        Profiles[] parsed = new Profiles[expressions.length];
-        for (int i = 0; i < expressions.length; i++) {
-            parsed[i] = parseExpression(expressions[i]);
-        }
-        return new ParsedProfiles(expressions, parsed);
-    }
-
-    private static Profiles parseExpression(String expression) {
-        Assert.hasText(expression, () -> "Invalid profile expression [" + expression + "]: must contain text");
-        StringTokenizer tokens = new StringTokenizer(expression, "()&|!", true);
-        return parseTokens(expression, tokens);
-    }
-
-    private static Profiles parseTokens(String expression, StringTokenizer tokens) {
-        return parseTokens(expression, tokens, Context.NONE);
-    }
-
-    private static Profiles parseTokens(String expression, StringTokenizer tokens, Context context) {
-        List<Profiles> elements = new ArrayList<>();
-        Operator operator = null;
-        while (tokens.hasMoreTokens()) {
-            String token = tokens.nextToken().trim();
-            if (token.isEmpty()) {
-                continue;
-            }
-            switch (token) {
-                case "(":
-                    Profiles contents = parseTokens(expression, tokens, Context.PARENTHESIS);
-                    if (context == Context.NEGATE) {
-                        return contents;
-                    }
-                    elements.add(contents);
-                    break;
-                case "&":
-                    assertWellFormed(expression, operator == null || operator == Operator.AND);
-                    operator = Operator.AND;
-                    break;
-                case "|":
-                    assertWellFormed(expression, operator == null || operator == Operator.OR);
-                    operator = Operator.OR;
-                    break;
-                case "!":
-                    elements.add(not(parseTokens(expression, tokens, Context.NEGATE)));
-                    break;
-                case ")":
-                    Profiles merged = merge(expression, elements, operator);
-                    if (context == Context.PARENTHESIS) {
-                        return merged;
-                    }
-                    elements.clear();
-                    elements.add(merged);
-                    operator = null;
-                    break;
-                default:
-                    Profiles value = equals(token);
-                    if (context == Context.NEGATE) {
-                        return value;
-                    }
-                    elements.add(value);
-            }
-        }
-        return merge(expression, elements, operator);
-    }
-
-    private static Profiles merge(String expression, List<Profiles> elements, @Nullable Operator operator) {
-        assertWellFormed(expression, !elements.isEmpty());
-        if (elements.size() == 1) {
-            return elements.get(0);
-        }
-        Profiles[] profiles = elements.toArray(new Profiles[0]);
-        return (operator == Operator.AND ? and(profiles) : or(profiles));
-    }
-
-    private static void assertWellFormed(String expression, boolean wellFormed) {
-        Assert.isTrue(wellFormed, () -> "Malformed profile expression [" + expression + "]");
-    }
-
-    private static Profiles or(Profiles... profiles) {
-        return activeProfile -> Arrays.stream(profiles).anyMatch(isMatch(activeProfile));
-    }
-
-    private static Profiles and(Profiles... profiles) {
-        return activeProfile -> Arrays.stream(profiles).allMatch(isMatch(activeProfile));
-    }
-
-    private static Profiles not(Profiles profiles) {
-        return activeProfile -> !profiles.matches(activeProfile);
-    }
-
-    private static Profiles equals(String profile) {
-        return activeProfile -> activeProfile.test(profile);
-    }
-
-    private static Predicate<Profiles> isMatch(Predicate<String> activeProfiles) {
-        return profiles -> profiles.matches(activeProfiles);
-    }
-
-
-    private enum Operator { AND, OR }
-
-    private enum Context { NONE, NEGATE, PARENTHESIS }
-
-
-    private static class ParsedProfiles implements Profiles {
-
-        private final Set<String> expressions = new LinkedHashSet<>();
-
-        private final Profiles[] parsed;
-
-        ParsedProfiles(String[] expressions, Profiles[] parsed) {
-            Collections.addAll(this.expressions, expressions);
-            this.parsed = parsed;
-        }
-
-        @Override
-        public boolean matches(Predicate<String> activeProfiles) {
-            for (Profiles candidate : this.parsed) {
-                if (candidate.matches(activeProfiles)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null || getClass() != obj.getClass()) {
-                return false;
-            }
-            ParsedProfiles that = (ParsedProfiles) obj;
-            return this.expressions.equals(that.expressions);
-        }
-
-        @Override
-        public int hashCode() {
-            return this.expressions.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return StringUtils.collectionToDelimitedString(this.expressions, " or ");
-        }
-    }
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java b/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
deleted file mode 100644
index fa022278..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/lang/NonNull.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2002-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.lang;
-
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierNickname;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A common Spring annotation to declare that annotated elements cannot be {@code null}.
- *
- * <p>Leverages JSR-305 meta-annotations to indicate nullability in Java to common
- * tools with JSR-305 support and used by Kotlin to infer nullability of Spring API.
- *
- * <p>Should be used at parameter, return value, and field level. Method overrides should
- * repeat parent {@code @NonNull} annotations unless they behave differently.
- *
- * <p>Use {@code @NonNullApi} (scope = parameters + return values) and/or {@code @NonNullFields}
- * (scope = fields) to set the default behavior to non-nullable in order to avoid annotating
- * your whole codebase with {@code @NonNull}.
- *
- * @author Sebastien Deleuze
- * @author Juergen Hoeller
- * @since 5.0
- * @see NonNullApi
- * @see NonNullFields
- * @see Nullable
- */
-@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Nonnull
-@TypeQualifierNickname
-public @interface NonNull {
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java b/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
deleted file mode 100644
index b2d9aa6c..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/lang/Nullable.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.lang;
-
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierNickname;
-import javax.annotation.meta.When;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A common Spring annotation to declare that annotated elements can be {@code null} under
- * some circumstance.
- *
- * <p>Leverages JSR-305 meta-annotations to indicate nullability in Java to common
- * tools with JSR-305 support and used by Kotlin to infer nullability of Spring API.
- *
- * <p>Should be used at parameter, return value, and field level. Methods override should
- * repeat parent {@code @Nullable} annotations unless they behave differently.
- *
- * <p>Can be used in association with {@code @NonNullApi} or {@code @NonNullFields} to
- * override the default non-nullable semantic to nullable.
- *
- * @author Sebastien Deleuze
- * @author Juergen Hoeller
- * @since 5.0
- * @see NonNullApi
- * @see NonNullFields
- * @see NonNull
- */
-@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Nonnull(when = When.MAYBE)
-@TypeQualifierNickname
-public @interface Nullable {
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
deleted file mode 100644
index 54bc2e85..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/Assert.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
- * Copyright 2002-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Supplier;
-
-/**
- * Assertion utility class that assists in validating arguments.
- *
- * <p>Useful for identifying programmer errors early and clearly at runtime.
- *
- * <p>For example, if the contract of a public method states it does not
- * allow {@code null} arguments, {@code Assert} can be used to validate that
- * contract. Doing this clearly indicates a contract violation when it
- * occurs and protects the class's invariants.
- *
- * <p>Typically used to validate method arguments rather than configuration
- * properties, to check for cases that are usually programmer errors rather
- * than configuration errors. In contrast to configuration initialization
- * code, there is usually no point in falling back to defaults in such methods.
- *
- * <p>This class is similar to JUnit's assertion library. If an argument value is
- * deemed invalid, an {@link IllegalArgumentException} is thrown (typically).
- * For example:
- *
- * <pre class="code">
- * Assert.notNull(clazz, "The class must not be null");
- * Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
- *
- * <p>Mainly for internal use within the framework; for a more comprehensive suite
- * of assertion utilities consider {@code org.apache.commons.lang3.Validate} from
- * <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>,
- * Google Guava's
- * <a href="https://github.com/google/guava/wiki/PreconditionsExplained">Preconditions</a>,
- * or similar third-party libraries.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Colin Sampaleanu
- * @author Rob Harrop
- * @since 1.1.2
- */
-public abstract class Assert {
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalStateException}
-	 * if the expression evaluates to {@code false}.
-	 * <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException}
-	 * on an assertion failure.
-	 * <pre class="code">Assert.state(id == null, "The id property must not already be initialized");</pre>
-	 * @param expression a boolean expression
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalStateException if {@code expression} is {@code false}
-	 */
-	public static void state(boolean expression, String message) {
-		if (!expression) {
-			throw new IllegalStateException(message);
-		}
-	}
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalStateException}
-	 * if the expression evaluates to {@code false}.
-	 * <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException}
-	 * on an assertion failure.
-	 * <pre class="code">
-	 * Assert.state(entity.getId() == null,
-	 *     () -&gt; "ID for entity " + entity.getName() + " must not already be initialized");
-	 * </pre>
-	 * @param expression a boolean expression
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalStateException if {@code expression} is {@code false}
-	 * @since 5.0
-	 */
-	public static void state(boolean expression, Supplier<String> messageSupplier) {
-		if (!expression) {
-			throw new IllegalStateException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalStateException}
-	 * if the expression evaluates to {@code false}.
-	 * @deprecated as of 4.3.7, in favor of {@link #state(boolean, String)}
-	 */
-	@Deprecated
-	public static void state(boolean expression) {
-		state(expression, "[Assertion failed] - this state invariant must be true");
-	}
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
-	 * if the expression evaluates to {@code false}.
-	 * <pre class="code">Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
-	 * @param expression a boolean expression
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if {@code expression} is {@code false}
-	 */
-	public static void isTrue(boolean expression, String message) {
-		if (!expression) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
-	 * if the expression evaluates to {@code false}.
-	 * <pre class="code">
-	 * Assert.isTrue(i &gt; 0, () -&gt; "The value '" + i + "' must be greater than zero");
-	 * </pre>
-	 * @param expression a boolean expression
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if {@code expression} is {@code false}
-	 * @since 5.0
-	 */
-	public static void isTrue(boolean expression, Supplier<String> messageSupplier) {
-		if (!expression) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert a boolean expression, throwing an {@code IllegalArgumentException}
-	 * if the expression evaluates to {@code false}.
-	 * @deprecated as of 4.3.7, in favor of {@link #isTrue(boolean, String)}
-	 */
-	@Deprecated
-	public static void isTrue(boolean expression) {
-		isTrue(expression, "[Assertion failed] - this expression must be true");
-	}
-
-	/**
-	 * Assert that an object is {@code null}.
-	 * <pre class="code">Assert.isNull(value, "The value must be null");</pre>
-	 * @param object the object to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object is not {@code null}
-	 */
-	public static void isNull(@Nullable Object object, String message) {
-		if (object != null) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that an object is {@code null}.
-	 * <pre class="code">
-	 * Assert.isNull(value, () -&gt; "The value '" + value + "' must be null");
-	 * </pre>
-	 * @param object the object to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the object is not {@code null}
-	 * @since 5.0
-	 */
-	public static void isNull(@Nullable Object object, Supplier<String> messageSupplier) {
-		if (object != null) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that an object is {@code null}.
-	 * @deprecated as of 4.3.7, in favor of {@link #isNull(Object, String)}
-	 */
-	@Deprecated
-	public static void isNull(@Nullable Object object) {
-		isNull(object, "[Assertion failed] - the object argument must be null");
-	}
-
-	/**
-	 * Assert that an object is not {@code null}.
-	 * <pre class="code">Assert.notNull(clazz, "The class must not be null");</pre>
-	 * @param object the object to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object is {@code null}
-	 */
-	public static void notNull(@Nullable Object object, String message) {
-		if (object == null) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that an object is not {@code null}.
-	 * <pre class="code">
-	 * Assert.notNull(entity.getId(),
-	 *     () -&gt; "ID for entity " + entity.getName() + " must not be null");
-	 * </pre>
-	 * @param object the object to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the object is {@code null}
-	 * @since 5.0
-	 */
-	public static void notNull(@Nullable Object object, Supplier<String> messageSupplier) {
-		if (object == null) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that an object is not {@code null}.
-	 * @deprecated as of 4.3.7, in favor of {@link #notNull(Object, String)}
-	 */
-	@Deprecated
-	public static void notNull(@Nullable Object object) {
-		notNull(object, "[Assertion failed] - this argument is required; it must not be null");
-	}
-
-	/**
-	 * Assert that the given String is not empty; that is,
-	 * it must not be {@code null} and not the empty String.
-	 * <pre class="code">Assert.hasLength(name, "Name must not be empty");</pre>
-	 * @param text the String to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the text is empty
-	 * @see StringUtils#hasLength
-	 */
-	public static void hasLength(@Nullable String text, String message) {
-		if (!StringUtils.hasLength(text)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that the given String is not empty; that is,
-	 * it must not be {@code null} and not the empty String.
-	 * <pre class="code">
-	 * Assert.hasLength(account.getName(),
-	 *     () -&gt; "Name for account '" + account.getId() + "' must not be empty");
-	 * </pre>
-	 * @param text the String to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the text is empty
-	 * @since 5.0
-	 * @see StringUtils#hasLength
-	 */
-	public static void hasLength(@Nullable String text, Supplier<String> messageSupplier) {
-		if (!StringUtils.hasLength(text)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that the given String is not empty; that is,
-	 * it must not be {@code null} and not the empty String.
-	 * @deprecated as of 4.3.7, in favor of {@link #hasLength(String, String)}
-	 */
-	@Deprecated
-	public static void hasLength(@Nullable String text) {
-		hasLength(text,
-				"[Assertion failed] - this String argument must have length; it must not be null or empty");
-	}
-
-	/**
-	 * Assert that the given String contains valid text content; that is, it must not
-	 * be {@code null} and must contain at least one non-whitespace character.
-	 * <pre class="code">Assert.hasText(name, "'name' must not be empty");</pre>
-	 * @param text the String to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the text does not contain valid text content
-	 * @see StringUtils#hasText
-	 */
-	public static void hasText(@Nullable String text, String message) {
-		if (!StringUtils.hasText(text)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that the given String contains valid text content; that is, it must not
-	 * be {@code null} and must contain at least one non-whitespace character.
-	 * <pre class="code">
-	 * Assert.hasText(account.getName(),
-	 *     () -&gt; "Name for account '" + account.getId() + "' must not be empty");
-	 * </pre>
-	 * @param text the String to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the text does not contain valid text content
-	 * @since 5.0
-	 * @see StringUtils#hasText
-	 */
-	public static void hasText(@Nullable String text, Supplier<String> messageSupplier) {
-		if (!StringUtils.hasText(text)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that the given String contains valid text content; that is, it must not
-	 * be {@code null} and must contain at least one non-whitespace character.
-	 * @deprecated as of 4.3.7, in favor of {@link #hasText(String, String)}
-	 */
-	@Deprecated
-	public static void hasText(@Nullable String text) {
-		hasText(text,
-				"[Assertion failed] - this String argument must have text; it must not be null, empty, or blank");
-	}
-
-	/**
-	 * Assert that the given text does not contain the given substring.
-	 * <pre class="code">Assert.doesNotContain(name, "rod", "Name must not contain 'rod'");</pre>
-	 * @param textToSearch the text to search
-	 * @param substring the substring to find within the text
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the text contains the substring
-	 */
-	public static void doesNotContain(@Nullable String textToSearch, String substring, String message) {
-		if (StringUtils.hasLength(textToSearch) && StringUtils.hasLength(substring) &&
-				textToSearch.contains(substring)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that the given text does not contain the given substring.
-	 * <pre class="code">
-	 * Assert.doesNotContain(name, forbidden, () -&gt; "Name must not contain '" + forbidden + "'");
-	 * </pre>
-	 * @param textToSearch the text to search
-	 * @param substring the substring to find within the text
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the text contains the substring
-	 * @since 5.0
-	 */
-	public static void doesNotContain(@Nullable String textToSearch, String substring, Supplier<String> messageSupplier) {
-		if (StringUtils.hasLength(textToSearch) && StringUtils.hasLength(substring) &&
-				textToSearch.contains(substring)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that the given text does not contain the given substring.
-	 * @deprecated as of 4.3.7, in favor of {@link #doesNotContain(String, String, String)}
-	 */
-	@Deprecated
-	public static void doesNotContain(@Nullable String textToSearch, String substring) {
-		doesNotContain(textToSearch, substring,
-				() -> "[Assertion failed] - this String argument must not contain the substring [" + substring + "]");
-	}
-
-	/**
-	 * Assert that an array contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * <pre class="code">Assert.notEmpty(array, "The array must contain elements");</pre>
-	 * @param array the array to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object array is {@code null} or contains no elements
-	 */
-	public static void notEmpty(@Nullable Object[] array, String message) {
-		if (ObjectUtils.isEmpty(array)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that an array contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * <pre class="code">
-	 * Assert.notEmpty(array, () -&gt; "The " + arrayType + " array must contain elements");
-	 * </pre>
-	 * @param array the array to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the object array is {@code null} or contains no elements
-	 * @since 5.0
-	 */
-	public static void notEmpty(@Nullable Object[] array, Supplier<String> messageSupplier) {
-		if (ObjectUtils.isEmpty(array)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that an array contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Object[], String)}
-	 */
-	@Deprecated
-	public static void notEmpty(@Nullable Object[] array) {
-		notEmpty(array, "[Assertion failed] - this array must not be empty: it must contain at least 1 element");
-	}
-
-	/**
-	 * Assert that an array contains no {@code null} elements.
-	 * <p>Note: Does not complain if the array is empty!
-	 * <pre class="code">Assert.noNullElements(array, "The array must contain non-null elements");</pre>
-	 * @param array the array to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object array contains a {@code null} element
-	 */
-	public static void noNullElements(@Nullable Object[] array, String message) {
-		if (array != null) {
-			for (Object element : array) {
-				if (element == null) {
-					throw new IllegalArgumentException(message);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Assert that an array contains no {@code null} elements.
-	 * <p>Note: Does not complain if the array is empty!
-	 * <pre class="code">
-	 * Assert.noNullElements(array, () -&gt; "The " + arrayType + " array must contain non-null elements");
-	 * </pre>
-	 * @param array the array to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the object array contains a {@code null} element
-	 * @since 5.0
-	 */
-	public static void noNullElements(@Nullable Object[] array, Supplier<String> messageSupplier) {
-		if (array != null) {
-			for (Object element : array) {
-				if (element == null) {
-					throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Assert that an array contains no {@code null} elements.
-	 * @deprecated as of 4.3.7, in favor of {@link #noNullElements(Object[], String)}
-	 */
-	@Deprecated
-	public static void noNullElements(@Nullable Object[] array) {
-		noNullElements(array, "[Assertion failed] - this array must not contain any null elements");
-	}
-
-	/**
-	 * Assert that a collection contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * <pre class="code">Assert.notEmpty(collection, "Collection must contain elements");</pre>
-	 * @param collection the collection to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the collection is {@code null} or
-	 * contains no elements
-	 */
-	public static void notEmpty(@Nullable Collection<?> collection, String message) {
-		if (CollectionUtils.isEmpty(collection)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that a collection contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * <pre class="code">
-	 * Assert.notEmpty(collection, () -&gt; "The " + collectionType + " collection must contain elements");
-	 * </pre>
-	 * @param collection the collection to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the collection is {@code null} or
-	 * contains no elements
-	 * @since 5.0
-	 */
-	public static void notEmpty(@Nullable Collection<?> collection, Supplier<String> messageSupplier) {
-		if (CollectionUtils.isEmpty(collection)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that a collection contains elements; that is, it must not be
-	 * {@code null} and must contain at least one element.
-	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Collection, String)}
-	 */
-	@Deprecated
-	public static void notEmpty(@Nullable Collection<?> collection) {
-		notEmpty(collection,
-				"[Assertion failed] - this collection must not be empty: it must contain at least 1 element");
-	}
-
-	/**
-	 * Assert that a collection contains no {@code null} elements.
-	 * <p>Note: Does not complain if the collection is empty!
-	 * <pre class="code">Assert.noNullElements(collection, "Collection must contain non-null elements");</pre>
-	 * @param collection the collection to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the collection contains a {@code null} element
-	 * @since 5.2
-	 */
-	public static void noNullElements(@Nullable Collection<?> collection, String message) {
-		if (collection != null) {
-			for (Object element : collection) {
-				if (element == null) {
-					throw new IllegalArgumentException(message);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Assert that a collection contains no {@code null} elements.
-	 * <p>Note: Does not complain if the collection is empty!
-	 * <pre class="code">
-	 * Assert.noNullElements(collection, () -&gt; "Collection " + collectionName + " must contain non-null elements");
-	 * </pre>
-	 * @param collection the collection to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the collection contains a {@code null} element
-	 * @since 5.2
-	 */
-	public static void noNullElements(@Nullable Collection<?> collection, Supplier<String> messageSupplier) {
-		if (collection != null) {
-			for (Object element : collection) {
-				if (element == null) {
-					throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Assert that a Map contains entries; that is, it must not be {@code null}
-	 * and must contain at least one entry.
-	 * <pre class="code">Assert.notEmpty(map, "Map must contain entries");</pre>
-	 * @param map the map to check
-	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the map is {@code null} or contains no entries
-	 */
-	public static void notEmpty(@Nullable Map<?, ?> map, String message) {
-		if (CollectionUtils.isEmpty(map)) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-
-	/**
-	 * Assert that a Map contains entries; that is, it must not be {@code null}
-	 * and must contain at least one entry.
-	 * <pre class="code">
-	 * Assert.notEmpty(map, () -&gt; "The " + mapType + " map must contain entries");
-	 * </pre>
-	 * @param map the map to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails
-	 * @throws IllegalArgumentException if the map is {@code null} or contains no entries
-	 * @since 5.0
-	 */
-	public static void notEmpty(@Nullable Map<?, ?> map, Supplier<String> messageSupplier) {
-		if (CollectionUtils.isEmpty(map)) {
-			throw new IllegalArgumentException(nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that a Map contains entries; that is, it must not be {@code null}
-	 * and must contain at least one entry.
-	 * @deprecated as of 4.3.7, in favor of {@link #notEmpty(Map, String)}
-	 */
-	@Deprecated
-	public static void notEmpty(@Nullable Map<?, ?> map) {
-		notEmpty(map, "[Assertion failed] - this map must not be empty; it must contain at least one entry");
-	}
-
-	/**
-	 * Assert that the provided object is an instance of the provided class.
-	 * <pre class="code">Assert.instanceOf(Foo.class, foo, "Foo expected");</pre>
-	 * @param type the type to check against
-	 * @param obj the object to check
-	 * @param message a message which will be prepended to provide further context.
-	 * If it is empty or ends in ":" or ";" or "," or ".", a full exception message
-	 * will be appended. If it ends in a space, the name of the offending object's
-	 * type will be appended. In any other case, a ":" with a space and the name
-	 * of the offending object's type will be appended.
-	 * @throws IllegalArgumentException if the object is not an instance of type
-	 */
-	public static void isInstanceOf(Class<?> type, @Nullable Object obj, String message) {
-		notNull(type, "Type to check against must not be null");
-		if (!type.isInstance(obj)) {
-			instanceCheckFailed(type, obj, message);
-		}
-	}
-
-	/**
-	 * Assert that the provided object is an instance of the provided class.
-	 * <pre class="code">
-	 * Assert.instanceOf(Foo.class, foo, () -&gt; "Processing " + Foo.class.getSimpleName() + ":");
-	 * </pre>
-	 * @param type the type to check against
-	 * @param obj the object to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails. See {@link #isInstanceOf(Class, Object, String)} for details.
-	 * @throws IllegalArgumentException if the object is not an instance of type
-	 * @since 5.0
-	 */
-	public static void isInstanceOf(Class<?> type, @Nullable Object obj, Supplier<String> messageSupplier) {
-		notNull(type, "Type to check against must not be null");
-		if (!type.isInstance(obj)) {
-			instanceCheckFailed(type, obj, nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that the provided object is an instance of the provided class.
-	 * <pre class="code">Assert.instanceOf(Foo.class, foo);</pre>
-	 * @param type the type to check against
-	 * @param obj the object to check
-	 * @throws IllegalArgumentException if the object is not an instance of type
-	 */
-	public static void isInstanceOf(Class<?> type, @Nullable Object obj) {
-		isInstanceOf(type, obj, "");
-	}
-
-	/**
-	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
-	 * <pre class="code">Assert.isAssignable(Number.class, myClass, "Number expected");</pre>
-	 * @param superType the supertype to check against
-	 * @param subType the subtype to check
-	 * @param message a message which will be prepended to provide further context.
-	 * If it is empty or ends in ":" or ";" or "," or ".", a full exception message
-	 * will be appended. If it ends in a space, the name of the offending subtype
-	 * will be appended. In any other case, a ":" with a space and the name of the
-	 * offending subtype will be appended.
-	 * @throws IllegalArgumentException if the classes are not assignable
-	 */
-	public static void isAssignable(Class<?> superType, @Nullable Class<?> subType, String message) {
-		notNull(superType, "Supertype to check against must not be null");
-		if (subType == null || !superType.isAssignableFrom(subType)) {
-			assignableCheckFailed(superType, subType, message);
-		}
-	}
-
-	/**
-	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
-	 * <pre class="code">
-	 * Assert.isAssignable(Number.class, myClass, () -&gt; "Processing " + myAttributeName + ":");
-	 * </pre>
-	 * @param superType the supertype to check against
-	 * @param subType the subtype to check
-	 * @param messageSupplier a supplier for the exception message to use if the
-	 * assertion fails. See {@link #isAssignable(Class, Class, String)} for details.
-	 * @throws IllegalArgumentException if the classes are not assignable
-	 * @since 5.0
-	 */
-	public static void isAssignable(Class<?> superType, @Nullable Class<?> subType, Supplier<String> messageSupplier) {
-		notNull(superType, "Supertype to check against must not be null");
-		if (subType == null || !superType.isAssignableFrom(subType)) {
-			assignableCheckFailed(superType, subType, nullSafeGet(messageSupplier));
-		}
-	}
-
-	/**
-	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
-	 * <pre class="code">Assert.isAssignable(Number.class, myClass);</pre>
-	 * @param superType the supertype to check
-	 * @param subType the subtype to check
-	 * @throws IllegalArgumentException if the classes are not assignable
-	 */
-	public static void isAssignable(Class<?> superType, Class<?> subType) {
-		isAssignable(superType, subType, "");
-	}
-
-
-	private static void instanceCheckFailed(Class<?> type, @Nullable Object obj, @Nullable String msg) {
-		String className = (obj != null ? obj.getClass().getName() : "null");
-		String result = "";
-		boolean defaultMessage = true;
-		if (StringUtils.hasLength(msg)) {
-			if (endsWithSeparator(msg)) {
-				result = msg + " ";
-			}
-			else {
-				result = messageWithTypeName(msg, className);
-				defaultMessage = false;
-			}
-		}
-		if (defaultMessage) {
-			result = result + ("Object of class [" + className + "] must be an instance of " + type);
-		}
-		throw new IllegalArgumentException(result);
-	}
-
-	private static void assignableCheckFailed(Class<?> superType, @Nullable Class<?> subType, @Nullable String msg) {
-		String result = "";
-		boolean defaultMessage = true;
-		if (StringUtils.hasLength(msg)) {
-			if (endsWithSeparator(msg)) {
-				result = msg + " ";
-			}
-			else {
-				result = messageWithTypeName(msg, subType);
-				defaultMessage = false;
-			}
-		}
-		if (defaultMessage) {
-			result = result + (subType + " is not assignable to " + superType);
-		}
-		throw new IllegalArgumentException(result);
-	}
-
-	private static boolean endsWithSeparator(String msg) {
-		return (msg.endsWith(":") || msg.endsWith(";") || msg.endsWith(",") || msg.endsWith("."));
-	}
-
-	private static String messageWithTypeName(String msg, @Nullable Object typeName) {
-		return msg + (msg.endsWith(" ") ? "" : ": ") + typeName;
-	}
-
-	@Nullable
-	private static String nullSafeGet(@Nullable Supplier<String> messageSupplier) {
-		return (messageSupplier != null ? messageSupplier.get() : null);
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
deleted file mode 100644
index 8a9762c6..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/ClassUtils.java
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.beans.Introspector;
-import java.io.Closeable;
-import java.io.Externalizable;
-import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.StringJoiner;
-
-/**
- * Miscellaneous {@code java.lang.Class} utility methods.
- *
- * <p>Mainly for internal use within the framework.
- *
- * @author Juergen Hoeller
- * @author Keith Donald
- * @author Rob Harrop
- * @author Sam Brannen
- * @author Sebastien Deleuze
- * @since 1.1
- * @see TypeUtils
- * @see ReflectionUtils
- */
-public abstract class ClassUtils {
-
-	/** Suffix for array class names: {@code "[]"}. */
-	public static final String ARRAY_SUFFIX = "[]";
-
-	/** Prefix for internal array class names: {@code "["}. */
-	private static final String INTERNAL_ARRAY_PREFIX = "[";
-
-	/** Prefix for internal non-primitive array class names: {@code "[L"}. */
-	private static final String NON_PRIMITIVE_ARRAY_PREFIX = "[L";
-
-	/** A reusable empty class array constant. */
-	private static final Class<?>[] EMPTY_CLASS_ARRAY = {};
-
-	/** The package separator character: {@code '.'}. */
-	private static final char PACKAGE_SEPARATOR = '.';
-
-	/** The path separator character: {@code '/'}. */
-	private static final char PATH_SEPARATOR = '/';
-
-	/** The nested class separator character: {@code '$'}. */
-	private static final char NESTED_CLASS_SEPARATOR = '$';
-
-	/** The CGLIB class separator: {@code "$$"}. */
-	public static final String CGLIB_CLASS_SEPARATOR = "$$";
-
-	/** The ".class" file suffix. */
-	public static final String CLASS_FILE_SUFFIX = ".class";
-
-	/** Precomputed value for the combination of private, static and final modifiers. */
-	private static final int NON_OVERRIDABLE_MODIFIER = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL;
-
-	/** Precomputed value for the combination of public and protected modifiers. */
-	private static final int OVERRIDABLE_MODIFIER = Modifier.PUBLIC | Modifier.PROTECTED;
-
-
-	/**
-	 * Map with primitive wrapper type as key and corresponding primitive
-	 * type as value, for example: Integer.class -> int.class.
-	 */
-	private static final Map<Class<?>, Class<?>> primitiveWrapperTypeMap = new IdentityHashMap<>(9);
-
-	/**
-	 * Map with primitive type as key and corresponding wrapper
-	 * type as value, for example: int.class -> Integer.class.
-	 */
-	private static final Map<Class<?>, Class<?>> primitiveTypeToWrapperMap = new IdentityHashMap<>(9);
-
-	/**
-	 * Map with primitive type name as key and corresponding primitive
-	 * type as value, for example: "int" -> "int.class".
-	 */
-	private static final Map<String, Class<?>> primitiveTypeNameMap = new HashMap<>(32);
-
-	/**
-	 * Map with common Java language class name as key and corresponding Class as value.
-	 * Primarily for efficient deserialization of remote invocations.
-	 */
-	private static final Map<String, Class<?>> commonClassCache = new HashMap<>(64);
-
-	/**
-	 * Common Java language interfaces which are supposed to be ignored
-	 * when searching for 'primary' user-level interfaces.
-	 */
-	private static final Set<Class<?>> javaLanguageInterfaces;
-
-	/**
-	 * Cache for equivalent methods on an interface implemented by the declaring class.
-	 */
-	private static final Map<Method, Method> interfaceMethodCache = new ConcurrentReferenceHashMap<>(256);
-
-
-	static {
-		primitiveWrapperTypeMap.put(Boolean.class, boolean.class);
-		primitiveWrapperTypeMap.put(Byte.class, byte.class);
-		primitiveWrapperTypeMap.put(Character.class, char.class);
-		primitiveWrapperTypeMap.put(Double.class, double.class);
-		primitiveWrapperTypeMap.put(Float.class, float.class);
-		primitiveWrapperTypeMap.put(Integer.class, int.class);
-		primitiveWrapperTypeMap.put(Long.class, long.class);
-		primitiveWrapperTypeMap.put(Short.class, short.class);
-		primitiveWrapperTypeMap.put(Void.class, void.class);
-
-		// Map entry iteration is less expensive to initialize than forEach with lambdas
-		for (Map.Entry<Class<?>, Class<?>> entry : primitiveWrapperTypeMap.entrySet()) {
-			primitiveTypeToWrapperMap.put(entry.getValue(), entry.getKey());
-			registerCommonClasses(entry.getKey());
-		}
-
-		Set<Class<?>> primitiveTypes = new HashSet<>(32);
-		primitiveTypes.addAll(primitiveWrapperTypeMap.values());
-		Collections.addAll(primitiveTypes, boolean[].class, byte[].class, char[].class,
-				double[].class, float[].class, int[].class, long[].class, short[].class);
-		for (Class<?> primitiveType : primitiveTypes) {
-			primitiveTypeNameMap.put(primitiveType.getName(), primitiveType);
-		}
-
-		registerCommonClasses(Boolean[].class, Byte[].class, Character[].class, Double[].class,
-				Float[].class, Integer[].class, Long[].class, Short[].class);
-		registerCommonClasses(Number.class, Number[].class, String.class, String[].class,
-				Class.class, Class[].class, Object.class, Object[].class);
-		registerCommonClasses(Throwable.class, Exception.class, RuntimeException.class,
-				Error.class, StackTraceElement.class, StackTraceElement[].class);
-		registerCommonClasses(Enum.class, Iterable.class, Iterator.class, Enumeration.class,
-				Collection.class, List.class, Set.class, Map.class, Map.Entry.class, Optional.class);
-
-		Class<?>[] javaLanguageInterfaceArray = {Serializable.class, Externalizable.class,
-				Closeable.class, AutoCloseable.class, Cloneable.class, Comparable.class};
-		registerCommonClasses(javaLanguageInterfaceArray);
-		javaLanguageInterfaces = new HashSet<>(Arrays.asList(javaLanguageInterfaceArray));
-	}
-
-
-	/**
-	 * Register the given common classes with the ClassUtils cache.
-	 */
-	private static void registerCommonClasses(Class<?>... commonClasses) {
-		for (Class<?> clazz : commonClasses) {
-			commonClassCache.put(clazz.getName(), clazz);
-		}
-	}
-
-	/**
-	 * Return the default ClassLoader to use: typically the thread context
-	 * ClassLoader, if available; the ClassLoader that loaded the ClassUtils
-	 * class will be used as fallback.
-	 * <p>Call this method if you intend to use the thread context ClassLoader
-	 * in a scenario where you clearly prefer a non-null ClassLoader reference:
-	 * for example, for class path resource loading (but not necessarily for
-	 * {@code Class.forName}, which accepts a {@code null} ClassLoader
-	 * reference as well).
-	 * @return the default ClassLoader (only {@code null} if even the system
-	 * ClassLoader isn't accessible)
-	 * @see Thread#getContextClassLoader()
-	 * @see ClassLoader#getSystemClassLoader()
-	 */
-	@Nullable
-	public static ClassLoader getDefaultClassLoader() {
-		ClassLoader cl = null;
-		try {
-			cl = Thread.currentThread().getContextClassLoader();
-		}
-		catch (Throwable ex) {
-			// Cannot access thread context ClassLoader - falling back...
-		}
-		if (cl == null) {
-			// No thread context class loader -> use class loader of this class.
-			cl = ClassUtils.class.getClassLoader();
-			if (cl == null) {
-				// getClassLoader() returning null indicates the bootstrap ClassLoader
-				try {
-					cl = ClassLoader.getSystemClassLoader();
-				}
-				catch (Throwable ex) {
-					// Cannot access system ClassLoader - oh well, maybe the caller can live with null...
-				}
-			}
-		}
-		return cl;
-	}
-
-	/**
-	 * Override the thread context ClassLoader with the environment's bean ClassLoader
-	 * if necessary, i.e. if the bean ClassLoader is not equivalent to the thread
-	 * context ClassLoader already.
-	 * @param classLoaderToUse the actual ClassLoader to use for the thread context
-	 * @return the original thread context ClassLoader, or {@code null} if not overridden
-	 */
-	@Nullable
-	public static ClassLoader overrideThreadContextClassLoader(@Nullable ClassLoader classLoaderToUse) {
-		Thread currentThread = Thread.currentThread();
-		ClassLoader threadContextClassLoader = currentThread.getContextClassLoader();
-		if (classLoaderToUse != null && !classLoaderToUse.equals(threadContextClassLoader)) {
-			currentThread.setContextClassLoader(classLoaderToUse);
-			return threadContextClassLoader;
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * Replacement for {@code Class.forName()} that also returns Class instances
-	 * for primitives (e.g. "int") and array class names (e.g. "String[]").
-	 * Furthermore, it is also capable of resolving nested class names in Java source
-	 * style (e.g. "java.lang.Thread.State" instead of "java.lang.Thread$State").
-	 * @param name the name of the Class
-	 * @param classLoader the class loader to use
-	 * (can be {@code null}, which indicates the default class loader)
-	 * @return a class instance for the supplied name
-	 * @throws ClassNotFoundException if the class was not found
-	 * @throws LinkageError if the class file could not be loaded
-	 * @see Class#forName(String, boolean, ClassLoader)
-	 */
-	public static Class<?> forName(String name, @Nullable ClassLoader classLoader)
-			throws ClassNotFoundException, LinkageError {
-
-		Assert.notNull(name, "Name must not be null");
-
-		Class<?> clazz = resolvePrimitiveClassName(name);
-		if (clazz == null) {
-			clazz = commonClassCache.get(name);
-		}
-		if (clazz != null) {
-			return clazz;
-		}
-
-		// "java.lang.String[]" style arrays
-		if (name.endsWith(ARRAY_SUFFIX)) {
-			String elementClassName = name.substring(0, name.length() - ARRAY_SUFFIX.length());
-			Class<?> elementClass = forName(elementClassName, classLoader);
-			return Array.newInstance(elementClass, 0).getClass();
-		}
-
-		// "[Ljava.lang.String;" style arrays
-		if (name.startsWith(NON_PRIMITIVE_ARRAY_PREFIX) && name.endsWith(";")) {
-			String elementName = name.substring(NON_PRIMITIVE_ARRAY_PREFIX.length(), name.length() - 1);
-			Class<?> elementClass = forName(elementName, classLoader);
-			return Array.newInstance(elementClass, 0).getClass();
-		}
-
-		// "[[I" or "[[Ljava.lang.String;" style arrays
-		if (name.startsWith(INTERNAL_ARRAY_PREFIX)) {
-			String elementName = name.substring(INTERNAL_ARRAY_PREFIX.length());
-			Class<?> elementClass = forName(elementName, classLoader);
-			return Array.newInstance(elementClass, 0).getClass();
-		}
-
-		ClassLoader clToUse = classLoader;
-		if (clToUse == null) {
-			clToUse = getDefaultClassLoader();
-		}
-		try {
-			return Class.forName(name, false, clToUse);
-		}
-		catch (ClassNotFoundException ex) {
-			int lastDotIndex = name.lastIndexOf(PACKAGE_SEPARATOR);
-			if (lastDotIndex != -1) {
-				String nestedClassName =
-						name.substring(0, lastDotIndex) + NESTED_CLASS_SEPARATOR + name.substring(lastDotIndex + 1);
-				try {
-					return Class.forName(nestedClassName, false, clToUse);
-				}
-				catch (ClassNotFoundException ex2) {
-					// Swallow - let original exception get through
-				}
-			}
-			throw ex;
-		}
-	}
-
-	/**
-	 * Resolve the given class name into a Class instance. Supports
-	 * primitives (like "int") and array class names (like "String[]").
-	 * <p>This is effectively equivalent to the {@code forName}
-	 * method with the same arguments, with the only difference being
-	 * the exceptions thrown in case of class loading failure.
-	 * @param className the name of the Class
-	 * @param classLoader the class loader to use
-	 * (can be {@code null}, which indicates the default class loader)
-	 * @return a class instance for the supplied name
-	 * @throws IllegalArgumentException if the class name was not resolvable
-	 * (that is, the class could not be found or the class file could not be loaded)
-	 * @throws IllegalStateException if the corresponding class is resolvable but
-	 * there was a readability mismatch in the inheritance hierarchy of the class
-	 * (typically a missing dependency declaration in a Jigsaw module definition
-	 * for a superclass or interface implemented by the class to be loaded here)
-	 * @see #forName(String, ClassLoader)
-	 */
-	public static Class<?> resolveClassName(String className, @Nullable ClassLoader classLoader)
-			throws IllegalArgumentException {
-
-		try {
-			return forName(className, classLoader);
-		}
-		catch (IllegalAccessError err) {
-			throw new IllegalStateException("Readability mismatch in inheritance hierarchy of class [" +
-					className + "]: " + err.getMessage(), err);
-		}
-		catch (LinkageError err) {
-			throw new IllegalArgumentException("Unresolvable class definition for class [" + className + "]", err);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalArgumentException("Could not find class [" + className + "]", ex);
-		}
-	}
-
-	/**
-	 * Determine whether the {@link Class} identified by the supplied name is present
-	 * and can be loaded. Will return {@code false} if either the class or
-	 * one of its dependencies is not present or cannot be loaded.
-	 * @param className the name of the class to check
-	 * @param classLoader the class loader to use
-	 * (can be {@code null} which indicates the default class loader)
-	 * @return whether the specified class is present (including all of its
-	 * superclasses and interfaces)
-	 * @throws IllegalStateException if the corresponding class is resolvable but
-	 * there was a readability mismatch in the inheritance hierarchy of the class
-	 * (typically a missing dependency declaration in a Jigsaw module definition
-	 * for a superclass or interface implemented by the class to be checked here)
-	 */
-	public static boolean isPresent(String className, @Nullable ClassLoader classLoader) {
-		try {
-			forName(className, classLoader);
-			return true;
-		}
-		catch (IllegalAccessError err) {
-			throw new IllegalStateException("Readability mismatch in inheritance hierarchy of class [" +
-					className + "]: " + err.getMessage(), err);
-		}
-		catch (Throwable ex) {
-			// Typically ClassNotFoundException or NoClassDefFoundError...
-			return false;
-		}
-	}
-
-	/**
-	 * Check whether the given class is visible in the given ClassLoader.
-	 * @param clazz the class to check (typically an interface)
-	 * @param classLoader the ClassLoader to check against
-	 * (can be {@code null} in which case this method will always return {@code true})
-	 */
-	public static boolean isVisible(Class<?> clazz, @Nullable ClassLoader classLoader) {
-		if (classLoader == null) {
-			return true;
-		}
-		try {
-			if (clazz.getClassLoader() == classLoader) {
-				return true;
-			}
-		}
-		catch (SecurityException ex) {
-			// Fall through to loadable check below
-		}
-
-		// Visible if same Class can be loaded from given ClassLoader
-		return isLoadable(clazz, classLoader);
-	}
-
-	/**
-	 * Check whether the given class is cache-safe in the given context,
-	 * i.e. whether it is loaded by the given ClassLoader or a parent of it.
-	 * @param clazz the class to analyze
-	 * @param classLoader the ClassLoader to potentially cache metadata in
-	 * (can be {@code null} which indicates the system class loader)
-	 */
-	public static boolean isCacheSafe(Class<?> clazz, @Nullable ClassLoader classLoader) {
-		Assert.notNull(clazz, "Class must not be null");
-		try {
-			ClassLoader target = clazz.getClassLoader();
-			// Common cases
-			if (target == classLoader || target == null) {
-				return true;
-			}
-			if (classLoader == null) {
-				return false;
-			}
-			// Check for match in ancestors -> positive
-			ClassLoader current = classLoader;
-			while (current != null) {
-				current = current.getParent();
-				if (current == target) {
-					return true;
-				}
-			}
-			// Check for match in children -> negative
-			while (target != null) {
-				target = target.getParent();
-				if (target == classLoader) {
-					return false;
-				}
-			}
-		}
-		catch (SecurityException ex) {
-			// Fall through to loadable check below
-		}
-
-		// Fallback for ClassLoaders without parent/child relationship:
-		// safe if same Class can be loaded from given ClassLoader
-		return (classLoader != null && isLoadable(clazz, classLoader));
-	}
-
-	/**
-	 * Check whether the given class is loadable in the given ClassLoader.
-	 * @param clazz the class to check (typically an interface)
-	 * @param classLoader the ClassLoader to check against
-	 * @since 5.0.6
-	 */
-	private static boolean isLoadable(Class<?> clazz, ClassLoader classLoader) {
-		try {
-			return (clazz == classLoader.loadClass(clazz.getName()));
-			// Else: different class with same name found
-		}
-		catch (ClassNotFoundException ex) {
-			// No corresponding class found at all
-			return false;
-		}
-	}
-
-	/**
-	 * Resolve the given class name as primitive class, if appropriate,
-	 * according to the JVM's naming rules for primitive classes.
-	 * <p>Also supports the JVM's internal class names for primitive arrays.
-	 * Does <i>not</i> support the "[]" suffix notation for primitive arrays;
-	 * this is only supported by {@link #forName(String, ClassLoader)}.
-	 * @param name the name of the potentially primitive class
-	 * @return the primitive class, or {@code null} if the name does not denote
-	 * a primitive class or primitive array class
-	 */
-	@Nullable
-	public static Class<?> resolvePrimitiveClassName(@Nullable String name) {
-		Class<?> result = null;
-		// Most class names will be quite long, considering that they
-		// SHOULD sit in a package, so a length check is worthwhile.
-		if (name != null && name.length() <= 7) {
-			// Could be a primitive - likely.
-			result = primitiveTypeNameMap.get(name);
-		}
-		return result;
-	}
-
-	/**
-	 * Check if the given class represents a primitive wrapper,
-	 * i.e. Boolean, Byte, Character, Short, Integer, Long, Float, Double, or
-	 * Void.
-	 * @param clazz the class to check
-	 * @return whether the given class is a primitive wrapper class
-	 */
-	public static boolean isPrimitiveWrapper(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return primitiveWrapperTypeMap.containsKey(clazz);
-	}
-
-	/**
-	 * Check if the given class represents a primitive (i.e. boolean, byte,
-	 * char, short, int, long, float, or double), {@code void}, or a wrapper for
-	 * those types (i.e. Boolean, Byte, Character, Short, Integer, Long, Float,
-	 * Double, or Void).
-	 * @param clazz the class to check
-	 * @return {@code true} if the given class represents a primitive, void, or
-	 * a wrapper class
-	 */
-	public static boolean isPrimitiveOrWrapper(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return (clazz.isPrimitive() || isPrimitiveWrapper(clazz));
-	}
-
-	/**
-	 * Check if the given class represents an array of primitives,
-	 * i.e. boolean, byte, char, short, int, long, float, or double.
-	 * @param clazz the class to check
-	 * @return whether the given class is a primitive array class
-	 */
-	public static boolean isPrimitiveArray(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return (clazz.isArray() && clazz.getComponentType().isPrimitive());
-	}
-
-	/**
-	 * Check if the given class represents an array of primitive wrappers,
-	 * i.e. Boolean, Byte, Character, Short, Integer, Long, Float, or Double.
-	 * @param clazz the class to check
-	 * @return whether the given class is a primitive wrapper array class
-	 */
-	public static boolean isPrimitiveWrapperArray(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return (clazz.isArray() && isPrimitiveWrapper(clazz.getComponentType()));
-	}
-
-	/**
-	 * Resolve the given class if it is a primitive class,
-	 * returning the corresponding primitive wrapper type instead.
-	 * @param clazz the class to check
-	 * @return the original class, or a primitive wrapper for the original primitive type
-	 */
-	public static Class<?> resolvePrimitiveIfNecessary(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return (clazz.isPrimitive() && clazz != void.class ? primitiveTypeToWrapperMap.get(clazz) : clazz);
-	}
-
-	/**
-	 * Check if the right-hand side type may be assigned to the left-hand side
-	 * type, assuming setting by reflection. Considers primitive wrapper
-	 * classes as assignable to the corresponding primitive types.
-	 * @param lhsType the target type (left-hand side (LHS) type)
-	 * @param rhsType the value type (right-hand side (RHS) type) that should
-	 * be assigned to the target type
-	 * @return {@code true} if {@code rhsType} is assignable to {@code lhsType}
-	 * @see TypeUtils#isAssignable(java.lang.reflect.Type, java.lang.reflect.Type)
-	 */
-	public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
-		Assert.notNull(lhsType, "Left-hand side type must not be null");
-		Assert.notNull(rhsType, "Right-hand side type must not be null");
-		if (lhsType.isAssignableFrom(rhsType)) {
-			return true;
-		}
-		if (lhsType.isPrimitive()) {
-			Class<?> resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
-			return (lhsType == resolvedPrimitive);
-		}
-		else {
-			Class<?> resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
-			return (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper));
-		}
-	}
-
-	/**
-	 * Determine if the given type is assignable from the given value,
-	 * assuming setting by reflection. Considers primitive wrapper classes
-	 * as assignable to the corresponding primitive types.
-	 * @param type the target type
-	 * @param value the value that should be assigned to the type
-	 * @return if the type is assignable from the value
-	 */
-	public static boolean isAssignableValue(Class<?> type, @Nullable Object value) {
-		Assert.notNull(type, "Type must not be null");
-		return (value != null ? isAssignable(type, value.getClass()) : !type.isPrimitive());
-	}
-
-	/**
-	 * Convert a "/"-based resource path to a "."-based fully qualified class name.
-	 * @param resourcePath the resource path pointing to a class
-	 * @return the corresponding fully qualified class name
-	 */
-	public static String convertResourcePathToClassName(String resourcePath) {
-		Assert.notNull(resourcePath, "Resource path must not be null");
-		return resourcePath.replace(PATH_SEPARATOR, PACKAGE_SEPARATOR);
-	}
-
-	/**
-	 * Convert a "."-based fully qualified class name to a "/"-based resource path.
-	 * @param className the fully qualified class name
-	 * @return the corresponding resource path, pointing to the class
-	 */
-	public static String convertClassNameToResourcePath(String className) {
-		Assert.notNull(className, "Class name must not be null");
-		return className.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
-	}
-
-	/**
-	 * Return a path suitable for use with {@code ClassLoader.getResource}
-	 * (also suitable for use with {@code Class.getResource} by prepending a
-	 * slash ('/') to the return value). Built by taking the package of the specified
-	 * class file, converting all dots ('.') to slashes ('/'), adding a trailing slash
-	 * if necessary, and concatenating the specified resource name to this.
-	 * <br/>As such, this function may be used to build a path suitable for
-	 * loading a resource file that is in the same package as a class file,
-	 * although {@link org.springframework.core.io.ClassPathResource} is usually
-	 * even more convenient.
-	 * @param clazz the Class whose package will be used as the base
-	 * @param resourceName the resource name to append. A leading slash is optional.
-	 * @return the built-up resource path
-	 * @see ClassLoader#getResource
-	 * @see Class#getResource
-	 */
-	public static String addResourcePathToPackagePath(Class<?> clazz, String resourceName) {
-		Assert.notNull(resourceName, "Resource name must not be null");
-		if (!resourceName.startsWith("/")) {
-			return classPackageAsResourcePath(clazz) + '/' + resourceName;
-		}
-		return classPackageAsResourcePath(clazz) + resourceName;
-	}
-
-	/**
-	 * Given an input class object, return a string which consists of the
-	 * class's package name as a pathname, i.e., all dots ('.') are replaced by
-	 * slashes ('/'). Neither a leading nor trailing slash is added. The result
-	 * could be concatenated with a slash and the name of a resource and fed
-	 * directly to {@code ClassLoader.getResource()}. For it to be fed to
-	 * {@code Class.getResource} instead, a leading slash would also have
-	 * to be prepended to the returned value.
-	 * @param clazz the input class. A {@code null} value or the default
-	 * (empty) package will result in an empty string ("") being returned.
-	 * @return a path which represents the package name
-	 * @see ClassLoader#getResource
-	 * @see Class#getResource
-	 */
-	public static String classPackageAsResourcePath(@Nullable Class<?> clazz) {
-		if (clazz == null) {
-			return "";
-		}
-		String className = clazz.getName();
-		int packageEndIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
-		if (packageEndIndex == -1) {
-			return "";
-		}
-		String packageName = className.substring(0, packageEndIndex);
-		return packageName.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
-	}
-
-	/**
-	 * Build a String that consists of the names of the classes/interfaces
-	 * in the given array.
-	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
-	 * the "class "/"interface " prefix before every class name.
-	 * @param classes an array of Class objects
-	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
-	 * @see java.util.AbstractCollection#toString()
-	 */
-	public static String classNamesToString(Class<?>... classes) {
-		return classNamesToString(Arrays.asList(classes));
-	}
-
-	/**
-	 * Build a String that consists of the names of the classes/interfaces
-	 * in the given collection.
-	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
-	 * the "class "/"interface " prefix before every class name.
-	 * @param classes a Collection of Class objects (can be {@code null})
-	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
-	 * @see java.util.AbstractCollection#toString()
-	 */
-	public static String classNamesToString(@Nullable Collection<Class<?>> classes) {
-		if (CollectionUtils.isEmpty(classes)) {
-			return "[]";
-		}
-		StringJoiner stringJoiner = new StringJoiner(", ", "[", "]");
-		for (Class<?> clazz : classes) {
-			stringJoiner.add(clazz.getName());
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Copy the given {@code Collection} into a {@code Class} array.
-	 * <p>The {@code Collection} must contain {@code Class} elements only.
-	 * @param collection the {@code Collection} to copy
-	 * @return the {@code Class} array
-	 * @since 3.1
-	 * @see StringUtils#toStringArray
-	 */
-	public static Class<?>[] toClassArray(@Nullable Collection<Class<?>> collection) {
-		return (!CollectionUtils.isEmpty(collection) ? collection.toArray(EMPTY_CLASS_ARRAY) : EMPTY_CLASS_ARRAY);
-	}
-
-	/**
-	 * Return all interfaces that the given instance implements as an array,
-	 * including ones implemented by superclasses.
-	 * @param instance the instance to analyze for interfaces
-	 * @return all interfaces that the given instance implements as an array
-	 */
-	public static Class<?>[] getAllInterfaces(Object instance) {
-		Assert.notNull(instance, "Instance must not be null");
-		return getAllInterfacesForClass(instance.getClass());
-	}
-
-	/**
-	 * Return all interfaces that the given class implements as an array,
-	 * including ones implemented by superclasses.
-	 * <p>If the class itself is an interface, it gets returned as sole interface.
-	 * @param clazz the class to analyze for interfaces
-	 * @return all interfaces that the given object implements as an array
-	 */
-	public static Class<?>[] getAllInterfacesForClass(Class<?> clazz) {
-		return getAllInterfacesForClass(clazz, null);
-	}
-
-	/**
-	 * Return all interfaces that the given class implements as an array,
-	 * including ones implemented by superclasses.
-	 * <p>If the class itself is an interface, it gets returned as sole interface.
-	 * @param clazz the class to analyze for interfaces
-	 * @param classLoader the ClassLoader that the interfaces need to be visible in
-	 * (can be {@code null} when accepting all declared interfaces)
-	 * @return all interfaces that the given object implements as an array
-	 */
-	public static Class<?>[] getAllInterfacesForClass(Class<?> clazz, @Nullable ClassLoader classLoader) {
-		return toClassArray(getAllInterfacesForClassAsSet(clazz, classLoader));
-	}
-
-	/**
-	 * Return all interfaces that the given instance implements as a Set,
-	 * including ones implemented by superclasses.
-	 * @param instance the instance to analyze for interfaces
-	 * @return all interfaces that the given instance implements as a Set
-	 */
-	public static Set<Class<?>> getAllInterfacesAsSet(Object instance) {
-		Assert.notNull(instance, "Instance must not be null");
-		return getAllInterfacesForClassAsSet(instance.getClass());
-	}
-
-	/**
-	 * Return all interfaces that the given class implements as a Set,
-	 * including ones implemented by superclasses.
-	 * <p>If the class itself is an interface, it gets returned as sole interface.
-	 * @param clazz the class to analyze for interfaces
-	 * @return all interfaces that the given object implements as a Set
-	 */
-	public static Set<Class<?>> getAllInterfacesForClassAsSet(Class<?> clazz) {
-		return getAllInterfacesForClassAsSet(clazz, null);
-	}
-
-	/**
-	 * Return all interfaces that the given class implements as a Set,
-	 * including ones implemented by superclasses.
-	 * <p>If the class itself is an interface, it gets returned as sole interface.
-	 * @param clazz the class to analyze for interfaces
-	 * @param classLoader the ClassLoader that the interfaces need to be visible in
-	 * (can be {@code null} when accepting all declared interfaces)
-	 * @return all interfaces that the given object implements as a Set
-	 */
-	public static Set<Class<?>> getAllInterfacesForClassAsSet(Class<?> clazz, @Nullable ClassLoader classLoader) {
-		Assert.notNull(clazz, "Class must not be null");
-		if (clazz.isInterface() && isVisible(clazz, classLoader)) {
-			return Collections.singleton(clazz);
-		}
-		Set<Class<?>> interfaces = new LinkedHashSet<>();
-		Class<?> current = clazz;
-		while (current != null) {
-			Class<?>[] ifcs = current.getInterfaces();
-			for (Class<?> ifc : ifcs) {
-				if (isVisible(ifc, classLoader)) {
-					interfaces.add(ifc);
-				}
-			}
-			current = current.getSuperclass();
-		}
-		return interfaces;
-	}
-
-	/**
-	 * Create a composite interface Class for the given interfaces,
-	 * implementing the given interfaces in one single Class.
-	 * <p>This implementation builds a JDK proxy class for the given interfaces.
-	 * @param interfaces the interfaces to merge
-	 * @param classLoader the ClassLoader to create the composite Class in
-	 * @return the merged interface as Class
-	 * @throws IllegalArgumentException if the specified interfaces expose
-	 * conflicting method signatures (or a similar constraint is violated)
-	 * @see Proxy#getProxyClass
-	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
-	public static Class<?> createCompositeInterface(Class<?>[] interfaces, @Nullable ClassLoader classLoader) {
-		Assert.notEmpty(interfaces, "Interface array must not be empty");
-		return Proxy.getProxyClass(classLoader, interfaces);
-	}
-
-	/**
-	 * Determine the common ancestor of the given classes, if any.
-	 * @param clazz1 the class to introspect
-	 * @param clazz2 the other class to introspect
-	 * @return the common ancestor (i.e. common superclass, one interface
-	 * extending the other), or {@code null} if none found. If any of the
-	 * given classes is {@code null}, the other class will be returned.
-	 * @since 3.2.6
-	 */
-	@Nullable
-	public static Class<?> determineCommonAncestor(@Nullable Class<?> clazz1, @Nullable Class<?> clazz2) {
-		if (clazz1 == null) {
-			return clazz2;
-		}
-		if (clazz2 == null) {
-			return clazz1;
-		}
-		if (clazz1.isAssignableFrom(clazz2)) {
-			return clazz1;
-		}
-		if (clazz2.isAssignableFrom(clazz1)) {
-			return clazz2;
-		}
-		Class<?> ancestor = clazz1;
-		do {
-			ancestor = ancestor.getSuperclass();
-			if (ancestor == null || Object.class == ancestor) {
-				return null;
-			}
-		}
-		while (!ancestor.isAssignableFrom(clazz2));
-		return ancestor;
-	}
-
-	/**
-	 * Determine whether the given interface is a common Java language interface:
-	 * {@link Serializable}, {@link Externalizable}, {@link Closeable}, {@link AutoCloseable},
-	 * {@link Cloneable}, {@link Comparable} - all of which can be ignored when looking
-	 * for 'primary' user-level interfaces. Common characteristics: no service-level
-	 * operations, no bean property methods, no default methods.
-	 * @param ifc the interface to check
-	 * @since 5.0.3
-	 */
-	public static boolean isJavaLanguageInterface(Class<?> ifc) {
-		return javaLanguageInterfaces.contains(ifc);
-	}
-
-	/**
-	 * Determine if the supplied class is an <em>inner class</em>,
-	 * i.e. a non-static member of an enclosing class.
-	 * @return {@code true} if the supplied class is an inner class
-	 * @since 5.0.5
-	 * @see Class#isMemberClass()
-	 */
-	public static boolean isInnerClass(Class<?> clazz) {
-		return (clazz.isMemberClass() && !Modifier.isStatic(clazz.getModifiers()));
-	}
-
-	/**
-	 * Determine if the supplied {@link Class} is a JVM-generated implementation
-	 * class for a lambda expression or method reference.
-	 * <p>This method makes a best-effort attempt at determining this, based on
-	 * checks that work on modern, mainstream JVMs.
-	 * @param clazz the class to check
-	 * @return {@code true} if the class is a lambda implementation class
-	 * @since 5.3.19
-	 */
-	public static boolean isLambdaClass(Class<?> clazz) {
-		return (clazz.isSynthetic() && (clazz.getSuperclass() == Object.class) &&
-				(clazz.getInterfaces().length > 0) && clazz.getName().contains("$$Lambda"));
-	}
-
-	/**
-	 * Check whether the given object is a CGLIB proxy.
-	 * @param object the object to check
-	 * @see org.springframework.aop.support.AopUtils#isCglibProxy(Object)
-	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
-	 * such as for a Spring AOP proxy
-	 */
-	@Deprecated
-	public static boolean isCglibProxy(Object object) {
-		return isCglibProxyClass(object.getClass());
-	}
-
-	/**
-	 * Check whether the specified class is a CGLIB-generated class.
-	 * @param clazz the class to check
-	 * @see #getUserClass(Class)
-	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
-	 * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
-	 */
-	@Deprecated
-	public static boolean isCglibProxyClass(@Nullable Class<?> clazz) {
-		return (clazz != null && isCglibProxyClassName(clazz.getName()));
-	}
-
-	/**
-	 * Check whether the specified class name is a CGLIB-generated class.
-	 * @param className the class name to check
-	 * @see #CGLIB_CLASS_SEPARATOR
-	 * @deprecated as of 5.2, in favor of custom (possibly narrower) checks
-	 * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
-	 */
-	@Deprecated
-	public static boolean isCglibProxyClassName(@Nullable String className) {
-		return (className != null && className.contains(CGLIB_CLASS_SEPARATOR));
-	}
-
-	/**
-	 * Return the user-defined class for the given instance: usually simply
-	 * the class of the given instance, but the original class in case of a
-	 * CGLIB-generated subclass.
-	 * @param instance the instance to check
-	 * @return the user-defined class
-	 */
-	public static Class<?> getUserClass(Object instance) {
-		Assert.notNull(instance, "Instance must not be null");
-		return getUserClass(instance.getClass());
-	}
-
-	/**
-	 * Return the user-defined class for the given class: usually simply the given
-	 * class, but the original class in case of a CGLIB-generated subclass.
-	 * @param clazz the class to check
-	 * @return the user-defined class
-	 * @see #CGLIB_CLASS_SEPARATOR
-	 */
-	public static Class<?> getUserClass(Class<?> clazz) {
-		if (clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
-			Class<?> superclass = clazz.getSuperclass();
-			if (superclass != null && superclass != Object.class) {
-				return superclass;
-			}
-		}
-		return clazz;
-	}
-
-	/**
-	 * Return a descriptive name for the given object's type: usually simply
-	 * the class name, but component type class name + "[]" for arrays,
-	 * and an appended list of implemented interfaces for JDK proxies.
-	 * @param value the value to introspect
-	 * @return the qualified name of the class
-	 */
-	@Nullable
-	public static String getDescriptiveType(@Nullable Object value) {
-		if (value == null) {
-			return null;
-		}
-		Class<?> clazz = value.getClass();
-		if (Proxy.isProxyClass(clazz)) {
-			String prefix = clazz.getName() + " implementing ";
-			StringJoiner result = new StringJoiner(",", prefix, "");
-			for (Class<?> ifc : clazz.getInterfaces()) {
-				result.add(ifc.getName());
-			}
-			return result.toString();
-		}
-		else {
-			return clazz.getTypeName();
-		}
-	}
-
-	/**
-	 * Check whether the given class matches the user-specified type name.
-	 * @param clazz the class to check
-	 * @param typeName the type name to match
-	 */
-	public static boolean matchesTypeName(Class<?> clazz, @Nullable String typeName) {
-		return (typeName != null &&
-				(typeName.equals(clazz.getTypeName()) || typeName.equals(clazz.getSimpleName())));
-	}
-
-	/**
-	 * Get the class name without the qualified package name.
-	 * @param className the className to get the short name for
-	 * @return the class name of the class without the package name
-	 * @throws IllegalArgumentException if the className is empty
-	 */
-	public static String getShortName(String className) {
-		Assert.hasLength(className, "Class name must not be empty");
-		int lastDotIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
-		int nameEndIndex = className.indexOf(CGLIB_CLASS_SEPARATOR);
-		if (nameEndIndex == -1) {
-			nameEndIndex = className.length();
-		}
-		String shortName = className.substring(lastDotIndex + 1, nameEndIndex);
-		shortName = shortName.replace(NESTED_CLASS_SEPARATOR, PACKAGE_SEPARATOR);
-		return shortName;
-	}
-
-	/**
-	 * Get the class name without the qualified package name.
-	 * @param clazz the class to get the short name for
-	 * @return the class name of the class without the package name
-	 */
-	public static String getShortName(Class<?> clazz) {
-		return getShortName(getQualifiedName(clazz));
-	}
-
-	/**
-	 * Return the short string name of a Java class in uncapitalized JavaBeans
-	 * property format. Strips the outer class name in case of a nested class.
-	 * @param clazz the class
-	 * @return the short name rendered in a standard JavaBeans property format
-	 * @see Introspector#decapitalize(String)
-	 */
-	public static String getShortNameAsProperty(Class<?> clazz) {
-		String shortName = getShortName(clazz);
-		int dotIndex = shortName.lastIndexOf(PACKAGE_SEPARATOR);
-		shortName = (dotIndex != -1 ? shortName.substring(dotIndex + 1) : shortName);
-		return Introspector.decapitalize(shortName);
-	}
-
-	/**
-	 * Determine the name of the class file, relative to the containing
-	 * package: e.g. "String.class"
-	 * @param clazz the class
-	 * @return the file name of the ".class" file
-	 */
-	public static String getClassFileName(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		String className = clazz.getName();
-		int lastDotIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
-		return className.substring(lastDotIndex + 1) + CLASS_FILE_SUFFIX;
-	}
-
-	/**
-	 * Determine the name of the package of the given class,
-	 * e.g. "java.lang" for the {@code java.lang.String} class.
-	 * @param clazz the class
-	 * @return the package name, or the empty String if the class
-	 * is defined in the default package
-	 */
-	public static String getPackageName(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return getPackageName(clazz.getName());
-	}
-
-	/**
-	 * Determine the name of the package of the given fully-qualified class name,
-	 * e.g. "java.lang" for the {@code java.lang.String} class name.
-	 * @param fqClassName the fully-qualified class name
-	 * @return the package name, or the empty String if the class
-	 * is defined in the default package
-	 */
-	public static String getPackageName(String fqClassName) {
-		Assert.notNull(fqClassName, "Class name must not be null");
-		int lastDotIndex = fqClassName.lastIndexOf(PACKAGE_SEPARATOR);
-		return (lastDotIndex != -1 ? fqClassName.substring(0, lastDotIndex) : "");
-	}
-
-	/**
-	 * Return the qualified name of the given class: usually simply
-	 * the class name, but component type class name + "[]" for arrays.
-	 * @param clazz the class
-	 * @return the qualified name of the class
-	 */
-	public static String getQualifiedName(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		return clazz.getTypeName();
-	}
-
-	/**
-	 * Return the qualified name of the given method, consisting of
-	 * fully qualified interface/class name + "." + method name.
-	 * @param method the method
-	 * @return the qualified name of the method
-	 */
-	public static String getQualifiedMethodName(Method method) {
-		return getQualifiedMethodName(method, null);
-	}
-
-	/**
-	 * Return the qualified name of the given method, consisting of
-	 * fully qualified interface/class name + "." + method name.
-	 * @param method the method
-	 * @param clazz the clazz that the method is being invoked on
-	 * (can be {@code null} to indicate the method's declaring class)
-	 * @return the qualified name of the method
-	 * @since 4.3.4
-	 */
-	public static String getQualifiedMethodName(Method method, @Nullable Class<?> clazz) {
-		Assert.notNull(method, "Method must not be null");
-		return (clazz != null ? clazz : method.getDeclaringClass()).getName() + '.' + method.getName();
-	}
-
-	/**
-	 * Determine whether the given class has a public constructor with the given signature.
-	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
-	 * @param clazz the clazz to analyze
-	 * @param paramTypes the parameter types of the method
-	 * @return whether the class has a corresponding constructor
-	 * @see Class#getConstructor
-	 */
-	public static boolean hasConstructor(Class<?> clazz, Class<?>... paramTypes) {
-		return (getConstructorIfAvailable(clazz, paramTypes) != null);
-	}
-
-	/**
-	 * Determine whether the given class has a public constructor with the given signature,
-	 * and return it if available (else return {@code null}).
-	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
-	 * @param clazz the clazz to analyze
-	 * @param paramTypes the parameter types of the method
-	 * @return the constructor, or {@code null} if not found
-	 * @see Class#getConstructor
-	 */
-	@Nullable
-	public static <T> Constructor<T> getConstructorIfAvailable(Class<T> clazz, Class<?>... paramTypes) {
-		Assert.notNull(clazz, "Class must not be null");
-		try {
-			return clazz.getConstructor(paramTypes);
-		}
-		catch (NoSuchMethodException ex) {
-			return null;
-		}
-	}
-
-	/**
-	 * Determine whether the given class has a public method with the given signature.
-	 * @param clazz the clazz to analyze
-	 * @param method the method to look for
-	 * @return whether the class has a corresponding method
-	 * @since 5.2.3
-	 */
-	public static boolean hasMethod(Class<?> clazz, Method method) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(method, "Method must not be null");
-		if (clazz == method.getDeclaringClass()) {
-			return true;
-		}
-		String methodName = method.getName();
-		Class<?>[] paramTypes = method.getParameterTypes();
-		return getMethodOrNull(clazz, methodName, paramTypes) != null;
-	}
-
-	/**
-	 * Determine whether the given class has a public method with the given signature.
-	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
-	 * @param clazz the clazz to analyze
-	 * @param methodName the name of the method
-	 * @param paramTypes the parameter types of the method
-	 * @return whether the class has a corresponding method
-	 * @see Class#getMethod
-	 */
-	public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
-		return (getMethodIfAvailable(clazz, methodName, paramTypes) != null);
-	}
-
-	/**
-	 * Determine whether the given class has a public method with the given signature,
-	 * and return it if available (else throws an {@code IllegalStateException}).
-	 * <p>In case of any signature specified, only returns the method if there is a
-	 * unique candidate, i.e. a single public method with the specified name.
-	 * <p>Essentially translates {@code NoSuchMethodException} to {@code IllegalStateException}.
-	 * @param clazz the clazz to analyze
-	 * @param methodName the name of the method
-	 * @param paramTypes the parameter types of the method
-	 * (can be {@code null} to indicate any signature)
-	 * @return the method (never {@code null})
-	 * @throws IllegalStateException if the method has not been found
-	 * @see Class#getMethod
-	 */
-	public static Method getMethod(Class<?> clazz, String methodName, @Nullable Class<?>... paramTypes) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(methodName, "Method name must not be null");
-		if (paramTypes != null) {
-			try {
-				return clazz.getMethod(methodName, paramTypes);
-			}
-			catch (NoSuchMethodException ex) {
-				throw new IllegalStateException("Expected method not found: " + ex);
-			}
-		}
-		else {
-			Set<Method> candidates = findMethodCandidatesByName(clazz, methodName);
-			if (candidates.size() == 1) {
-				return candidates.iterator().next();
-			}
-			else if (candidates.isEmpty()) {
-				throw new IllegalStateException("Expected method not found: " + clazz.getName() + '.' + methodName);
-			}
-			else {
-				throw new IllegalStateException("No unique method found: " + clazz.getName() + '.' + methodName);
-			}
-		}
-	}
-
-	/**
-	 * Determine whether the given class has a public method with the given signature,
-	 * and return it if available (else return {@code null}).
-	 * <p>In case of any signature specified, only returns the method if there is a
-	 * unique candidate, i.e. a single public method with the specified name.
-	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
-	 * @param clazz the clazz to analyze
-	 * @param methodName the name of the method
-	 * @param paramTypes the parameter types of the method
-	 * (can be {@code null} to indicate any signature)
-	 * @return the method, or {@code null} if not found
-	 * @see Class#getMethod
-	 */
-	@Nullable
-	public static Method getMethodIfAvailable(Class<?> clazz, String methodName, @Nullable Class<?>... paramTypes) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(methodName, "Method name must not be null");
-		if (paramTypes != null) {
-			return getMethodOrNull(clazz, methodName, paramTypes);
-		}
-		else {
-			Set<Method> candidates = findMethodCandidatesByName(clazz, methodName);
-			if (candidates.size() == 1) {
-				return candidates.iterator().next();
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * Return the number of methods with a given name (with any argument types),
-	 * for the given class and/or its superclasses. Includes non-public methods.
-	 * @param clazz	the clazz to check
-	 * @param methodName the name of the method
-	 * @return the number of methods with the given name
-	 */
-	public static int getMethodCountForName(Class<?> clazz, String methodName) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(methodName, "Method name must not be null");
-		int count = 0;
-		Method[] declaredMethods = clazz.getDeclaredMethods();
-		for (Method method : declaredMethods) {
-			if (methodName.equals(method.getName())) {
-				count++;
-			}
-		}
-		Class<?>[] ifcs = clazz.getInterfaces();
-		for (Class<?> ifc : ifcs) {
-			count += getMethodCountForName(ifc, methodName);
-		}
-		if (clazz.getSuperclass() != null) {
-			count += getMethodCountForName(clazz.getSuperclass(), methodName);
-		}
-		return count;
-	}
-
-	/**
-	 * Does the given class or one of its superclasses at least have one or more
-	 * methods with the supplied name (with any argument types)?
-	 * Includes non-public methods.
-	 * @param clazz	the clazz to check
-	 * @param methodName the name of the method
-	 * @return whether there is at least one method with the given name
-	 */
-	public static boolean hasAtLeastOneMethodWithName(Class<?> clazz, String methodName) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(methodName, "Method name must not be null");
-		Method[] declaredMethods = clazz.getDeclaredMethods();
-		for (Method method : declaredMethods) {
-			if (method.getName().equals(methodName)) {
-				return true;
-			}
-		}
-		Class<?>[] ifcs = clazz.getInterfaces();
-		for (Class<?> ifc : ifcs) {
-			if (hasAtLeastOneMethodWithName(ifc, methodName)) {
-				return true;
-			}
-		}
-		return (clazz.getSuperclass() != null && hasAtLeastOneMethodWithName(clazz.getSuperclass(), methodName));
-	}
-
-	/**
-	 * Given a method, which may come from an interface, and a target class used
-	 * in the current reflective invocation, find the corresponding target method
-	 * if there is one &mdash; for example, the method may be {@code IFoo.bar()},
-	 * and the target class may be {@code DefaultFoo}. In this case, the method may be
-	 * {@code DefaultFoo.bar()}. This enables attributes on that method to be found.
-	 * <p><b>NOTE:</b> In contrast to {@link org.springframework.aop.support.AopUtils#getMostSpecificMethod},
-	 * this method does <i>not</i> resolve bridge methods automatically.
-	 * Call {@link org.springframework.core.BridgeMethodResolver#findBridgedMethod}
-	 * if bridge method resolution is desirable &mdash; for example, to obtain
-	 * metadata from the original method definition.
-	 * <p><b>NOTE:</b> If Java security settings disallow reflective access &mdash;
-	 * for example, calls to {@code Class#getDeclaredMethods}, etc. &mdash; this
-	 * implementation will fall back to returning the originally provided method.
-	 * @param method the method to be invoked, which may come from an interface
-	 * @param targetClass the target class for the current invocation
-	 * (can be {@code null} or may not even implement the method)
-	 * @return the specific target method, or the original method if the
-	 * {@code targetClass} does not implement it
-	 * @see #getInterfaceMethodIfPossible(Method, Class)
-	 */
-	public static Method getMostSpecificMethod(Method method, @Nullable Class<?> targetClass) {
-		if (targetClass != null && targetClass != method.getDeclaringClass() &&
-				(isOverridable(method, targetClass) || !method.getDeclaringClass().isAssignableFrom(targetClass))) {
-			try {
-				if (Modifier.isPublic(method.getModifiers())) {
-					try {
-						return targetClass.getMethod(method.getName(), method.getParameterTypes());
-					}
-					catch (NoSuchMethodException ex) {
-						return method;
-					}
-				}
-				else {
-					Method specificMethod =
-							ReflectionUtils.findMethod(targetClass, method.getName(), method.getParameterTypes());
-					return (specificMethod != null ? specificMethod : method);
-				}
-			}
-			catch (SecurityException ex) {
-				// Security settings are disallowing reflective access; fall back to 'method' below.
-			}
-		}
-		return method;
-	}
-
-	/**
-	 * Determine a corresponding interface method for the given method handle, if possible.
-	 * <p>This is particularly useful for arriving at a public exported type on Jigsaw
-	 * which can be reflectively invoked without an illegal access warning.
-	 * @param method the method to be invoked, potentially from an implementation class
-	 * @return the corresponding interface method, or the original method if none found
-	 * @since 5.1
-	 * @deprecated in favor of {@link #getInterfaceMethodIfPossible(Method, Class)}
-	 */
-	@Deprecated
-	public static Method getInterfaceMethodIfPossible(Method method) {
-		return getInterfaceMethodIfPossible(method, null);
-	}
-
-	/**
-	 * Determine a corresponding interface method for the given method handle, if possible.
-	 * <p>This is particularly useful for arriving at a public exported type on Jigsaw
-	 * which can be reflectively invoked without an illegal access warning.
-	 * @param method the method to be invoked, potentially from an implementation class
-	 * @param targetClass the target class to check for declared interfaces
-	 * @return the corresponding interface method, or the original method if none found
-	 * @since 5.3.16
-	 * @see #getMostSpecificMethod
-	 */
-	public static Method getInterfaceMethodIfPossible(Method method, @Nullable Class<?> targetClass) {
-		if (!Modifier.isPublic(method.getModifiers()) || method.getDeclaringClass().isInterface()) {
-			return method;
-		}
-		// Try cached version of method in its declaring class
-		Method result = interfaceMethodCache.computeIfAbsent(method,
-				key -> findInterfaceMethodIfPossible(key, key.getDeclaringClass(), Object.class));
-		if (result == method && targetClass != null) {
-			// No interface method found yet -> try given target class (possibly a subclass of the
-			// declaring class, late-binding a base class method to a subclass-declared interface:
-			// see e.g. HashMap.HashIterator.hasNext)
-			result = findInterfaceMethodIfPossible(method, targetClass, method.getDeclaringClass());
-		}
-		return result;
-	}
-
-	private static Method findInterfaceMethodIfPossible(Method method, Class<?> startClass, Class<?> endClass) {
-		Class<?> current = startClass;
-		while (current != null && current != endClass) {
-			Class<?>[] ifcs = current.getInterfaces();
-			for (Class<?> ifc : ifcs) {
-				try {
-					return ifc.getMethod(method.getName(), method.getParameterTypes());
-				}
-				catch (NoSuchMethodException ex) {
-					// ignore
-				}
-			}
-			current = current.getSuperclass();
-		}
-		return method;
-	}
-
-	/**
-	 * Determine whether the given method is declared by the user or at least pointing to
-	 * a user-declared method.
-	 * <p>Checks {@link Method#isSynthetic()} (for implementation methods) as well as the
-	 * {@code GroovyObject} interface (for interface methods; on an implementation class,
-	 * implementations of the {@code GroovyObject} methods will be marked as synthetic anyway).
-	 * Note that, despite being synthetic, bridge methods ({@link Method#isBridge()}) are considered
-	 * as user-level methods since they are eventually pointing to a user-declared generic method.
-	 * @param method the method to check
-	 * @return {@code true} if the method can be considered as user-declared; {@code false} otherwise
-	 */
-	public static boolean isUserLevelMethod(Method method) {
-		Assert.notNull(method, "Method must not be null");
-		return (method.isBridge() || (!method.isSynthetic() && !isGroovyObjectMethod(method)));
-	}
-
-	private static boolean isGroovyObjectMethod(Method method) {
-		return method.getDeclaringClass().getName().equals("groovy.lang.GroovyObject");
-	}
-
-	/**
-	 * Determine whether the given method is overridable in the given target class.
-	 * @param method the method to check
-	 * @param targetClass the target class to check against
-	 */
-	private static boolean isOverridable(Method method, @Nullable Class<?> targetClass) {
-		if ((method.getModifiers() & NON_OVERRIDABLE_MODIFIER) != 0) {
-			return false;
-		}
-		if ((method.getModifiers() & OVERRIDABLE_MODIFIER) != 0) {
-			return true;
-		}
-		return (targetClass == null ||
-				getPackageName(method.getDeclaringClass()).equals(getPackageName(targetClass)));
-	}
-
-	/**
-	 * Return a public static method of a class.
-	 * @param clazz the class which defines the method
-	 * @param methodName the static method name
-	 * @param args the parameter types to the method
-	 * @return the static method, or {@code null} if no static method was found
-	 * @throws IllegalArgumentException if the method name is blank or the clazz is null
-	 */
-	@Nullable
-	public static Method getStaticMethod(Class<?> clazz, String methodName, Class<?>... args) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(methodName, "Method name must not be null");
-		try {
-			Method method = clazz.getMethod(methodName, args);
-			return (Modifier.isStatic(method.getModifiers()) ? method : null);
-		}
-		catch (NoSuchMethodException ex) {
-			return null;
-		}
-	}
-
-
-	@Nullable
-	private static Method getMethodOrNull(Class<?> clazz, String methodName, Class<?>[] paramTypes) {
-		try {
-			return clazz.getMethod(methodName, paramTypes);
-		}
-		catch (NoSuchMethodException ex) {
-			return null;
-		}
-	}
-
-	private static Set<Method> findMethodCandidatesByName(Class<?> clazz, String methodName) {
-		Set<Method> candidates = new HashSet<>(1);
-		Method[] methods = clazz.getMethods();
-		for (Method method : methods) {
-			if (methodName.equals(method.getName())) {
-				candidates.add(method);
-			}
-		}
-		return candidates;
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
deleted file mode 100644
index d2f921f0..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/CollectionUtils.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.SortedSet;
-
-/**
- * Miscellaneous collection utility methods.
- * Mainly for internal use within the framework.
- *
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Arjen Poutsma
- * @since 1.1.3
- */
-public abstract class CollectionUtils {
-
-	/**
-	 * Default load factor for {@link HashMap}/{@link LinkedHashMap} variants.
-	 * @see #newHashMap(int)
-	 * @see #newLinkedHashMap(int)
-	 */
-	static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-
-	/**
-	 * Return {@code true} if the supplied Collection is {@code null} or empty.
-	 * Otherwise, return {@code false}.
-	 * @param collection the Collection to check
-	 * @return whether the given Collection is empty
-	 */
-	public static boolean isEmpty(@Nullable Collection<?> collection) {
-		return (collection == null || collection.isEmpty());
-	}
-
-	/**
-	 * Return {@code true} if the supplied Map is {@code null} or empty.
-	 * Otherwise, return {@code false}.
-	 * @param map the Map to check
-	 * @return whether the given Map is empty
-	 */
-	public static boolean isEmpty(@Nullable Map<?, ?> map) {
-		return (map == null || map.isEmpty());
-	}
-
-	/**
-	 * Instantiate a new {@link HashMap} with an initial capacity
-	 * that can accommodate the specified number of elements without
-	 * any immediate resize/rehash operations to be expected.
-	 * <p>This differs from the regular {@link HashMap} constructor
-	 * which takes an initial capacity relative to a load factor
-	 * but is effectively aligned with the JDK's
-	 * {@link java.util.concurrent.ConcurrentHashMap#ConcurrentHashMap(int)}.
-	 * @param expectedSize the expected number of elements (with a corresponding
-	 * capacity to be derived so that no resize/rehash operations are needed)
-	 * @since 5.3
-	 * @see #newLinkedHashMap(int)
-	 */
-	public static <K, V> HashMap<K, V> newHashMap(int expectedSize) {
-		return new HashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
-	}
-
-	/**
-	 * Instantiate a new {@link LinkedHashMap} with an initial capacity
-	 * that can accommodate the specified number of elements without
-	 * any immediate resize/rehash operations to be expected.
-	 * <p>This differs from the regular {@link LinkedHashMap} constructor
-	 * which takes an initial capacity relative to a load factor but is
-	 * aligned with Spring's own {@link LinkedCaseInsensitiveMap} and
-	 * {@link LinkedMultiValueMap} constructor semantics as of 5.3.
-	 * @param expectedSize the expected number of elements (with a corresponding
-	 * capacity to be derived so that no resize/rehash operations are needed)
-	 * @since 5.3
-	 * @see #newHashMap(int)
-	 */
-	public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(int expectedSize) {
-		return new LinkedHashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
-	}
-
-	private static int computeMapInitialCapacity(int expectedSize) {
-		return (int) Math.ceil(expectedSize / (double) DEFAULT_LOAD_FACTOR);
-	}
-
-	/**
-	 * Convert the supplied array into a List. A primitive array gets converted
-	 * into a List of the appropriate wrapper type.
-	 * <p><b>NOTE:</b> Generally prefer the standard {@link Arrays#asList} method.
-	 * This {@code arrayToList} method is just meant to deal with an incoming Object
-	 * value that might be an {@code Object[]} or a primitive array at runtime.
-	 * <p>A {@code null} source value will be converted to an empty List.
-	 * @param source the (potentially primitive) array
-	 * @return the converted List result
-	 * @see ObjectUtils#toObjectArray(Object)
-	 * @see Arrays#asList(Object[])
-	 */
-	public static List<?> arrayToList(@Nullable Object source) {
-		return Arrays.asList(ObjectUtils.toObjectArray(source));
-	}
-
-	/**
-	 * Merge the given array into the given Collection.
-	 * @param array the array to merge (may be {@code null})
-	 * @param collection the target Collection to merge the array into
-	 */
-	@SuppressWarnings("unchecked")
-	public static <E> void mergeArrayIntoCollection(@Nullable Object array, Collection<E> collection) {
-		Object[] arr = ObjectUtils.toObjectArray(array);
-		for (Object elem : arr) {
-			collection.add((E) elem);
-		}
-	}
-
-	/**
-	 * Merge the given Properties instance into the given Map,
-	 * copying all properties (key-value pairs) over.
-	 * <p>Uses {@code Properties.propertyNames()} to even catch
-	 * default properties linked into the original Properties instance.
-	 * @param props the Properties instance to merge (may be {@code null})
-	 * @param map the target Map to merge the properties into
-	 */
-	@SuppressWarnings("unchecked")
-	public static <K, V> void mergePropertiesIntoMap(@Nullable Properties props, Map<K, V> map) {
-		if (props != null) {
-			for (Enumeration<?> en = props.propertyNames(); en.hasMoreElements();) {
-				String key = (String) en.nextElement();
-				Object value = props.get(key);
-				if (value == null) {
-					// Allow for defaults fallback or potentially overridden accessor...
-					value = props.getProperty(key);
-				}
-				map.put((K) key, (V) value);
-			}
-		}
-	}
-
-
-	/**
-	 * Check whether the given Iterator contains the given element.
-	 * @param iterator the Iterator to check
-	 * @param element the element to look for
-	 * @return {@code true} if found, {@code false} otherwise
-	 */
-	public static boolean contains(@Nullable Iterator<?> iterator, Object element) {
-		if (iterator != null) {
-			while (iterator.hasNext()) {
-				Object candidate = iterator.next();
-				if (ObjectUtils.nullSafeEquals(candidate, element)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given Enumeration contains the given element.
-	 * @param enumeration the Enumeration to check
-	 * @param element the element to look for
-	 * @return {@code true} if found, {@code false} otherwise
-	 */
-	public static boolean contains(@Nullable Enumeration<?> enumeration, Object element) {
-		if (enumeration != null) {
-			while (enumeration.hasMoreElements()) {
-				Object candidate = enumeration.nextElement();
-				if (ObjectUtils.nullSafeEquals(candidate, element)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given Collection contains the given element instance.
-	 * <p>Enforces the given instance to be present, rather than returning
-	 * {@code true} for an equal element as well.
-	 * @param collection the Collection to check
-	 * @param element the element to look for
-	 * @return {@code true} if found, {@code false} otherwise
-	 */
-	public static boolean containsInstance(@Nullable Collection<?> collection, Object element) {
-		if (collection != null) {
-			for (Object candidate : collection) {
-				if (candidate == element) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return {@code true} if any element in '{@code candidates}' is
-	 * contained in '{@code source}'; otherwise returns {@code false}.
-	 * @param source the source Collection
-	 * @param candidates the candidates to search for
-	 * @return whether any of the candidates has been found
-	 */
-	public static boolean containsAny(Collection<?> source, Collection<?> candidates) {
-		return findFirstMatch(source, candidates) != null;
-	}
-
-	/**
-	 * Return the first element in '{@code candidates}' that is contained in
-	 * '{@code source}'. If no element in '{@code candidates}' is present in
-	 * '{@code source}' returns {@code null}. Iteration order is
-	 * {@link Collection} implementation specific.
-	 * @param source the source Collection
-	 * @param candidates the candidates to search for
-	 * @return the first present object, or {@code null} if not found
-	 */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public static <E> E findFirstMatch(Collection<?> source, Collection<E> candidates) {
-		if (isEmpty(source) || isEmpty(candidates)) {
-			return null;
-		}
-		for (Object candidate : candidates) {
-			if (source.contains(candidate)) {
-				return (E) candidate;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Find a single value of the given type in the given Collection.
-	 * @param collection the Collection to search
-	 * @param type the type to look for
-	 * @return a value of the given type found if there is a clear match,
-	 * or {@code null} if none or more than one such value found
-	 */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public static <T> T findValueOfType(Collection<?> collection, @Nullable Class<T> type) {
-		if (isEmpty(collection)) {
-			return null;
-		}
-		T value = null;
-		for (Object element : collection) {
-			if (type == null || type.isInstance(element)) {
-				if (value != null) {
-					// More than one value found... no clear single value.
-					return null;
-				}
-				value = (T) element;
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * Find a single value of one of the given types in the given Collection:
-	 * searching the Collection for a value of the first type, then
-	 * searching for a value of the second type, etc.
-	 * @param collection the collection to search
-	 * @param types the types to look for, in prioritized order
-	 * @return a value of one of the given types found if there is a clear match,
-	 * or {@code null} if none or more than one such value found
-	 */
-	@Nullable
-	public static Object findValueOfType(Collection<?> collection, Class<?>[] types) {
-		if (isEmpty(collection) || ObjectUtils.isEmpty(types)) {
-			return null;
-		}
-		for (Class<?> type : types) {
-			Object value = findValueOfType(collection, type);
-			if (value != null) {
-				return value;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Determine whether the given Collection only contains a single unique object.
-	 * @param collection the Collection to check
-	 * @return {@code true} if the collection contains a single reference or
-	 * multiple references to the same instance, {@code false} otherwise
-	 */
-	public static boolean hasUniqueObject(Collection<?> collection) {
-		if (isEmpty(collection)) {
-			return false;
-		}
-		boolean hasCandidate = false;
-		Object candidate = null;
-		for (Object elem : collection) {
-			if (!hasCandidate) {
-				hasCandidate = true;
-				candidate = elem;
-			}
-			else if (candidate != elem) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Find the common element type of the given Collection, if any.
-	 * @param collection the Collection to check
-	 * @return the common element type, or {@code null} if no clear
-	 * common type has been found (or the collection was empty)
-	 */
-	@Nullable
-	public static Class<?> findCommonElementType(Collection<?> collection) {
-		if (isEmpty(collection)) {
-			return null;
-		}
-		Class<?> candidate = null;
-		for (Object val : collection) {
-			if (val != null) {
-				if (candidate == null) {
-					candidate = val.getClass();
-				}
-				else if (candidate != val.getClass()) {
-					return null;
-				}
-			}
-		}
-		return candidate;
-	}
-
-	/**
-	 * Retrieve the first element of the given Set, using {@link SortedSet#first()}
-	 * or otherwise using the iterator.
-	 * @param set the Set to check (may be {@code null} or empty)
-	 * @return the first element, or {@code null} if none
-	 * @since 5.2.3
-	 * @see SortedSet
-	 * @see LinkedHashMap#keySet()
-	 * @see java.util.LinkedHashSet
-	 */
-	@Nullable
-	public static <T> T firstElement(@Nullable Set<T> set) {
-		if (isEmpty(set)) {
-			return null;
-		}
-		if (set instanceof SortedSet) {
-			return ((SortedSet<T>) set).first();
-		}
-
-		Iterator<T> it = set.iterator();
-		T first = null;
-		if (it.hasNext()) {
-			first = it.next();
-		}
-		return first;
-	}
-
-	/**
-	 * Retrieve the first element of the given List, accessing the zero index.
-	 * @param list the List to check (may be {@code null} or empty)
-	 * @return the first element, or {@code null} if none
-	 * @since 5.2.3
-	 */
-	@Nullable
-	public static <T> T firstElement(@Nullable List<T> list) {
-		if (isEmpty(list)) {
-			return null;
-		}
-		return list.get(0);
-	}
-
-	/**
-	 * Retrieve the last element of the given Set, using {@link SortedSet#last()}
-	 * or otherwise iterating over all elements (assuming a linked set).
-	 * @param set the Set to check (may be {@code null} or empty)
-	 * @return the last element, or {@code null} if none
-	 * @since 5.0.3
-	 * @see SortedSet
-	 * @see LinkedHashMap#keySet()
-	 * @see java.util.LinkedHashSet
-	 */
-	@Nullable
-	public static <T> T lastElement(@Nullable Set<T> set) {
-		if (isEmpty(set)) {
-			return null;
-		}
-		if (set instanceof SortedSet) {
-			return ((SortedSet<T>) set).last();
-		}
-
-		// Full iteration necessary...
-		Iterator<T> it = set.iterator();
-		T last = null;
-		while (it.hasNext()) {
-			last = it.next();
-		}
-		return last;
-	}
-
-	/**
-	 * Retrieve the last element of the given List, accessing the highest index.
-	 * @param list the List to check (may be {@code null} or empty)
-	 * @return the last element, or {@code null} if none
-	 * @since 5.0.3
-	 */
-	@Nullable
-	public static <T> T lastElement(@Nullable List<T> list) {
-		if (isEmpty(list)) {
-			return null;
-		}
-		return list.get(list.size() - 1);
-	}
-
-	/**
-	 * Marshal the elements from the given enumeration into an array of the given type.
-	 * Enumeration elements must be assignable to the type of the given array. The array
-	 * returned will be a different instance than the array given.
-	 */
-	public static <A, E extends A> A[] toArray(Enumeration<E> enumeration, A[] array) {
-		ArrayList<A> elements = new ArrayList<>();
-		while (enumeration.hasMoreElements()) {
-			elements.add(enumeration.nextElement());
-		}
-		return elements.toArray(array);
-	}
-
-	/**
-	 * Adapt an {@link Enumeration} to an {@link Iterator}.
-	 * @param enumeration the original {@code Enumeration}
-	 * @return the adapted {@code Iterator}
-	 */
-	public static <E> Iterator<E> toIterator(@Nullable Enumeration<E> enumeration) {
-		return (enumeration != null ? new EnumerationIterator<>(enumeration) : Collections.emptyIterator());
-	}
-
-	/**
-	 * Adapt a {@code Map<K, List<V>>} to an {@code MultiValueMap<K, V>}.
-	 * @param targetMap the original map
-	 * @return the adapted multi-value map (wrapping the original map)
-	 * @since 3.1
-	 */
-	public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> targetMap) {
-		return new MultiValueMapAdapter<>(targetMap);
-	}
-
-	/**
-	 * Return an unmodifiable view of the specified multi-value map.
-	 * @param targetMap the map for which an unmodifiable view is to be returned.
-	 * @return an unmodifiable view of the specified multi-value map
-	 * @since 3.1
-	 */
-	@SuppressWarnings("unchecked")
-	public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(
-			MultiValueMap<? extends K, ? extends V> targetMap) {
-
-		Assert.notNull(targetMap, "'targetMap' must not be null");
-		Map<K, List<V>> result = newLinkedHashMap(targetMap.size());
-		targetMap.forEach((key, value) -> {
-			List<? extends V> values = Collections.unmodifiableList(value);
-			result.put(key, (List<V>) values);
-		});
-		Map<K, List<V>> unmodifiableMap = Collections.unmodifiableMap(result);
-		return toMultiValueMap(unmodifiableMap);
-	}
-
-
-	/**
-	 * Iterator wrapping an Enumeration.
-	 */
-	private static class EnumerationIterator<E> implements Iterator<E> {
-
-		private final Enumeration<E> enumeration;
-
-		public EnumerationIterator(Enumeration<E> enumeration) {
-			this.enumeration = enumeration;
-		}
-
-		@Override
-		public boolean hasNext() {
-			return this.enumeration.hasMoreElements();
-		}
-
-		@Override
-		public E next() {
-			return this.enumeration.nextElement();
-		}
-
-		@Override
-		public void remove() throws UnsupportedOperationException {
-			throw new UnsupportedOperationException("Not supported");
-		}
-	}
-
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
deleted file mode 100644
index 9fdf5b17..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
+++ /dev/null
@@ -1,1092 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Array;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * A {@link ConcurrentHashMap} that uses {@link ReferenceType#SOFT soft} or
- * {@linkplain ReferenceType#WEAK weak} references for both {@code keys} and {@code values}.
- *
- * <p>This class can be used as an alternative to
- * {@code Collections.synchronizedMap(new WeakHashMap<K, Reference<V>>())} in order to
- * support better performance when accessed concurrently. This implementation follows the
- * same design constraints as {@link ConcurrentHashMap} with the exception that
- * {@code null} values and {@code null} keys are supported.
- *
- * <p><b>NOTE:</b> The use of references means that there is no guarantee that items
- * placed into the map will be subsequently available. The garbage collector may discard
- * references at any time, so it may appear that an unknown thread is silently removing
- * entries.
- *
- * <p>If not explicitly specified, this implementation will use
- * {@linkplain SoftReference soft entry references}.
- *
- * @author Phillip Webb
- * @author Juergen Hoeller
- * @since 3.2
- * @param <K> the key type
- * @param <V> the value type
- */
-public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
-
-	private static final int DEFAULT_INITIAL_CAPACITY = 16;
-
-	private static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-	private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
-
-	private static final ReferenceType DEFAULT_REFERENCE_TYPE = ReferenceType.SOFT;
-
-	private static final int MAXIMUM_CONCURRENCY_LEVEL = 1 << 16;
-
-	private static final int MAXIMUM_SEGMENT_SIZE = 1 << 30;
-
-
-	/**
-	 * Array of segments indexed using the high order bits from the hash.
-	 */
-	private final Segment[] segments;
-
-	/**
-	 * When the average number of references per table exceeds this value resize will be attempted.
-	 */
-	private final float loadFactor;
-
-	/**
-	 * The reference type: SOFT or WEAK.
-	 */
-	private final ReferenceType referenceType;
-
-	/**
-	 * The shift value used to calculate the size of the segments array and an index from the hash.
-	 */
-	private final int shift;
-
-	/**
-	 * Late binding entry set.
-	 */
-	@Nullable
-	private volatile Set<Map.Entry<K, V>> entrySet;
-
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 */
-	public ConcurrentReferenceHashMap() {
-		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 */
-	public ConcurrentReferenceHashMap(int initialCapacity) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per table
-	 * exceeds this value resize will be attempted
-	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
-		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 * @param concurrencyLevel the expected number of threads that will concurrently
-	 * write to the map
-	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, int concurrencyLevel) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 * @param referenceType the reference type used for entries (soft or weak)
-	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, ReferenceType referenceType) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, referenceType);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per
-	 * table exceeds this value, resize will be attempted.
-	 * @param concurrencyLevel the expected number of threads that will concurrently
-	 * write to the map
-	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel) {
-		this(initialCapacity, loadFactor, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
-	}
-
-	/**
-	 * Create a new {@code ConcurrentReferenceHashMap} instance.
-	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per
-	 * table exceeds this value, resize will be attempted.
-	 * @param concurrencyLevel the expected number of threads that will concurrently
-	 * write to the map
-	 * @param referenceType the reference type used for entries (soft or weak)
-	 */
-	@SuppressWarnings("unchecked")
-	public ConcurrentReferenceHashMap(
-			int initialCapacity, float loadFactor, int concurrencyLevel, ReferenceType referenceType) {
-
-		Assert.isTrue(initialCapacity >= 0, "Initial capacity must not be negative");
-		Assert.isTrue(loadFactor > 0f, "Load factor must be positive");
-		Assert.isTrue(concurrencyLevel > 0, "Concurrency level must be positive");
-		Assert.notNull(referenceType, "Reference type must not be null");
-		this.loadFactor = loadFactor;
-		this.shift = calculateShift(concurrencyLevel, MAXIMUM_CONCURRENCY_LEVEL);
-		int size = 1 << this.shift;
-		this.referenceType = referenceType;
-		int roundedUpSegmentCapacity = (int) ((initialCapacity + size - 1L) / size);
-		int initialSize = 1 << calculateShift(roundedUpSegmentCapacity, MAXIMUM_SEGMENT_SIZE);
-		Segment[] segments = (Segment[]) Array.newInstance(Segment.class, size);
-		int resizeThreshold = (int) (initialSize * getLoadFactor());
-		for (int i = 0; i < segments.length; i++) {
-			segments[i] = new Segment(initialSize, resizeThreshold);
-		}
-		this.segments = segments;
-	}
-
-
-	protected final float getLoadFactor() {
-		return this.loadFactor;
-	}
-
-	protected final int getSegmentsSize() {
-		return this.segments.length;
-	}
-
-	protected final Segment getSegment(int index) {
-		return this.segments[index];
-	}
-
-	/**
-	 * Factory method that returns the {@link ReferenceManager}.
-	 * This method will be called once for each {@link Segment}.
-	 * @return a new reference manager
-	 */
-	protected ReferenceManager createReferenceManager() {
-		return new ReferenceManager();
-	}
-
-	/**
-	 * Get the hash for a given object, apply an additional hash function to reduce
-	 * collisions. This implementation uses the same Wang/Jenkins algorithm as
-	 * {@link ConcurrentHashMap}. Subclasses can override to provide alternative hashing.
-	 * @param o the object to hash (may be null)
-	 * @return the resulting hash code
-	 */
-	protected int getHash(@Nullable Object o) {
-		int hash = (o != null ? o.hashCode() : 0);
-		hash += (hash << 15) ^ 0xffffcd7d;
-		hash ^= (hash >>> 10);
-		hash += (hash << 3);
-		hash ^= (hash >>> 6);
-		hash += (hash << 2) + (hash << 14);
-		hash ^= (hash >>> 16);
-		return hash;
-	}
-
-	@Override
-	@Nullable
-	public V get(@Nullable Object key) {
-		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
-		Entry<K, V> entry = (ref != null ? ref.get() : null);
-		return (entry != null ? entry.getValue() : null);
-	}
-
-	@Override
-	@Nullable
-	public V getOrDefault(@Nullable Object key, @Nullable V defaultValue) {
-		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
-		Entry<K, V> entry = (ref != null ? ref.get() : null);
-		return (entry != null ? entry.getValue() : defaultValue);
-	}
-
-	@Override
-	public boolean containsKey(@Nullable Object key) {
-		Reference<K, V> ref = getReference(key, Restructure.WHEN_NECESSARY);
-		Entry<K, V> entry = (ref != null ? ref.get() : null);
-		return (entry != null && ObjectUtils.nullSafeEquals(entry.getKey(), key));
-	}
-
-	/**
-	 * Return a {@link Reference} to the {@link Entry} for the specified {@code key},
-	 * or {@code null} if not found.
-	 * @param key the key (can be {@code null})
-	 * @param restructure types of restructure allowed during this call
-	 * @return the reference, or {@code null} if not found
-	 */
-	@Nullable
-	protected final Reference<K, V> getReference(@Nullable Object key, Restructure restructure) {
-		int hash = getHash(key);
-		return getSegmentForHash(hash).getReference(key, hash, restructure);
-	}
-
-	@Override
-	@Nullable
-	public V put(@Nullable K key, @Nullable V value) {
-		return put(key, value, true);
-	}
-
-	@Override
-	@Nullable
-	public V putIfAbsent(@Nullable K key, @Nullable V value) {
-		return put(key, value, false);
-	}
-
-	@Nullable
-	private V put(@Nullable final K key, @Nullable final V value, final boolean overwriteExisting) {
-		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.RESIZE) {
-			@Override
-			@Nullable
-			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
-				if (entry != null) {
-					V oldValue = entry.getValue();
-					if (overwriteExisting) {
-						entry.setValue(value);
-					}
-					return oldValue;
-				}
-				Assert.state(entries != null, "No entries segment");
-				entries.add(value);
-				return null;
-			}
-		});
-	}
-
-	@Override
-	@Nullable
-	public V remove(@Nullable Object key) {
-		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_AFTER, TaskOption.SKIP_IF_EMPTY) {
-			@Override
-			@Nullable
-			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
-				if (entry != null) {
-					if (ref != null) {
-						ref.release();
-					}
-					return entry.value;
-				}
-				return null;
-			}
-		});
-	}
-
-	@Override
-	public boolean remove(@Nullable Object key, final @Nullable Object value) {
-		Boolean result = doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_AFTER, TaskOption.SKIP_IF_EMPTY) {
-			@Override
-			protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
-				if (entry != null && ObjectUtils.nullSafeEquals(entry.getValue(), value)) {
-					if (ref != null) {
-						ref.release();
-					}
-					return true;
-				}
-				return false;
-			}
-		});
-		return (Boolean.TRUE.equals(result));
-	}
-
-	@Override
-	public boolean replace(@Nullable K key, final @Nullable V oldValue, final @Nullable V newValue) {
-		Boolean result = doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
-			@Override
-			protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
-				if (entry != null && ObjectUtils.nullSafeEquals(entry.getValue(), oldValue)) {
-					entry.setValue(newValue);
-					return true;
-				}
-				return false;
-			}
-		});
-		return (Boolean.TRUE.equals(result));
-	}
-
-	@Override
-	@Nullable
-	public V replace(@Nullable K key, final @Nullable V value) {
-		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
-			@Override
-			@Nullable
-			protected V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
-				if (entry != null) {
-					V oldValue = entry.getValue();
-					entry.setValue(value);
-					return oldValue;
-				}
-				return null;
-			}
-		});
-	}
-
-	@Override
-	public void clear() {
-		for (Segment segment : this.segments) {
-			segment.clear();
-		}
-	}
-
-	/**
-	 * Remove any entries that have been garbage collected and are no longer referenced.
-	 * Under normal circumstances garbage collected entries are automatically purged as
-	 * items are added or removed from the Map. This method can be used to force a purge,
-	 * and is useful when the Map is read frequently but updated less often.
-	 */
-	public void purgeUnreferencedEntries() {
-		for (Segment segment : this.segments) {
-			segment.restructureIfNecessary(false);
-		}
-	}
-
-
-	@Override
-	public int size() {
-		int size = 0;
-		for (Segment segment : this.segments) {
-			size += segment.getCount();
-		}
-		return size;
-	}
-
-	@Override
-	public boolean isEmpty() {
-		for (Segment segment : this.segments) {
-			if (segment.getCount() > 0) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public Set<Map.Entry<K, V>> entrySet() {
-		Set<Map.Entry<K, V>> entrySet = this.entrySet;
-		if (entrySet == null) {
-			entrySet = new EntrySet();
-			this.entrySet = entrySet;
-		}
-		return entrySet;
-	}
-
-	@Nullable
-	private <T> T doTask(@Nullable Object key, Task<T> task) {
-		int hash = getHash(key);
-		return getSegmentForHash(hash).doTask(hash, key, task);
-	}
-
-	private Segment getSegmentForHash(int hash) {
-		return this.segments[(hash >>> (32 - this.shift)) & (this.segments.length - 1)];
-	}
-
-	/**
-	 * Calculate a shift value that can be used to create a power-of-two value between
-	 * the specified maximum and minimum values.
-	 * @param minimumValue the minimum value
-	 * @param maximumValue the maximum value
-	 * @return the calculated shift (use {@code 1 << shift} to obtain a value)
-	 */
-	protected static int calculateShift(int minimumValue, int maximumValue) {
-		int shift = 0;
-		int value = 1;
-		while (value < minimumValue && value < maximumValue) {
-			value <<= 1;
-			shift++;
-		}
-		return shift;
-	}
-
-
-	/**
-	 * Various reference types supported by this map.
-	 */
-	public enum ReferenceType {
-
-		/** Use {@link SoftReference SoftReferences}. */
-		SOFT,
-
-		/** Use {@link WeakReference WeakReferences}. */
-		WEAK
-	}
-
-
-	/**
-	 * A single segment used to divide the map to allow better concurrent performance.
-	 */
-	@SuppressWarnings("serial")
-	protected final class Segment extends ReentrantLock {
-
-		private final ReferenceManager referenceManager;
-
-		private final int initialSize;
-
-		/**
-		 * Array of references indexed using the low order bits from the hash.
-		 * This property should only be set along with {@code resizeThreshold}.
-		 */
-		private volatile Reference<K, V>[] references;
-
-		/**
-		 * The total number of references contained in this segment. This includes chained
-		 * references and references that have been garbage collected but not purged.
-		 */
-		private final AtomicInteger count = new AtomicInteger();
-
-		/**
-		 * The threshold when resizing of the references should occur. When {@code count}
-		 * exceeds this value references will be resized.
-		 */
-		private int resizeThreshold;
-
-		public Segment(int initialSize, int resizeThreshold) {
-			this.referenceManager = createReferenceManager();
-			this.initialSize = initialSize;
-			this.references = createReferenceArray(initialSize);
-			this.resizeThreshold = resizeThreshold;
-		}
-
-		@Nullable
-		public Reference<K, V> getReference(@Nullable Object key, int hash, Restructure restructure) {
-			if (restructure == Restructure.WHEN_NECESSARY) {
-				restructureIfNecessary(false);
-			}
-			if (this.count.get() == 0) {
-				return null;
-			}
-			// Use a local copy to protect against other threads writing
-			Reference<K, V>[] references = this.references;
-			int index = getIndex(hash, references);
-			Reference<K, V> head = references[index];
-			return findInChain(head, key, hash);
-		}
-
-		/**
-		 * Apply an update operation to this segment.
-		 * The segment will be locked during the update.
-		 * @param hash the hash of the key
-		 * @param key the key
-		 * @param task the update operation
-		 * @return the result of the operation
-		 */
-		@Nullable
-		public <T> T doTask(final int hash, @Nullable final Object key, final Task<T> task) {
-			boolean resize = task.hasOption(TaskOption.RESIZE);
-			if (task.hasOption(TaskOption.RESTRUCTURE_BEFORE)) {
-				restructureIfNecessary(resize);
-			}
-			if (task.hasOption(TaskOption.SKIP_IF_EMPTY) && this.count.get() == 0) {
-				return task.execute(null, null, null);
-			}
-			lock();
-			try {
-				final int index = getIndex(hash, this.references);
-				final Reference<K, V> head = this.references[index];
-				Reference<K, V> ref = findInChain(head, key, hash);
-				Entry<K, V> entry = (ref != null ? ref.get() : null);
-				Entries<V> entries = value -> {
-					@SuppressWarnings("unchecked")
-					Entry<K, V> newEntry = new Entry<>((K) key, value);
-					Reference<K, V> newReference = Segment.this.referenceManager.createReference(newEntry, hash, head);
-					Segment.this.references[index] = newReference;
-					Segment.this.count.incrementAndGet();
-				};
-				return task.execute(ref, entry, entries);
-			}
-			finally {
-				unlock();
-				if (task.hasOption(TaskOption.RESTRUCTURE_AFTER)) {
-					restructureIfNecessary(resize);
-				}
-			}
-		}
-
-		/**
-		 * Clear all items from this segment.
-		 */
-		public void clear() {
-			if (this.count.get() == 0) {
-				return;
-			}
-			lock();
-			try {
-				this.references = createReferenceArray(this.initialSize);
-				this.resizeThreshold = (int) (this.references.length * getLoadFactor());
-				this.count.set(0);
-			}
-			finally {
-				unlock();
-			}
-		}
-
-		/**
-		 * Restructure the underlying data structure when it becomes necessary. This
-		 * method can increase the size of the references table as well as purge any
-		 * references that have been garbage collected.
-		 * @param allowResize if resizing is permitted
-		 */
-		protected final void restructureIfNecessary(boolean allowResize) {
-			int currCount = this.count.get();
-			boolean needsResize = allowResize && (currCount > 0 && currCount >= this.resizeThreshold);
-			Reference<K, V> ref = this.referenceManager.pollForPurge();
-			if (ref != null || (needsResize)) {
-				restructure(allowResize, ref);
-			}
-		}
-
-		private void restructure(boolean allowResize, @Nullable Reference<K, V> ref) {
-			boolean needsResize;
-			lock();
-			try {
-				int countAfterRestructure = this.count.get();
-				Set<Reference<K, V>> toPurge = Collections.emptySet();
-				if (ref != null) {
-					toPurge = new HashSet<>();
-					while (ref != null) {
-						toPurge.add(ref);
-						ref = this.referenceManager.pollForPurge();
-					}
-				}
-				countAfterRestructure -= toPurge.size();
-
-				// Recalculate taking into account count inside lock and items that
-				// will be purged
-				needsResize = (countAfterRestructure > 0 && countAfterRestructure >= this.resizeThreshold);
-				boolean resizing = false;
-				int restructureSize = this.references.length;
-				if (allowResize && needsResize && restructureSize < MAXIMUM_SEGMENT_SIZE) {
-					restructureSize <<= 1;
-					resizing = true;
-				}
-
-				// Either create a new table or reuse the existing one
-				Reference<K, V>[] restructured =
-						(resizing ? createReferenceArray(restructureSize) : this.references);
-
-				// Restructure
-				for (int i = 0; i < this.references.length; i++) {
-					ref = this.references[i];
-					if (!resizing) {
-						restructured[i] = null;
-					}
-					while (ref != null) {
-						if (!toPurge.contains(ref)) {
-							Entry<K, V> entry = ref.get();
-							if (entry != null) {
-								int index = getIndex(ref.getHash(), restructured);
-								restructured[index] = this.referenceManager.createReference(
-										entry, ref.getHash(), restructured[index]);
-							}
-						}
-						ref = ref.getNext();
-					}
-				}
-
-				// Replace volatile members
-				if (resizing) {
-					this.references = restructured;
-					this.resizeThreshold = (int) (this.references.length * getLoadFactor());
-				}
-				this.count.set(Math.max(countAfterRestructure, 0));
-			}
-			finally {
-				unlock();
-			}
-		}
-
-		@Nullable
-		private Reference<K, V> findInChain(Reference<K, V> ref, @Nullable Object key, int hash) {
-			Reference<K, V> currRef = ref;
-			while (currRef != null) {
-				if (currRef.getHash() == hash) {
-					Entry<K, V> entry = currRef.get();
-					if (entry != null) {
-						K entryKey = entry.getKey();
-						if (ObjectUtils.nullSafeEquals(entryKey, key)) {
-							return currRef;
-						}
-					}
-				}
-				currRef = currRef.getNext();
-			}
-			return null;
-		}
-
-		@SuppressWarnings({"rawtypes", "unchecked"})
-		private Reference<K, V>[] createReferenceArray(int size) {
-			return new Reference[size];
-		}
-
-		private int getIndex(int hash, Reference<K, V>[] references) {
-			return (hash & (references.length - 1));
-		}
-
-		/**
-		 * Return the size of the current references array.
-		 */
-		public final int getSize() {
-			return this.references.length;
-		}
-
-		/**
-		 * Return the total number of references in this segment.
-		 */
-		public final int getCount() {
-			return this.count.get();
-		}
-	}
-
-
-	/**
-	 * A reference to an {@link Entry} contained in the map. Implementations are usually
-	 * wrappers around specific Java reference implementations (e.g., {@link SoftReference}).
-	 * @param <K> the key type
-	 * @param <V> the value type
-	 */
-	protected interface Reference<K, V> {
-
-		/**
-		 * Return the referenced entry, or {@code null} if the entry is no longer available.
-		 */
-		@Nullable
-		Entry<K, V> get();
-
-		/**
-		 * Return the hash for the reference.
-		 */
-		int getHash();
-
-		/**
-		 * Return the next reference in the chain, or {@code null} if none.
-		 */
-		@Nullable
-		Reference<K, V> getNext();
-
-		/**
-		 * Release this entry and ensure that it will be returned from
-		 * {@code ReferenceManager#pollForPurge()}.
-		 */
-		void release();
-	}
-
-
-	/**
-	 * A single map entry.
-	 * @param <K> the key type
-	 * @param <V> the value type
-	 */
-	protected static final class Entry<K, V> implements Map.Entry<K, V> {
-
-		@Nullable
-		private final K key;
-
-		@Nullable
-		private volatile V value;
-
-		public Entry(@Nullable K key, @Nullable V value) {
-			this.key = key;
-			this.value = value;
-		}
-
-		@Override
-		@Nullable
-		public K getKey() {
-			return this.key;
-		}
-
-		@Override
-		@Nullable
-		public V getValue() {
-			return this.value;
-		}
-
-		@Override
-		@Nullable
-		public V setValue(@Nullable V value) {
-			V previous = this.value;
-			this.value = value;
-			return previous;
-		}
-
-		@Override
-		public boolean equals(@Nullable Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (!(other instanceof Map.Entry<?, ?>)) {
-				return false;
-			}
-			Map.Entry<?, ?> otherEntry = (Map.Entry<?, ?>) other;
-			return (ObjectUtils.nullSafeEquals(getKey(), otherEntry.getKey()) &&
-					ObjectUtils.nullSafeEquals(getValue(), otherEntry.getValue()));
-		}
-
-		@Override
-		public int hashCode() {
-			return (ObjectUtils.nullSafeHashCode(this.key) ^ ObjectUtils.nullSafeHashCode(this.value));
-		}
-
-		@Override
-		public String toString() {
-			return (this.key + "=" + this.value);
-		}
-	}
-
-
-	/**
-	 * A task that can be {@link Segment#doTask run} against a {@link Segment}.
-	 */
-	private abstract class Task<T> {
-
-		private final EnumSet<TaskOption> options;
-
-		public Task(TaskOption... options) {
-			this.options = (options.length == 0 ? EnumSet.noneOf(TaskOption.class) : EnumSet.of(options[0], options));
-		}
-
-		public boolean hasOption(TaskOption option) {
-			return this.options.contains(option);
-		}
-
-		/**
-		 * Execute the task.
-		 * @param ref the found reference (or {@code null})
-		 * @param entry the found entry (or {@code null})
-		 * @param entries access to the underlying entries
-		 * @return the result of the task
-		 * @see #execute(Reference, Entry)
-		 */
-		@Nullable
-		protected T execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
-			return execute(ref, entry);
-		}
-
-		/**
-		 * Convenience method that can be used for tasks that do not need access to {@link Entries}.
-		 * @param ref the found reference (or {@code null})
-		 * @param entry the found entry (or {@code null})
-		 * @return the result of the task
-		 * @see #execute(Reference, Entry, Entries)
-		 */
-		@Nullable
-		protected T execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry) {
-			return null;
-		}
-	}
-
-
-	/**
-	 * Various options supported by a {@code Task}.
-	 */
-	private enum TaskOption {
-
-		RESTRUCTURE_BEFORE, RESTRUCTURE_AFTER, SKIP_IF_EMPTY, RESIZE
-	}
-
-
-	/**
-	 * Allows a task access to {@link Segment} entries.
-	 */
-	private interface Entries<V> {
-
-		/**
-		 * Add a new entry with the specified value.
-		 * @param value the value to add
-		 */
-		void add(@Nullable V value);
-	}
-
-
-	/**
-	 * Internal entry-set implementation.
-	 */
-	private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
-
-		@Override
-		public Iterator<Map.Entry<K, V>> iterator() {
-			return new EntryIterator();
-		}
-
-		@Override
-		public boolean contains(@Nullable Object o) {
-			if (o instanceof Map.Entry<?, ?>) {
-				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
-				Reference<K, V> ref = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
-				Entry<K, V> otherEntry = (ref != null ? ref.get() : null);
-				if (otherEntry != null) {
-					return ObjectUtils.nullSafeEquals(entry.getValue(), otherEntry.getValue());
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public boolean remove(Object o) {
-			if (o instanceof Map.Entry<?, ?>) {
-				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
-				return ConcurrentReferenceHashMap.this.remove(entry.getKey(), entry.getValue());
-			}
-			return false;
-		}
-
-		@Override
-		public int size() {
-			return ConcurrentReferenceHashMap.this.size();
-		}
-
-		@Override
-		public void clear() {
-			ConcurrentReferenceHashMap.this.clear();
-		}
-	}
-
-
-	/**
-	 * Internal entry iterator implementation.
-	 */
-	private class EntryIterator implements Iterator<Map.Entry<K, V>> {
-
-		private int segmentIndex;
-
-		private int referenceIndex;
-
-		@Nullable
-		private Reference<K, V>[] references;
-
-		@Nullable
-		private Reference<K, V> reference;
-
-		@Nullable
-		private Entry<K, V> next;
-
-		@Nullable
-		private Entry<K, V> last;
-
-		public EntryIterator() {
-			moveToNextSegment();
-		}
-
-		@Override
-		public boolean hasNext() {
-			getNextIfNecessary();
-			return (this.next != null);
-		}
-
-		@Override
-		public Entry<K, V> next() {
-			getNextIfNecessary();
-			if (this.next == null) {
-				throw new NoSuchElementException();
-			}
-			this.last = this.next;
-			this.next = null;
-			return this.last;
-		}
-
-		private void getNextIfNecessary() {
-			while (this.next == null) {
-				moveToNextReference();
-				if (this.reference == null) {
-					return;
-				}
-				this.next = this.reference.get();
-			}
-		}
-
-		private void moveToNextReference() {
-			if (this.reference != null) {
-				this.reference = this.reference.getNext();
-			}
-			while (this.reference == null && this.references != null) {
-				if (this.referenceIndex >= this.references.length) {
-					moveToNextSegment();
-					this.referenceIndex = 0;
-				}
-				else {
-					this.reference = this.references[this.referenceIndex];
-					this.referenceIndex++;
-				}
-			}
-		}
-
-		private void moveToNextSegment() {
-			this.reference = null;
-			this.references = null;
-			if (this.segmentIndex < ConcurrentReferenceHashMap.this.segments.length) {
-				this.references = ConcurrentReferenceHashMap.this.segments[this.segmentIndex].references;
-				this.segmentIndex++;
-			}
-		}
-
-		@Override
-		public void remove() {
-			Assert.state(this.last != null, "No element to remove");
-			ConcurrentReferenceHashMap.this.remove(this.last.getKey());
-			this.last = null;
-		}
-	}
-
-
-	/**
-	 * The types of restructuring that can be performed.
-	 */
-	protected enum Restructure {
-
-		WHEN_NECESSARY, NEVER
-	}
-
-
-	/**
-	 * Strategy class used to manage {@link Reference References}.
-	 * This class can be overridden if alternative reference types need to be supported.
-	 */
-	protected class ReferenceManager {
-
-		private final ReferenceQueue<Entry<K, V>> queue = new ReferenceQueue<>();
-
-		/**
-		 * Factory method used to create a new {@link Reference}.
-		 * @param entry the entry contained in the reference
-		 * @param hash the hash
-		 * @param next the next reference in the chain, or {@code null} if none
-		 * @return a new {@link Reference}
-		 */
-		public Reference<K, V> createReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next) {
-			if (ConcurrentReferenceHashMap.this.referenceType == ReferenceType.WEAK) {
-				return new WeakEntryReference<>(entry, hash, next, this.queue);
-			}
-			return new SoftEntryReference<>(entry, hash, next, this.queue);
-		}
-
-		/**
-		 * Return any reference that has been garbage collected and can be purged from the
-		 * underlying structure or {@code null} if no references need purging. This
-		 * method must be thread safe and ideally should not block when returning
-		 * {@code null}. References should be returned once and only once.
-		 * @return a reference to purge or {@code null}
-		 */
-		@SuppressWarnings("unchecked")
-		@Nullable
-		public Reference<K, V> pollForPurge() {
-			return (Reference<K, V>) this.queue.poll();
-		}
-	}
-
-
-	/**
-	 * Internal {@link Reference} implementation for {@link SoftReference SoftReferences}.
-	 */
-	private static final class SoftEntryReference<K, V> extends SoftReference<Entry<K, V>> implements Reference<K, V> {
-
-		private final int hash;
-
-		@Nullable
-		private final Reference<K, V> nextReference;
-
-		public SoftEntryReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
-
-			super(entry, queue);
-			this.hash = hash;
-			this.nextReference = next;
-		}
-
-		@Override
-		public int getHash() {
-			return this.hash;
-		}
-
-		@Override
-		@Nullable
-		public Reference<K, V> getNext() {
-			return this.nextReference;
-		}
-
-		@Override
-		public void release() {
-			enqueue();
-			clear();
-		}
-	}
-
-
-	/**
-	 * Internal {@link Reference} implementation for {@link WeakReference WeakReferences}.
-	 */
-	private static final class WeakEntryReference<K, V> extends WeakReference<Entry<K, V>> implements Reference<K, V> {
-
-		private final int hash;
-
-		@Nullable
-		private final Reference<K, V> nextReference;
-
-		public WeakEntryReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
-
-			super(entry, queue);
-			this.hash = hash;
-			this.nextReference = next;
-		}
-
-		@Override
-		public int getHash() {
-			return this.hash;
-		}
-
-		@Override
-		@Nullable
-		public Reference<K, V> getNext() {
-			return this.nextReference;
-		}
-
-		@Override
-		public void release() {
-			enqueue();
-			clear();
-		}
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
deleted file mode 100644
index 051119e4..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMap.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2002-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Extension of the {@code Map} interface that stores multiple values.
- *
- * @author Arjen Poutsma
- * @since 3.0
- * @param <K> the key type
- * @param <V> the value element type
- */
-public interface MultiValueMap<K, V> extends Map<K, List<V>> {
-
-	/**
-	 * Return the first value for the given key.
-	 * @param key the key
-	 * @return the first value for the specified key, or {@code null} if none
-	 */
-	@Nullable
-	V getFirst(K key);
-
-	/**
-	 * Add the given single value to the current list of values for the given key.
-	 * @param key the key
-	 * @param value the value to be added
-	 */
-	void add(K key, @Nullable V value);
-
-	/**
-	 * Add all the values of the given list to the current list of values for the given key.
-	 * @param key they key
-	 * @param values the values to be added
-	 * @since 5.0
-	 */
-	void addAll(K key, List<? extends V> values);
-
-	/**
-	 * Add all the values of the given {@code MultiValueMap} to the current values.
-	 * @param values the values to be added
-	 * @since 5.0
-	 */
-	void addAll(MultiValueMap<K, V> values);
-
-	/**
-	 * {@link #add(Object, Object) Add} the given value, only when the map does not
-	 * {@link #containsKey(Object) contain} the given key.
-	 * @param key the key
-	 * @param value the value to be added
-	 * @since 5.2
-	 */
-	default void addIfAbsent(K key, @Nullable V value) {
-		if (!containsKey(key)) {
-			add(key, value);
-		}
-	}
-
-	/**
-	 * Set the given single value under the given key.
-	 * @param key the key
-	 * @param value the value to set
-	 */
-	void set(K key, @Nullable V value);
-
-	/**
-	 * Set the given values under.
-	 * @param values the values.
-	 */
-	void setAll(Map<K, V> values);
-
-	/**
-	 * Return a {@code Map} with the first values contained in this {@code MultiValueMap}.
-	 * @return a single value representation of this map
-	 */
-	Map<K, V> toSingleValueMap();
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
deleted file mode 100644
index 2a303c6b..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/MultiValueMapAdapter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Adapts a given {@link Map} to the {@link MultiValueMap} contract.
- *
- * @author Arjen Poutsma
- * @author Juergen Hoeller
- * @since 5.3
- * @param <K> the key type
- * @param <V> the value element type
- * @see CollectionUtils#toMultiValueMap
- * @see LinkedMultiValueMap
- */
-@SuppressWarnings("serial")
-public class MultiValueMapAdapter<K, V> implements MultiValueMap<K, V>, Serializable {
-
-    private final Map<K, List<V>> targetMap;
-
-
-    /**
-     * Wrap the given target {@link Map} as a {@link MultiValueMap} adapter.
-     * @param targetMap the plain target {@code Map}
-     */
-    public MultiValueMapAdapter(Map<K, List<V>> targetMap) {
-        Assert.notNull(targetMap, "'targetMap' must not be null");
-        this.targetMap = targetMap;
-    }
-
-
-    // MultiValueMap implementation
-
-    @Override
-    @Nullable
-    public V getFirst(K key) {
-        List<V> values = this.targetMap.get(key);
-        return (!CollectionUtils.isEmpty(values) ? values.get(0) : null);
-    }
-
-    @Override
-    public void add(K key, @Nullable V value) {
-        List<V> values = this.targetMap.computeIfAbsent(key, k -> new ArrayList<>(1));
-        values.add(value);
-    }
-
-    @Override
-    public void addAll(K key, List<? extends V> values) {
-        List<V> currentValues = this.targetMap.computeIfAbsent(key, k -> new ArrayList<>(values.size()));
-        currentValues.addAll(values);
-    }
-
-    @Override
-    public void addAll(MultiValueMap<K, V> values) {
-        for (Entry<K, List<V>> entry : values.entrySet()) {
-            addAll(entry.getKey(), entry.getValue());
-        }
-    }
-
-    @Override
-    public void set(K key, @Nullable V value) {
-        List<V> values = new ArrayList<>(1);
-        values.add(value);
-        this.targetMap.put(key, values);
-    }
-
-    @Override
-    public void setAll(Map<K, V> values) {
-        values.forEach(this::set);
-    }
-
-    @Override
-    public Map<K, V> toSingleValueMap() {
-        Map<K, V> singleValueMap = CollectionUtils.newLinkedHashMap(this.targetMap.size());
-        this.targetMap.forEach((key, values) -> {
-            if (!CollectionUtils.isEmpty(values)) {
-                singleValueMap.put(key, values.get(0));
-            }
-        });
-        return singleValueMap;
-    }
-
-
-    // Map implementation
-
-    @Override
-    public int size() {
-        return this.targetMap.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return this.targetMap.isEmpty();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-        return this.targetMap.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-        return this.targetMap.containsValue(value);
-    }
-
-    @Override
-    @Nullable
-    public List<V> get(Object key) {
-        return this.targetMap.get(key);
-    }
-
-    @Override
-    @Nullable
-    public List<V> put(K key, List<V> value) {
-        return this.targetMap.put(key, value);
-    }
-
-    @Override
-    @Nullable
-    public List<V> remove(Object key) {
-        return this.targetMap.remove(key);
-    }
-
-    @Override
-    public void putAll(Map<? extends K, ? extends List<V>> map) {
-        this.targetMap.putAll(map);
-    }
-
-    @Override
-    public void clear() {
-        this.targetMap.clear();
-    }
-
-    @Override
-    public Set<K> keySet() {
-        return this.targetMap.keySet();
-    }
-
-    @Override
-    public Collection<List<V>> values() {
-        return this.targetMap.values();
-    }
-
-    @Override
-    public Set<Entry<K, List<V>>> entrySet() {
-        return this.targetMap.entrySet();
-    }
-
-    @Override
-    public boolean equals(@Nullable Object other) {
-        return (this == other || this.targetMap.equals(other));
-    }
-
-    @Override
-    public int hashCode() {
-        return this.targetMap.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return this.targetMap.toString();
-    }
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
deleted file mode 100644
index 06c564f1..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/ObjectUtils.java
+++ /dev/null
@@ -1,1040 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.io.File;
-import java.lang.reflect.Array;
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.time.ZoneId;
-import java.time.temporal.Temporal;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Currency;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-/**
- * Miscellaneous object utility methods.
- *
- * <p>Mainly for internal use within the framework.
- *
- * <p>Thanks to Alex Ruiz for contributing several enhancements to this class!
- *
- * @author Juergen Hoeller
- * @author Keith Donald
- * @author Rod Johnson
- * @author Rob Harrop
- * @author Chris Beams
- * @author Sam Brannen
- * @since 19.03.2004
- * @see ClassUtils
- * @see CollectionUtils
- * @see StringUtils
- */
-public abstract class ObjectUtils {
-
-	private static final int INITIAL_HASH = 7;
-	private static final int MULTIPLIER = 31;
-
-	private static final String EMPTY_STRING = "";
-	private static final String NULL_STRING = "null";
-	private static final String ARRAY_START = "{";
-	private static final String ARRAY_END = "}";
-	private static final String EMPTY_ARRAY = ARRAY_START + ARRAY_END;
-	private static final String ARRAY_ELEMENT_SEPARATOR = ", ";
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-	private static final String NON_EMPTY_ARRAY = ARRAY_START + "..." + ARRAY_END;
-	private static final String COLLECTION = "[...]";
-	private static final String MAP = NON_EMPTY_ARRAY;
-
-
-	/**
-	 * Return whether the given throwable is a checked exception:
-	 * that is, neither a RuntimeException nor an Error.
-	 * @param ex the throwable to check
-	 * @return whether the throwable is a checked exception
-	 * @see Exception
-	 * @see RuntimeException
-	 * @see Error
-	 */
-	public static boolean isCheckedException(Throwable ex) {
-		return !(ex instanceof RuntimeException || ex instanceof Error);
-	}
-
-	/**
-	 * Check whether the given exception is compatible with the specified
-	 * exception types, as declared in a throws clause.
-	 * @param ex the exception to check
-	 * @param declaredExceptions the exception types declared in the throws clause
-	 * @return whether the given exception is compatible
-	 */
-	public static boolean isCompatibleWithThrowsClause(Throwable ex, @Nullable Class<?>... declaredExceptions) {
-		if (!isCheckedException(ex)) {
-			return true;
-		}
-		if (declaredExceptions != null) {
-			for (Class<?> declaredException : declaredExceptions) {
-				if (declaredException.isInstance(ex)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Determine whether the given object is an array:
-	 * either an Object array or a primitive array.
-	 * @param obj the object to check
-	 */
-	public static boolean isArray(@Nullable Object obj) {
-		return (obj != null && obj.getClass().isArray());
-	}
-
-	/**
-	 * Determine whether the given array is empty:
-	 * i.e. {@code null} or of zero length.
-	 * @param array the array to check
-	 * @see #isEmpty(Object)
-	 */
-	public static boolean isEmpty(@Nullable Object[] array) {
-		return (array == null || array.length == 0);
-	}
-
-	/**
-	 * Determine whether the given object is empty.
-	 * <p>This method supports the following object types.
-	 * <ul>
-	 * <li>{@code Optional}: considered empty if not {@link Optional#isPresent()}</li>
-	 * <li>{@code Array}: considered empty if its length is zero</li>
-	 * <li>{@link CharSequence}: considered empty if its length is zero</li>
-	 * <li>{@link Collection}: delegates to {@link Collection#isEmpty()}</li>
-	 * <li>{@link Map}: delegates to {@link Map#isEmpty()}</li>
-	 * </ul>
-	 * <p>If the given object is non-null and not one of the aforementioned
-	 * supported types, this method returns {@code false}.
-	 * @param obj the object to check
-	 * @return {@code true} if the object is {@code null} or <em>empty</em>
-	 * @since 4.2
-	 * @see Optional#isPresent()
-	 * @see ObjectUtils#isEmpty(Object[])
-	 * @see StringUtils#hasLength(CharSequence)
-	 * @see CollectionUtils#isEmpty(Collection)
-	 * @see CollectionUtils#isEmpty(Map)
-	 */
-	public static boolean isEmpty(@Nullable Object obj) {
-		if (obj == null) {
-			return true;
-		}
-
-		if (obj instanceof Optional) {
-			return !((Optional<?>) obj).isPresent();
-		}
-		if (obj instanceof CharSequence) {
-			return ((CharSequence) obj).length() == 0;
-		}
-		if (obj.getClass().isArray()) {
-			return Array.getLength(obj) == 0;
-		}
-		if (obj instanceof Collection) {
-			return ((Collection<?>) obj).isEmpty();
-		}
-		if (obj instanceof Map) {
-			return ((Map<?, ?>) obj).isEmpty();
-		}
-
-		// else
-		return false;
-	}
-
-	/**
-	 * Unwrap the given object which is potentially a {@link Optional}.
-	 * @param obj the candidate object
-	 * @return either the value held within the {@code Optional}, {@code null}
-	 * if the {@code Optional} is empty, or simply the given object as-is
-	 * @since 5.0
-	 */
-	@Nullable
-	public static Object unwrapOptional(@Nullable Object obj) {
-		if (obj instanceof Optional) {
-			Optional<?> optional = (Optional<?>) obj;
-			if (!optional.isPresent()) {
-				return null;
-			}
-			Object result = optional.get();
-			Assert.isTrue(!(result instanceof Optional), "Multi-level Optional usage not supported");
-			return result;
-		}
-		return obj;
-	}
-
-	/**
-	 * Check whether the given array contains the given element.
-	 * @param array the array to check (may be {@code null},
-	 * in which case the return value will always be {@code false})
-	 * @param element the element to check for
-	 * @return whether the element has been found in the given array
-	 */
-	public static boolean containsElement(@Nullable Object[] array, Object element) {
-		if (array == null) {
-			return false;
-		}
-		for (Object arrayEle : array) {
-			if (nullSafeEquals(arrayEle, element)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given array of enum constants contains a constant with the given name,
-	 * ignoring case when determining a match.
-	 * @param enumValues the enum values to check, typically obtained via {@code MyEnum.values()}
-	 * @param constant the constant name to find (must not be null or empty string)
-	 * @return whether the constant has been found in the given array
-	 */
-	public static boolean containsConstant(Enum<?>[] enumValues, String constant) {
-		return containsConstant(enumValues, constant, false);
-	}
-
-	/**
-	 * Check whether the given array of enum constants contains a constant with the given name.
-	 * @param enumValues the enum values to check, typically obtained via {@code MyEnum.values()}
-	 * @param constant the constant name to find (must not be null or empty string)
-	 * @param caseSensitive whether case is significant in determining a match
-	 * @return whether the constant has been found in the given array
-	 */
-	public static boolean containsConstant(Enum<?>[] enumValues, String constant, boolean caseSensitive) {
-		for (Enum<?> candidate : enumValues) {
-			if (caseSensitive ? candidate.toString().equals(constant) :
-					candidate.toString().equalsIgnoreCase(constant)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Case insensitive alternative to {@link Enum#valueOf(Class, String)}.
-	 * @param <E> the concrete Enum type
-	 * @param enumValues the array of all Enum constants in question, usually per {@code Enum.values()}
-	 * @param constant the constant to get the enum value of
-	 * @throws IllegalArgumentException if the given constant is not found in the given array
-	 * of enum values. Use {@link #containsConstant(Enum[], String)} as a guard to avoid this exception.
-	 */
-	public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, String constant) {
-		for (E candidate : enumValues) {
-			if (candidate.toString().equalsIgnoreCase(constant)) {
-				return candidate;
-			}
-		}
-		throw new IllegalArgumentException("Constant [" + constant + "] does not exist in enum type " +
-				enumValues.getClass().getComponentType().getName());
-	}
-
-	/**
-	 * Append the given object to the given array, returning a new array
-	 * consisting of the input array contents plus the given object.
-	 * @param array the array to append to (can be {@code null})
-	 * @param obj the object to append
-	 * @return the new array (of the same component type; never {@code null})
-	 */
-	public static <A, O extends A> A[] addObjectToArray(@Nullable A[] array, @Nullable O obj) {
-		Class<?> compType = Object.class;
-		if (array != null) {
-			compType = array.getClass().getComponentType();
-		}
-		else if (obj != null) {
-			compType = obj.getClass();
-		}
-		int newArrLength = (array != null ? array.length + 1 : 1);
-		@SuppressWarnings("unchecked")
-		A[] newArr = (A[]) Array.newInstance(compType, newArrLength);
-		if (array != null) {
-			System.arraycopy(array, 0, newArr, 0, array.length);
-		}
-		newArr[newArr.length - 1] = obj;
-		return newArr;
-	}
-
-	/**
-	 * Convert the given array (which may be a primitive array) to an
-	 * object array (if necessary of primitive wrapper objects).
-	 * <p>A {@code null} source value will be converted to an
-	 * empty Object array.
-	 * @param source the (potentially primitive) array
-	 * @return the corresponding object array (never {@code null})
-	 * @throws IllegalArgumentException if the parameter is not an array
-	 */
-	public static Object[] toObjectArray(@Nullable Object source) {
-		if (source instanceof Object[]) {
-			return (Object[]) source;
-		}
-		if (source == null) {
-			return EMPTY_OBJECT_ARRAY;
-		}
-		if (!source.getClass().isArray()) {
-			throw new IllegalArgumentException("Source is not an array: " + source);
-		}
-		int length = Array.getLength(source);
-		if (length == 0) {
-			return EMPTY_OBJECT_ARRAY;
-		}
-		Class<?> wrapperType = Array.get(source, 0).getClass();
-		Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);
-		for (int i = 0; i < length; i++) {
-			newArray[i] = Array.get(source, i);
-		}
-		return newArray;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Convenience methods for content-based equality/hash-code handling
-	//---------------------------------------------------------------------
-
-	/**
-	 * Determine if the given objects are equal, returning {@code true} if
-	 * both are {@code null} or {@code false} if only one is {@code null}.
-	 * <p>Compares arrays with {@code Arrays.equals}, performing an equality
-	 * check based on the array elements rather than the array reference.
-	 * @param o1 first Object to compare
-	 * @param o2 second Object to compare
-	 * @return whether the given objects are equal
-	 * @see Object#equals(Object)
-	 * @see Arrays#equals
-	 */
-	public static boolean nullSafeEquals(@Nullable Object o1, @Nullable Object o2) {
-		if (o1 == o2) {
-			return true;
-		}
-		if (o1 == null || o2 == null) {
-			return false;
-		}
-		if (o1.equals(o2)) {
-			return true;
-		}
-		if (o1.getClass().isArray() && o2.getClass().isArray()) {
-			return arrayEquals(o1, o2);
-		}
-		return false;
-	}
-
-	/**
-	 * Compare the given arrays with {@code Arrays.equals}, performing an equality
-	 * check based on the array elements rather than the array reference.
-	 * @param o1 first array to compare
-	 * @param o2 second array to compare
-	 * @return whether the given objects are equal
-	 * @see #nullSafeEquals(Object, Object)
-	 * @see Arrays#equals
-	 */
-	private static boolean arrayEquals(Object o1, Object o2) {
-		if (o1 instanceof Object[] && o2 instanceof Object[]) {
-			return Arrays.equals((Object[]) o1, (Object[]) o2);
-		}
-		if (o1 instanceof boolean[] && o2 instanceof boolean[]) {
-			return Arrays.equals((boolean[]) o1, (boolean[]) o2);
-		}
-		if (o1 instanceof byte[] && o2 instanceof byte[]) {
-			return Arrays.equals((byte[]) o1, (byte[]) o2);
-		}
-		if (o1 instanceof char[] && o2 instanceof char[]) {
-			return Arrays.equals((char[]) o1, (char[]) o2);
-		}
-		if (o1 instanceof double[] && o2 instanceof double[]) {
-			return Arrays.equals((double[]) o1, (double[]) o2);
-		}
-		if (o1 instanceof float[] && o2 instanceof float[]) {
-			return Arrays.equals((float[]) o1, (float[]) o2);
-		}
-		if (o1 instanceof int[] && o2 instanceof int[]) {
-			return Arrays.equals((int[]) o1, (int[]) o2);
-		}
-		if (o1 instanceof long[] && o2 instanceof long[]) {
-			return Arrays.equals((long[]) o1, (long[]) o2);
-		}
-		if (o1 instanceof short[] && o2 instanceof short[]) {
-			return Arrays.equals((short[]) o1, (short[]) o2);
-		}
-		return false;
-	}
-
-	/**
-	 * Return as hash code for the given object; typically the value of
-	 * {@code Object#hashCode()}}. If the object is an array,
-	 * this method will delegate to any of the {@code nullSafeHashCode}
-	 * methods for arrays in this class. If the object is {@code null},
-	 * this method returns 0.
-	 * @see Object#hashCode()
-	 * @see #nullSafeHashCode(Object[])
-	 * @see #nullSafeHashCode(boolean[])
-	 * @see #nullSafeHashCode(byte[])
-	 * @see #nullSafeHashCode(char[])
-	 * @see #nullSafeHashCode(double[])
-	 * @see #nullSafeHashCode(float[])
-	 * @see #nullSafeHashCode(int[])
-	 * @see #nullSafeHashCode(long[])
-	 * @see #nullSafeHashCode(short[])
-	 */
-	public static int nullSafeHashCode(@Nullable Object obj) {
-		if (obj == null) {
-			return 0;
-		}
-		if (obj.getClass().isArray()) {
-			if (obj instanceof Object[]) {
-				return nullSafeHashCode((Object[]) obj);
-			}
-			if (obj instanceof boolean[]) {
-				return nullSafeHashCode((boolean[]) obj);
-			}
-			if (obj instanceof byte[]) {
-				return nullSafeHashCode((byte[]) obj);
-			}
-			if (obj instanceof char[]) {
-				return nullSafeHashCode((char[]) obj);
-			}
-			if (obj instanceof double[]) {
-				return nullSafeHashCode((double[]) obj);
-			}
-			if (obj instanceof float[]) {
-				return nullSafeHashCode((float[]) obj);
-			}
-			if (obj instanceof int[]) {
-				return nullSafeHashCode((int[]) obj);
-			}
-			if (obj instanceof long[]) {
-				return nullSafeHashCode((long[]) obj);
-			}
-			if (obj instanceof short[]) {
-				return nullSafeHashCode((short[]) obj);
-			}
-		}
-		return obj.hashCode();
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable Object[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (Object element : array) {
-			hash = MULTIPLIER * hash + nullSafeHashCode(element);
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable boolean[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (boolean element : array) {
-			hash = MULTIPLIER * hash + Boolean.hashCode(element);
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable byte[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (byte element : array) {
-			hash = MULTIPLIER * hash + element;
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable char[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (char element : array) {
-			hash = MULTIPLIER * hash + element;
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable double[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (double element : array) {
-			hash = MULTIPLIER * hash + Double.hashCode(element);
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable float[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (float element : array) {
-			hash = MULTIPLIER * hash + Float.hashCode(element);
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable int[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (int element : array) {
-			hash = MULTIPLIER * hash + element;
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable long[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (long element : array) {
-			hash = MULTIPLIER * hash + Long.hashCode(element);
-		}
-		return hash;
-	}
-
-	/**
-	 * Return a hash code based on the contents of the specified array.
-	 * If {@code array} is {@code null}, this method returns 0.
-	 */
-	public static int nullSafeHashCode(@Nullable short[] array) {
-		if (array == null) {
-			return 0;
-		}
-		int hash = INITIAL_HASH;
-		for (short element : array) {
-			hash = MULTIPLIER * hash + element;
-		}
-		return hash;
-	}
-
-	/**
-	 * Return the same value as {@link Boolean#hashCode(boolean)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(boolean bool) {
-		return Boolean.hashCode(bool);
-	}
-
-	/**
-	 * Return the same value as {@link Double#hashCode(double)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(double dbl) {
-		return Double.hashCode(dbl);
-	}
-
-	/**
-	 * Return the same value as {@link Float#hashCode(float)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(float flt) {
-		return Float.hashCode(flt);
-	}
-
-	/**
-	 * Return the same value as {@link Long#hashCode(long)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(long lng) {
-		return Long.hashCode(lng);
-	}
-
-
-	//---------------------------------------------------------------------
-	// Convenience methods for toString output
-	//---------------------------------------------------------------------
-
-	/**
-	 * Return a String representation of an object's overall identity.
-	 * @param obj the object (may be {@code null})
-	 * @return the object's identity as String representation,
-	 * or an empty String if the object was {@code null}
-	 */
-	public static String identityToString(@Nullable Object obj) {
-		if (obj == null) {
-			return EMPTY_STRING;
-		}
-		return obj.getClass().getName() + "@" + getIdentityHexString(obj);
-	}
-
-	/**
-	 * Return a hex String form of an object's identity hash code.
-	 * @param obj the object
-	 * @return the object's identity code in hex notation
-	 */
-	public static String getIdentityHexString(Object obj) {
-		return Integer.toHexString(System.identityHashCode(obj));
-	}
-
-	/**
-	 * Return a content-based String representation if {@code obj} is
-	 * not {@code null}; otherwise returns an empty String.
-	 * <p>Differs from {@link #nullSafeToString(Object)} in that it returns
-	 * an empty String rather than "null" for a {@code null} value.
-	 * @param obj the object to build a display String for
-	 * @return a display String representation of {@code obj}
-	 * @see #nullSafeToString(Object)
-	 */
-	public static String getDisplayString(@Nullable Object obj) {
-		if (obj == null) {
-			return EMPTY_STRING;
-		}
-		return nullSafeToString(obj);
-	}
-
-	/**
-	 * Determine the class name for the given object.
-	 * <p>Returns a {@code "null"} String if {@code obj} is {@code null}.
-	 * @param obj the object to introspect (may be {@code null})
-	 * @return the corresponding class name
-	 */
-	public static String nullSafeClassName(@Nullable Object obj) {
-		return (obj != null ? obj.getClass().getName() : NULL_STRING);
-	}
-
-	/**
-	 * Return a String representation of the specified Object.
-	 * <p>Builds a String representation of the contents in case of an array.
-	 * Returns a {@code "null"} String if {@code obj} is {@code null}.
-	 * @param obj the object to build a String representation for
-	 * @return a String representation of {@code obj}
-	 * @see #nullSafeConciseToString(Object)
-	 */
-	public static String nullSafeToString(@Nullable Object obj) {
-		if (obj == null) {
-			return NULL_STRING;
-		}
-		if (obj instanceof String) {
-			return (String) obj;
-		}
-		if (obj instanceof Object[]) {
-			return nullSafeToString((Object[]) obj);
-		}
-		if (obj instanceof boolean[]) {
-			return nullSafeToString((boolean[]) obj);
-		}
-		if (obj instanceof byte[]) {
-			return nullSafeToString((byte[]) obj);
-		}
-		if (obj instanceof char[]) {
-			return nullSafeToString((char[]) obj);
-		}
-		if (obj instanceof double[]) {
-			return nullSafeToString((double[]) obj);
-		}
-		if (obj instanceof float[]) {
-			return nullSafeToString((float[]) obj);
-		}
-		if (obj instanceof int[]) {
-			return nullSafeToString((int[]) obj);
-		}
-		if (obj instanceof long[]) {
-			return nullSafeToString((long[]) obj);
-		}
-		if (obj instanceof short[]) {
-			return nullSafeToString((short[]) obj);
-		}
-		String str = obj.toString();
-		return (str != null ? str : EMPTY_STRING);
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable Object[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (Object o : array) {
-			stringJoiner.add(String.valueOf(o));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable boolean[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (boolean b : array) {
-			stringJoiner.add(String.valueOf(b));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable byte[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (byte b : array) {
-			stringJoiner.add(String.valueOf(b));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable char[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (char c : array) {
-			stringJoiner.add('\'' + String.valueOf(c) + '\'');
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable double[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (double d : array) {
-			stringJoiner.add(String.valueOf(d));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable float[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (float f : array) {
-			stringJoiner.add(String.valueOf(f));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable int[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (int i : array) {
-			stringJoiner.add(String.valueOf(i));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable long[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (long l : array) {
-			stringJoiner.add(String.valueOf(l));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Return a String representation of the contents of the specified array.
-	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
-	 * by the characters {@code ", "} (a comma followed by a space).
-	 * Returns a {@code "null"} String if {@code array} is {@code null}.
-	 * @param array the array to build a String representation for
-	 * @return a String representation of {@code array}
-	 */
-	public static String nullSafeToString(@Nullable short[] array) {
-		if (array == null) {
-			return NULL_STRING;
-		}
-		int length = array.length;
-		if (length == 0) {
-			return EMPTY_ARRAY;
-		}
-		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
-		for (short s : array) {
-			stringJoiner.add(String.valueOf(s));
-		}
-		return stringJoiner.toString();
-	}
-
-	/**
-	 * Generate a null-safe, concise string representation of the supplied object
-	 * as described below.
-	 * <p>Favor this method over {@link #nullSafeToString(Object)} when you need
-	 * the length of the generated string to be limited.
-	 * <p>Returns:
-	 * <ul>
-	 * <li>{@code "null"} if {@code obj} is {@code null}</li>
-	 * <li>{@code"Optional.empty"} if {@code obj} is an empty {@link Optional}</li>
-	 * <li>{@code"Optional[<concise-string>]"} if {@code obj} is a non-empty {@code Optional},
-	 * where {@code <concise-string>} is the result of invoking {@link #nullSafeConciseToString}
-	 * on the object contained in the {@code Optional}</li>
-	 * <li>{@code "{}"} if {@code obj} is an empty array</li>
-	 * <li>{@code "{...}"} if {@code obj} is a {@link Map} or a non-empty array</li>
-	 * <li>{@code "[...]"} if {@code obj} is a {@link Collection}</li>
-	 * <li>{@linkplain Class#getName() Class name} if {@code obj} is a {@link Class}</li>
-	 * <li>{@linkplain Charset#name() Charset name} if {@code obj} is a {@link Charset}</li>
-	 * <li>{@linkplain TimeZone#getID() TimeZone ID} if {@code obj} is a {@link TimeZone}</li>
-	 * <li>{@linkplain ZoneId#getId() Zone ID} if {@code obj} is a {@link ZoneId}</li>
-	 * <li>Potentially {@linkplain StringUtils#truncate(CharSequence) truncated string}
-	 * if {@code obj} is a {@link String} or {@link CharSequence}</li>
-	 * <li>Potentially {@linkplain StringUtils#truncate(CharSequence) truncated string}
-	 * if {@code obj} is a <em>simple value type</em> whose {@code toString()} method
-	 * returns a non-null value</li>
-	 * <li>Otherwise, a string representation of the object's type name concatenated
-	 * with {@code "@"} and a hex string form of the object's identity hash code</li>
-	 * </ul>
-	 * <p>In the context of this method, a <em>simple value type</em> is any of the following:
-	 * primitive wrapper (excluding {@link Void}), {@link Enum}, {@link Number},
-	 * {@link Date}, {@link Temporal}, {@link File}, {@link Path}, {@link URI},
-	 * {@link URL}, {@link InetAddress}, {@link Currency}, {@link Locale},
-	 * {@link UUID}, {@link Pattern}.
-	 * @param obj the object to build a string representation for
-	 * @return a concise string representation of the supplied object
-	 * @since 5.3.27
-	 * @see #nullSafeToString(Object)
-	 * @see StringUtils#truncate(CharSequence)
-	 */
-	public static String nullSafeConciseToString(@Nullable Object obj) {
-		if (obj == null) {
-			return "null";
-		}
-		if (obj instanceof Optional<?>) {
-			Optional<?> optional = (Optional<?>) obj;
-			return (!optional.isPresent() ? "Optional.empty" :
-					String.format("Optional[%s]", nullSafeConciseToString(optional.get())));
-		}
-		if (obj.getClass().isArray()) {
-			return (Array.getLength(obj) == 0 ? EMPTY_ARRAY : NON_EMPTY_ARRAY);
-		}
-		if (obj instanceof Collection) {
-			return COLLECTION;
-		}
-		if (obj instanceof Map) {
-			return MAP;
-		}
-		if (obj instanceof Class<?>) {
-			return ((Class<?>) obj).getName();
-		}
-		if (obj instanceof Charset) {
-			return ((Charset) obj).name();
-		}
-		if (obj instanceof TimeZone) {
-			return ((TimeZone) obj).getID();
-		}
-		if (obj instanceof ZoneId) {
-			return ((ZoneId) obj).getId();
-		}
-		if (obj instanceof CharSequence) {
-			return StringUtils.truncate((CharSequence) obj);
-		}
-		Class<?> type = obj.getClass();
-		if (isSimpleValueType(type)) {
-			String str = obj.toString();
-			if (str != null) {
-				return StringUtils.truncate(str);
-			}
-		}
-		return type.getTypeName() + "@" + getIdentityHexString(obj);
-	}
-
-	/**
-	 * Derived from {@link org.springframework.beans.BeanUtils#isSimpleValueType}.
-	 * <p>As of 5.3.28, considering {@link UUID} in addition to the bean-level check.
-	 * <p>As of 5.3.29, additionally considering {@link File}, {@link Path},
-	 * {@link InetAddress}, {@link Charset}, {@link Currency}, {@link TimeZone},
-	 * {@link ZoneId}, {@link Pattern}.
-	 */
-	private static boolean isSimpleValueType(Class<?> type) {
-		return (Void.class != type && void.class != type &&
-				(ClassUtils.isPrimitiveOrWrapper(type) ||
-				Enum.class.isAssignableFrom(type) ||
-				CharSequence.class.isAssignableFrom(type) ||
-				Number.class.isAssignableFrom(type) ||
-				Date.class.isAssignableFrom(type) ||
-				Temporal.class.isAssignableFrom(type) ||
-				ZoneId.class.isAssignableFrom(type) ||
-				TimeZone.class.isAssignableFrom(type) ||
-				File.class.isAssignableFrom(type) ||
-				Path.class.isAssignableFrom(type) ||
-				Charset.class.isAssignableFrom(type) ||
-				Currency.class.isAssignableFrom(type) ||
-				InetAddress.class.isAssignableFrom(type) ||
-				URI.class == type ||
-				URL.class == type ||
-				UUID.class == type ||
-				Locale.class == type ||
-				Pattern.class == type ||
-				Class.class == type));
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
deleted file mode 100644
index bcdd6b68..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/ReflectionUtils.java
+++ /dev/null
@@ -1,881 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Simple utility class for working with the reflection API and handling
- * reflection exceptions.
- *
- * <p>Only intended for internal use.
- *
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Rod Johnson
- * @author Costin Leau
- * @author Sam Brannen
- * @author Chris Beams
- * @since 1.2.2
- */
-public abstract class ReflectionUtils {
-
-	/**
-	 * Pre-built {@link MethodFilter} that matches all non-bridge non-synthetic methods
-	 * which are not declared on {@code java.lang.Object}.
-	 * @since 3.0.5
-	 */
-	public static final MethodFilter USER_DECLARED_METHODS =
-			(method -> !method.isBridge() && !method.isSynthetic() && (method.getDeclaringClass() != Object.class));
-
-	/**
-	 * Pre-built FieldFilter that matches all non-static, non-final fields.
-	 */
-	public static final FieldFilter COPYABLE_FIELDS =
-			(field -> !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())));
-
-
-	/**
-	 * Naming prefix for CGLIB-renamed methods.
-	 * @see #isCglibRenamedMethod
-	 */
-	private static final String CGLIB_RENAMED_METHOD_PREFIX = "CGLIB$";
-
-	private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
-
-	private static final Method[] EMPTY_METHOD_ARRAY = new Method[0];
-
-	private static final Field[] EMPTY_FIELD_ARRAY = new Field[0];
-
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
-
-	/**
-	 * Cache for {@link Class#getDeclaredMethods()} plus equivalent default methods
-	 * from Java 8 based interfaces, allowing for fast iteration.
-	 */
-	private static final Map<Class<?>, Method[]> declaredMethodsCache = new ConcurrentReferenceHashMap<>(256);
-
-	/**
-	 * Cache for {@link Class#getDeclaredFields()}, allowing for fast iteration.
-	 */
-	private static final Map<Class<?>, Field[]> declaredFieldsCache = new ConcurrentReferenceHashMap<>(256);
-
-
-	// Exception handling
-
-	/**
-	 * Handle the given reflection exception.
-	 * <p>Should only be called if no checked exception is expected to be thrown
-	 * by a target method, or if an error occurs while accessing a method or field.
-	 * <p>Throws the underlying RuntimeException or Error in case of an
-	 * InvocationTargetException with such a root cause. Throws an
-	 * IllegalStateException with an appropriate message or
-	 * UndeclaredThrowableException otherwise.
-	 * @param ex the reflection exception to handle
-	 */
-	public static void handleReflectionException(Exception ex) {
-		if (ex instanceof NoSuchMethodException) {
-			throw new IllegalStateException("Method not found: " + ex.getMessage());
-		}
-		if (ex instanceof IllegalAccessException) {
-			throw new IllegalStateException("Could not access method or field: " + ex.getMessage());
-		}
-		if (ex instanceof InvocationTargetException) {
-			handleInvocationTargetException((InvocationTargetException) ex);
-		}
-		if (ex instanceof RuntimeException) {
-			throw (RuntimeException) ex;
-		}
-		throw new UndeclaredThrowableException(ex);
-	}
-
-	/**
-	 * Handle the given invocation target exception. Should only be called if no
-	 * checked exception is expected to be thrown by the target method.
-	 * <p>Throws the underlying RuntimeException or Error in case of such a root
-	 * cause. Throws an UndeclaredThrowableException otherwise.
-	 * @param ex the invocation target exception to handle
-	 */
-	public static void handleInvocationTargetException(InvocationTargetException ex) {
-		rethrowRuntimeException(ex.getTargetException());
-	}
-
-	/**
-	 * Rethrow the given {@link Throwable exception}, which is presumably the
-	 * <em>target exception</em> of an {@link InvocationTargetException}.
-	 * Should only be called if no checked exception is expected to be thrown
-	 * by the target method.
-	 * <p>Rethrows the underlying exception cast to a {@link RuntimeException} or
-	 * {@link Error} if appropriate; otherwise, throws an
-	 * {@link UndeclaredThrowableException}.
-	 * @param ex the exception to rethrow
-	 * @throws RuntimeException the rethrown exception
-	 */
-	public static void rethrowRuntimeException(Throwable ex) {
-		if (ex instanceof RuntimeException) {
-			throw (RuntimeException) ex;
-		}
-		if (ex instanceof Error) {
-			throw (Error) ex;
-		}
-		throw new UndeclaredThrowableException(ex);
-	}
-
-	/**
-	 * Rethrow the given {@link Throwable exception}, which is presumably the
-	 * <em>target exception</em> of an {@link InvocationTargetException}.
-	 * Should only be called if no checked exception is expected to be thrown
-	 * by the target method.
-	 * <p>Rethrows the underlying exception cast to an {@link Exception} or
-	 * {@link Error} if appropriate; otherwise, throws an
-	 * {@link UndeclaredThrowableException}.
-	 * @param ex the exception to rethrow
-	 * @throws Exception the rethrown exception (in case of a checked exception)
-	 */
-	public static void rethrowException(Throwable ex) throws Exception {
-		if (ex instanceof Exception) {
-			throw (Exception) ex;
-		}
-		if (ex instanceof Error) {
-			throw (Error) ex;
-		}
-		throw new UndeclaredThrowableException(ex);
-	}
-
-
-	// Constructor handling
-
-	/**
-	 * Obtain an accessible constructor for the given class and parameters.
-	 * @param clazz the clazz to check
-	 * @param parameterTypes the parameter types of the desired constructor
-	 * @return the constructor reference
-	 * @throws NoSuchMethodException if no such constructor exists
-	 * @since 5.0
-	 */
-	public static <T> Constructor<T> accessibleConstructor(Class<T> clazz, Class<?>... parameterTypes)
-			throws NoSuchMethodException {
-
-		Constructor<T> ctor = clazz.getDeclaredConstructor(parameterTypes);
-		makeAccessible(ctor);
-		return ctor;
-	}
-
-	/**
-	 * Make the given constructor accessible, explicitly setting it accessible
-	 * if necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
-	 * @param ctor the constructor to make accessible
-	 * @see Constructor#setAccessible
-	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
-	public static void makeAccessible(Constructor<?> ctor) {
-		if ((!Modifier.isPublic(ctor.getModifiers()) ||
-				!Modifier.isPublic(ctor.getDeclaringClass().getModifiers())) && !ctor.isAccessible()) {
-			ctor.setAccessible(true);
-		}
-	}
-
-
-	// Method handling
-
-	/**
-	 * Attempt to find a {@link Method} on the supplied class with the supplied name
-	 * and no parameters. Searches all superclasses up to {@code Object}.
-	 * <p>Returns {@code null} if no {@link Method} can be found.
-	 * @param clazz the class to introspect
-	 * @param name the name of the method
-	 * @return the Method object, or {@code null} if none found
-	 */
-	@Nullable
-	public static Method findMethod(Class<?> clazz, String name) {
-		return findMethod(clazz, name, EMPTY_CLASS_ARRAY);
-	}
-
-	/**
-	 * Attempt to find a {@link Method} on the supplied class with the supplied name
-	 * and parameter types. Searches all superclasses up to {@code Object}.
-	 * <p>Returns {@code null} if no {@link Method} can be found.
-	 * @param clazz the class to introspect
-	 * @param name the name of the method
-	 * @param paramTypes the parameter types of the method
-	 * (may be {@code null} to indicate any signature)
-	 * @return the Method object, or {@code null} if none found
-	 */
-	@Nullable
-	public static Method findMethod(Class<?> clazz, String name, @Nullable Class<?>... paramTypes) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.notNull(name, "Method name must not be null");
-		Class<?> searchType = clazz;
-		while (searchType != null) {
-			Method[] methods = (searchType.isInterface() ? searchType.getMethods() :
-					getDeclaredMethods(searchType, false));
-			for (Method method : methods) {
-				if (name.equals(method.getName()) && (paramTypes == null || hasSameParams(method, paramTypes))) {
-					return method;
-				}
-			}
-			searchType = searchType.getSuperclass();
-		}
-		return null;
-	}
-
-	private static boolean hasSameParams(Method method, Class<?>[] paramTypes) {
-		return (paramTypes.length == method.getParameterCount() &&
-				Arrays.equals(paramTypes, method.getParameterTypes()));
-	}
-
-	/**
-	 * Invoke the specified {@link Method} against the supplied target object with no arguments.
-	 * The target object can be {@code null} when invoking a static {@link Method}.
-	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
-	 * @param method the method to invoke
-	 * @param target the target object to invoke the method on
-	 * @return the invocation result, if any
-	 * @see #invokeMethod(Method, Object, Object[])
-	 */
-	@Nullable
-	public static Object invokeMethod(Method method, @Nullable Object target) {
-		return invokeMethod(method, target, EMPTY_OBJECT_ARRAY);
-	}
-
-	/**
-	 * Invoke the specified {@link Method} against the supplied target object with the
-	 * supplied arguments. The target object can be {@code null} when invoking a
-	 * static {@link Method}.
-	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
-	 * @param method the method to invoke
-	 * @param target the target object to invoke the method on
-	 * @param args the invocation arguments (may be {@code null})
-	 * @return the invocation result, if any
-	 */
-	@Nullable
-	public static Object invokeMethod(Method method, @Nullable Object target, @Nullable Object... args) {
-		try {
-			return method.invoke(target, args);
-		}
-		catch (Exception ex) {
-			handleReflectionException(ex);
-		}
-		throw new IllegalStateException("Should never get here");
-	}
-
-	/**
-	 * Determine whether the given method explicitly declares the given
-	 * exception or one of its superclasses, which means that an exception
-	 * of that type can be propagated as-is within a reflective invocation.
-	 * @param method the declaring method
-	 * @param exceptionType the exception to throw
-	 * @return {@code true} if the exception can be thrown as-is;
-	 * {@code false} if it needs to be wrapped
-	 */
-	public static boolean declaresException(Method method, Class<?> exceptionType) {
-		Assert.notNull(method, "Method must not be null");
-		Class<?>[] declaredExceptions = method.getExceptionTypes();
-		for (Class<?> declaredException : declaredExceptions) {
-			if (declaredException.isAssignableFrom(exceptionType)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Perform the given callback operation on all matching methods of the given
-	 * class, as locally declared or equivalent thereof (such as default methods
-	 * on Java 8 based interfaces that the given class implements).
-	 * @param clazz the class to introspect
-	 * @param mc the callback to invoke for each method
-	 * @throws IllegalStateException if introspection fails
-	 * @since 4.2
-	 * @see #doWithMethods
-	 */
-	public static void doWithLocalMethods(Class<?> clazz, MethodCallback mc) {
-		Method[] methods = getDeclaredMethods(clazz, false);
-		for (Method method : methods) {
-			try {
-				mc.doWith(method);
-			}
-			catch (IllegalAccessException ex) {
-				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
-			}
-		}
-	}
-
-	/**
-	 * Perform the given callback operation on all matching methods of the given
-	 * class and superclasses.
-	 * <p>The same named method occurring on subclass and superclass will appear
-	 * twice, unless excluded by a {@link MethodFilter}.
-	 * @param clazz the class to introspect
-	 * @param mc the callback to invoke for each method
-	 * @throws IllegalStateException if introspection fails
-	 * @see #doWithMethods(Class, MethodCallback, MethodFilter)
-	 */
-	public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
-		doWithMethods(clazz, mc, null);
-	}
-
-	/**
-	 * Perform the given callback operation on all matching methods of the given
-	 * class and superclasses (or given interface and super-interfaces).
-	 * <p>The same named method occurring on subclass and superclass will appear
-	 * twice, unless excluded by the specified {@link MethodFilter}.
-	 * @param clazz the class to introspect
-	 * @param mc the callback to invoke for each method
-	 * @param mf the filter that determines the methods to apply the callback to
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static void doWithMethods(Class<?> clazz, MethodCallback mc, @Nullable MethodFilter mf) {
-		if (mf == USER_DECLARED_METHODS && clazz == Object.class) {
-			// nothing to introspect
-			return;
-		}
-		Method[] methods = getDeclaredMethods(clazz, false);
-		for (Method method : methods) {
-			if (mf != null && !mf.matches(method)) {
-				continue;
-			}
-			try {
-				mc.doWith(method);
-			}
-			catch (IllegalAccessException ex) {
-				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
-			}
-		}
-		// Keep backing up the inheritance hierarchy.
-		if (clazz.getSuperclass() != null && (mf != USER_DECLARED_METHODS || clazz.getSuperclass() != Object.class)) {
-			doWithMethods(clazz.getSuperclass(), mc, mf);
-		}
-		else if (clazz.isInterface()) {
-			for (Class<?> superIfc : clazz.getInterfaces()) {
-				doWithMethods(superIfc, mc, mf);
-			}
-		}
-	}
-
-	/**
-	 * Get all declared methods on the leaf class and all superclasses.
-	 * Leaf class methods are included first.
-	 * @param leafClass the class to introspect
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static Method[] getAllDeclaredMethods(Class<?> leafClass) {
-		final List<Method> methods = new ArrayList<>(20);
-		doWithMethods(leafClass, methods::add);
-		return methods.toArray(EMPTY_METHOD_ARRAY);
-	}
-
-	/**
-	 * Get the unique set of declared methods on the leaf class and all superclasses.
-	 * Leaf class methods are included first and while traversing the superclass hierarchy
-	 * any methods found with signatures matching a method already included are filtered out.
-	 * @param leafClass the class to introspect
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass) {
-		return getUniqueDeclaredMethods(leafClass, null);
-	}
-
-	/**
-	 * Get the unique set of declared methods on the leaf class and all superclasses.
-	 * Leaf class methods are included first and while traversing the superclass hierarchy
-	 * any methods found with signatures matching a method already included are filtered out.
-	 * @param leafClass the class to introspect
-	 * @param mf the filter that determines the methods to take into account
-	 * @throws IllegalStateException if introspection fails
-	 * @since 5.2
-	 */
-	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass, @Nullable MethodFilter mf) {
-		final List<Method> methods = new ArrayList<>(20);
-		doWithMethods(leafClass, method -> {
-			boolean knownSignature = false;
-			Method methodBeingOverriddenWithCovariantReturnType = null;
-			for (Method existingMethod : methods) {
-				if (method.getName().equals(existingMethod.getName()) &&
-						method.getParameterCount() == existingMethod.getParameterCount() &&
-						Arrays.equals(method.getParameterTypes(), existingMethod.getParameterTypes())) {
-					// Is this a covariant return type situation?
-					if (existingMethod.getReturnType() != method.getReturnType() &&
-							existingMethod.getReturnType().isAssignableFrom(method.getReturnType())) {
-						methodBeingOverriddenWithCovariantReturnType = existingMethod;
-					}
-					else {
-						knownSignature = true;
-					}
-					break;
-				}
-			}
-			if (methodBeingOverriddenWithCovariantReturnType != null) {
-				methods.remove(methodBeingOverriddenWithCovariantReturnType);
-			}
-			if (!knownSignature && !isCglibRenamedMethod(method)) {
-				methods.add(method);
-			}
-		}, mf);
-		return methods.toArray(EMPTY_METHOD_ARRAY);
-	}
-
-	/**
-	 * Variant of {@link Class#getDeclaredMethods()} that uses a local cache in
-	 * order to avoid the JVM's SecurityManager check and new Method instances.
-	 * In addition, it also includes Java 8 default methods from locally
-	 * implemented interfaces, since those are effectively to be treated just
-	 * like declared methods.
-	 * @param clazz the class to introspect
-	 * @return the cached array of methods
-	 * @throws IllegalStateException if introspection fails
-	 * @since 5.2
-	 * @see Class#getDeclaredMethods()
-	 */
-	public static Method[] getDeclaredMethods(Class<?> clazz) {
-		return getDeclaredMethods(clazz, true);
-	}
-
-	private static Method[] getDeclaredMethods(Class<?> clazz, boolean defensive) {
-		Assert.notNull(clazz, "Class must not be null");
-		Method[] result = declaredMethodsCache.get(clazz);
-		if (result == null) {
-			try {
-				Method[] declaredMethods = clazz.getDeclaredMethods();
-				List<Method> defaultMethods = findConcreteMethodsOnInterfaces(clazz);
-				if (defaultMethods != null) {
-					result = new Method[declaredMethods.length + defaultMethods.size()];
-					System.arraycopy(declaredMethods, 0, result, 0, declaredMethods.length);
-					int index = declaredMethods.length;
-					for (Method defaultMethod : defaultMethods) {
-						result[index] = defaultMethod;
-						index++;
-					}
-				}
-				else {
-					result = declaredMethods;
-				}
-				declaredMethodsCache.put(clazz, (result.length == 0 ? EMPTY_METHOD_ARRAY : result));
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
-						"] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
-			}
-		}
-		return (result.length == 0 || !defensive) ? result : result.clone();
-	}
-
-	@Nullable
-	private static List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
-		List<Method> result = null;
-		for (Class<?> ifc : clazz.getInterfaces()) {
-			for (Method ifcMethod : ifc.getMethods()) {
-				if (!Modifier.isAbstract(ifcMethod.getModifiers())) {
-					if (result == null) {
-						result = new ArrayList<>();
-					}
-					result.add(ifcMethod);
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Determine whether the given method is an "equals" method.
-	 * @see Object#equals(Object)
-	 */
-	public static boolean isEqualsMethod(@Nullable Method method) {
-		return (method != null && method.getParameterCount() == 1 && method.getName().equals("equals") &&
-				method.getParameterTypes()[0] == Object.class);
-	}
-
-	/**
-	 * Determine whether the given method is a "hashCode" method.
-	 * @see Object#hashCode()
-	 */
-	public static boolean isHashCodeMethod(@Nullable Method method) {
-		return (method != null && method.getParameterCount() == 0 && method.getName().equals("hashCode"));
-	}
-
-	/**
-	 * Determine whether the given method is a "toString" method.
-	 * @see Object#toString()
-	 */
-	public static boolean isToStringMethod(@Nullable Method method) {
-		return (method != null && method.getParameterCount() == 0 && method.getName().equals("toString"));
-	}
-
-	/**
-	 * Determine whether the given method is originally declared by {@link Object}.
-	 */
-	public static boolean isObjectMethod(@Nullable Method method) {
-		return (method != null && (method.getDeclaringClass() == Object.class ||
-				isEqualsMethod(method) || isHashCodeMethod(method) || isToStringMethod(method)));
-	}
-
-	/**
-	 * Determine whether the given method is a CGLIB 'renamed' method,
-	 * following the pattern "CGLIB$methodName$0".
-	 * @param renamedMethod the method to check
-	 */
-	public static boolean isCglibRenamedMethod(Method renamedMethod) {
-		String name = renamedMethod.getName();
-		if (name.startsWith(CGLIB_RENAMED_METHOD_PREFIX)) {
-			int i = name.length() - 1;
-			while (i >= 0 && Character.isDigit(name.charAt(i))) {
-				i--;
-			}
-			return (i > CGLIB_RENAMED_METHOD_PREFIX.length() && (i < name.length() - 1) && name.charAt(i) == '$');
-		}
-		return false;
-	}
-
-	/**
-	 * Make the given method accessible, explicitly setting it accessible if
-	 * necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
-	 * @param method the method to make accessible
-	 * @see Method#setAccessible
-	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
-	public static void makeAccessible(Method method) {
-		if ((!Modifier.isPublic(method.getModifiers()) ||
-				!Modifier.isPublic(method.getDeclaringClass().getModifiers())) && !method.isAccessible()) {
-			method.setAccessible(true);
-		}
-	}
-
-
-	// Field handling
-
-	/**
-	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
-	 * supplied {@code name}. Searches all superclasses up to {@link Object}.
-	 * @param clazz the class to introspect
-	 * @param name the name of the field
-	 * @return the corresponding Field object, or {@code null} if not found
-	 */
-	@Nullable
-	public static Field findField(Class<?> clazz, String name) {
-		return findField(clazz, name, null);
-	}
-
-	/**
-	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
-	 * supplied {@code name} and/or {@link Class type}. Searches all superclasses
-	 * up to {@link Object}.
-	 * @param clazz the class to introspect
-	 * @param name the name of the field (may be {@code null} if type is specified)
-	 * @param type the type of the field (may be {@code null} if name is specified)
-	 * @return the corresponding Field object, or {@code null} if not found
-	 */
-	@Nullable
-	public static Field findField(Class<?> clazz, @Nullable String name, @Nullable Class<?> type) {
-		Assert.notNull(clazz, "Class must not be null");
-		Assert.isTrue(name != null || type != null, "Either name or type of the field must be specified");
-		Class<?> searchType = clazz;
-		while (Object.class != searchType && searchType != null) {
-			Field[] fields = getDeclaredFields(searchType);
-			for (Field field : fields) {
-				if ((name == null || name.equals(field.getName())) &&
-						(type == null || type.equals(field.getType()))) {
-					return field;
-				}
-			}
-			searchType = searchType.getSuperclass();
-		}
-		return null;
-	}
-
-	/**
-	 * Set the field represented by the supplied {@linkplain Field field object} on
-	 * the specified {@linkplain Object target object} to the specified {@code value}.
-	 * <p>In accordance with {@link Field#set(Object, Object)} semantics, the new value
-	 * is automatically unwrapped if the underlying field has a primitive type.
-	 * <p>This method does not support setting {@code static final} fields.
-	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
-	 * @param field the field to set
-	 * @param target the target object on which to set the field
-	 * (or {@code null} for a static field)
-	 * @param value the value to set (may be {@code null})
-	 */
-	public static void setField(Field field, @Nullable Object target, @Nullable Object value) {
-		try {
-			field.set(target, value);
-		}
-		catch (IllegalAccessException ex) {
-			handleReflectionException(ex);
-		}
-	}
-
-	/**
-	 * Get the field represented by the supplied {@link Field field object} on the
-	 * specified {@link Object target object}. In accordance with {@link Field#get(Object)}
-	 * semantics, the returned value is automatically wrapped if the underlying field
-	 * has a primitive type.
-	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
-	 * @param field the field to get
-	 * @param target the target object from which to get the field
-	 * (or {@code null} for a static field)
-	 * @return the field's current value
-	 */
-	@Nullable
-	public static Object getField(Field field, @Nullable Object target) {
-		try {
-			return field.get(target);
-		}
-		catch (IllegalAccessException ex) {
-			handleReflectionException(ex);
-		}
-		throw new IllegalStateException("Should never get here");
-	}
-
-	/**
-	 * Invoke the given callback on all locally declared fields in the given class.
-	 * @param clazz the target class to analyze
-	 * @param fc the callback to invoke for each field
-	 * @throws IllegalStateException if introspection fails
-	 * @since 4.2
-	 * @see #doWithFields
-	 */
-	public static void doWithLocalFields(Class<?> clazz, FieldCallback fc) {
-		for (Field field : getDeclaredFields(clazz)) {
-			try {
-				fc.doWith(field);
-			}
-			catch (IllegalAccessException ex) {
-				throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
-			}
-		}
-	}
-
-	/**
-	 * Invoke the given callback on all fields in the target class, going up the
-	 * class hierarchy to get all declared fields.
-	 * @param clazz the target class to analyze
-	 * @param fc the callback to invoke for each field
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static void doWithFields(Class<?> clazz, FieldCallback fc) {
-		doWithFields(clazz, fc, null);
-	}
-
-	/**
-	 * Invoke the given callback on all fields in the target class, going up the
-	 * class hierarchy to get all declared fields.
-	 * @param clazz the target class to analyze
-	 * @param fc the callback to invoke for each field
-	 * @param ff the filter that determines the fields to apply the callback to
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static void doWithFields(Class<?> clazz, FieldCallback fc, @Nullable FieldFilter ff) {
-		// Keep backing up the inheritance hierarchy.
-		Class<?> targetClass = clazz;
-		do {
-			Field[] fields = getDeclaredFields(targetClass);
-			for (Field field : fields) {
-				if (ff != null && !ff.matches(field)) {
-					continue;
-				}
-				try {
-					fc.doWith(field);
-				}
-				catch (IllegalAccessException ex) {
-					throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
-				}
-			}
-			targetClass = targetClass.getSuperclass();
-		}
-		while (targetClass != null && targetClass != Object.class);
-	}
-
-	/**
-	 * This variant retrieves {@link Class#getDeclaredFields()} from a local cache
-	 * in order to avoid the JVM's SecurityManager check and defensive array copying.
-	 * @param clazz the class to introspect
-	 * @return the cached array of fields
-	 * @throws IllegalStateException if introspection fails
-	 * @see Class#getDeclaredFields()
-	 */
-	private static Field[] getDeclaredFields(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		Field[] result = declaredFieldsCache.get(clazz);
-		if (result == null) {
-			try {
-				result = clazz.getDeclaredFields();
-				declaredFieldsCache.put(clazz, (result.length == 0 ? EMPTY_FIELD_ARRAY : result));
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
-						"] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Given the source object and the destination, which must be the same class
-	 * or a subclass, copy all fields, including inherited fields. Designed to
-	 * work on objects with public no-arg constructors.
-	 * @throws IllegalStateException if introspection fails
-	 */
-	public static void shallowCopyFieldState(final Object src, final Object dest) {
-		Assert.notNull(src, "Source for field copy cannot be null");
-		Assert.notNull(dest, "Destination for field copy cannot be null");
-		if (!src.getClass().isAssignableFrom(dest.getClass())) {
-			throw new IllegalArgumentException("Destination class [" + dest.getClass().getName() +
-					"] must be same or subclass as source class [" + src.getClass().getName() + "]");
-		}
-		doWithFields(src.getClass(), field -> {
-			makeAccessible(field);
-			Object srcValue = field.get(src);
-			field.set(dest, srcValue);
-		}, COPYABLE_FIELDS);
-	}
-
-	/**
-	 * Determine whether the given field is a "public static final" constant.
-	 * @param field the field to check
-	 */
-	public static boolean isPublicStaticFinal(Field field) {
-		int modifiers = field.getModifiers();
-		return (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers));
-	}
-
-	/**
-	 * Make the given field accessible, explicitly setting it accessible if
-	 * necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
-	 * @param field the field to make accessible
-	 * @see Field#setAccessible
-	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
-	public static void makeAccessible(Field field) {
-		if ((!Modifier.isPublic(field.getModifiers()) ||
-				!Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
-				Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
-			field.setAccessible(true);
-		}
-	}
-
-
-	// Cache handling
-
-	/**
-	 * Clear the internal method/field cache.
-	 * @since 4.2.4
-	 */
-	public static void clearCache() {
-		declaredMethodsCache.clear();
-		declaredFieldsCache.clear();
-	}
-
-
-	/**
-	 * Action to take on each method.
-	 */
-	@FunctionalInterface
-	public interface MethodCallback {
-
-		/**
-		 * Perform an operation using the given method.
-		 * @param method the method to operate on
-		 */
-		void doWith(Method method) throws IllegalArgumentException, IllegalAccessException;
-	}
-
-
-	/**
-	 * Callback optionally used to filter methods to be operated on by a method callback.
-	 */
-	@FunctionalInterface
-	public interface MethodFilter {
-
-		/**
-		 * Determine whether the given method matches.
-		 * @param method the method to check
-		 */
-		boolean matches(Method method);
-
-		/**
-		 * Create a composite filter based on this filter <em>and</em> the provided filter.
-		 * <p>If this filter does not match, the next filter will not be applied.
-		 * @param next the next {@code MethodFilter}
-		 * @return a composite {@code MethodFilter}
-		 * @throws IllegalArgumentException if the MethodFilter argument is {@code null}
-		 * @since 5.3.2
-		 */
-		default MethodFilter and(MethodFilter next) {
-			Assert.notNull(next, "Next MethodFilter must not be null");
-			return method -> matches(method) && next.matches(method);
-		}
-	}
-
-
-	/**
-	 * Callback interface invoked on each field in the hierarchy.
-	 */
-	@FunctionalInterface
-	public interface FieldCallback {
-
-		/**
-		 * Perform an operation using the given field.
-		 * @param field the field to operate on
-		 */
-		void doWith(Field field) throws IllegalArgumentException, IllegalAccessException;
-	}
-
-
-	/**
-	 * Callback optionally used to filter fields to be operated on by a field callback.
-	 */
-	@FunctionalInterface
-	public interface FieldFilter {
-
-		/**
-		 * Determine whether the given field matches.
-		 * @param field the field to check
-		 */
-		boolean matches(Field field);
-
-		/**
-		 * Create a composite filter based on this filter <em>and</em> the provided filter.
-		 * <p>If this filter does not match, the next filter will not be applied.
-		 * @param next the next {@code FieldFilter}
-		 * @return a composite {@code FieldFilter}
-		 * @throws IllegalArgumentException if the FieldFilter argument is {@code null}
-		 * @since 5.3.2
-		 */
-		default FieldFilter and(FieldFilter next) {
-			Assert.notNull(next, "Next FieldFilter must not be null");
-			return field -> matches(field) && next.matches(field);
-		}
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
deleted file mode 100644
index f8af0f49..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/StreamUtils.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2002-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-
-/**
- * Simple utility methods for dealing with streams. The copy methods of this class are
- * similar to those defined in {@link FileCopyUtils} except that all affected streams are
- * left open when done. All copy methods use a block size of 4096 bytes.
- *
- * <p>Mainly for use within the framework, but also useful for application code.
- *
- * @author Juergen Hoeller
- * @author Phillip Webb
- * @author Brian Clozel
- * @since 3.2.2
- * @see FileCopyUtils
- */
-public abstract class StreamUtils {
-
-	/**
-	 * The default buffer size used when copying bytes.
-	 */
-	public static final int BUFFER_SIZE = 4096;
-
-	private static final byte[] EMPTY_CONTENT = new byte[0];
-
-
-	/**
-	 * Copy the contents of the given InputStream into a new byte array.
-	 * <p>Leaves the stream open when done.
-	 * @param in the stream to copy from (may be {@code null} or empty)
-	 * @return the new byte array that has been copied to (possibly empty)
-	 * @throws IOException in case of I/O errors
-	 */
-	public static byte[] copyToByteArray(@Nullable InputStream in) throws IOException {
-		if (in == null) {
-			return new byte[0];
-		}
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE);
-		copy(in, out);
-		return out.toByteArray();
-	}
-
-	/**
-	 * Copy the contents of the given InputStream into a String.
-	 * <p>Leaves the stream open when done.
-	 * @param in the InputStream to copy from (may be {@code null} or empty)
-	 * @param charset the {@link Charset} to use to decode the bytes
-	 * @return the String that has been copied to (possibly empty)
-	 * @throws IOException in case of I/O errors
-	 */
-	public static String copyToString(@Nullable InputStream in, Charset charset) throws IOException {
-		if (in == null) {
-			return "";
-		}
-
-		StringBuilder out = new StringBuilder(BUFFER_SIZE);
-		InputStreamReader reader = new InputStreamReader(in, charset);
-		char[] buffer = new char[BUFFER_SIZE];
-		int charsRead;
-		while ((charsRead = reader.read(buffer)) != -1) {
-			out.append(buffer, 0, charsRead);
-		}
-		return out.toString();
-	}
-
-	/**
-	 * Copy the contents of the given {@link ByteArrayOutputStream} into a {@link String}.
-	 * <p>This is a more effective equivalent of {@code new String(baos.toByteArray(), charset)}.
-	 * @param baos the {@code ByteArrayOutputStream} to be copied into a String
-	 * @param charset the {@link Charset} to use to decode the bytes
-	 * @return the String that has been copied to (possibly empty)
-	 * @since 5.2.6
-	 */
-	public static String copyToString(ByteArrayOutputStream baos, Charset charset) {
-		Assert.notNull(baos, "No ByteArrayOutputStream specified");
-		Assert.notNull(charset, "No Charset specified");
-		try {
-			// Can be replaced with toString(Charset) call in Java 10+
-			return baos.toString(charset.name());
-		}
-		catch (UnsupportedEncodingException ex) {
-			// Should never happen
-			throw new IllegalArgumentException("Invalid charset name: " + charset, ex);
-		}
-	}
-
-	/**
-	 * Copy the contents of the given byte array to the given OutputStream.
-	 * <p>Leaves the stream open when done.
-	 * @param in the byte array to copy from
-	 * @param out the OutputStream to copy to
-	 * @throws IOException in case of I/O errors
-	 */
-	public static void copy(byte[] in, OutputStream out) throws IOException {
-		Assert.notNull(in, "No input byte array specified");
-		Assert.notNull(out, "No OutputStream specified");
-
-		out.write(in);
-		out.flush();
-	}
-
-	/**
-	 * Copy the contents of the given String to the given OutputStream.
-	 * <p>Leaves the stream open when done.
-	 * @param in the String to copy from
-	 * @param charset the Charset
-	 * @param out the OutputStream to copy to
-	 * @throws IOException in case of I/O errors
-	 */
-	public static void copy(String in, Charset charset, OutputStream out) throws IOException {
-		Assert.notNull(in, "No input String specified");
-		Assert.notNull(charset, "No Charset specified");
-		Assert.notNull(out, "No OutputStream specified");
-
-		Writer writer = new OutputStreamWriter(out, charset);
-		writer.write(in);
-		writer.flush();
-	}
-
-	/**
-	 * Copy the contents of the given InputStream to the given OutputStream.
-	 * <p>Leaves both streams open when done.
-	 * @param in the InputStream to copy from
-	 * @param out the OutputStream to copy to
-	 * @return the number of bytes copied
-	 * @throws IOException in case of I/O errors
-	 */
-	public static int copy(InputStream in, OutputStream out) throws IOException {
-		Assert.notNull(in, "No InputStream specified");
-		Assert.notNull(out, "No OutputStream specified");
-
-		int byteCount = 0;
-		byte[] buffer = new byte[BUFFER_SIZE];
-		int bytesRead;
-		while ((bytesRead = in.read(buffer)) != -1) {
-			out.write(buffer, 0, bytesRead);
-			byteCount += bytesRead;
-		}
-		out.flush();
-		return byteCount;
-	}
-
-	/**
-	 * Copy a range of content of the given InputStream to the given OutputStream.
-	 * <p>If the specified range exceeds the length of the InputStream, this copies
-	 * up to the end of the stream and returns the actual number of copied bytes.
-	 * <p>Leaves both streams open when done.
-	 * @param in the InputStream to copy from
-	 * @param out the OutputStream to copy to
-	 * @param start the position to start copying from
-	 * @param end the position to end copying
-	 * @return the number of bytes copied
-	 * @throws IOException in case of I/O errors
-	 * @since 4.3
-	 */
-	public static long copyRange(InputStream in, OutputStream out, long start, long end) throws IOException {
-		Assert.notNull(in, "No InputStream specified");
-		Assert.notNull(out, "No OutputStream specified");
-
-		long skipped = in.skip(start);
-		if (skipped < start) {
-			throw new IOException("Skipped only " + skipped + " bytes out of " + start + " required");
-		}
-
-		long bytesToCopy = end - start + 1;
-		byte[] buffer = new byte[(int) Math.min(StreamUtils.BUFFER_SIZE, bytesToCopy)];
-		while (bytesToCopy > 0) {
-			int bytesRead = in.read(buffer);
-			if (bytesRead == -1) {
-				break;
-			}
-			else if (bytesRead <= bytesToCopy) {
-				out.write(buffer, 0, bytesRead);
-				bytesToCopy -= bytesRead;
-			}
-			else {
-				out.write(buffer, 0, (int) bytesToCopy);
-				bytesToCopy = 0;
-			}
-		}
-		return (end - start + 1 - bytesToCopy);
-	}
-
-	/**
-	 * Drain the remaining content of the given InputStream.
-	 * <p>Leaves the InputStream open when done.
-	 * @param in the InputStream to drain
-	 * @return the number of bytes read
-	 * @throws IOException in case of I/O errors
-	 * @since 4.3
-	 */
-	public static int drain(InputStream in) throws IOException {
-		Assert.notNull(in, "No InputStream specified");
-		byte[] buffer = new byte[BUFFER_SIZE];
-		int bytesRead = -1;
-		int byteCount = 0;
-		while ((bytesRead = in.read(buffer)) != -1) {
-			byteCount += bytesRead;
-		}
-		return byteCount;
-	}
-
-	/**
-	 * Return an efficient empty {@link InputStream}.
-	 * @return a {@link ByteArrayInputStream} based on an empty byte array
-	 * @since 4.2.2
-	 */
-	public static InputStream emptyInput() {
-		return new ByteArrayInputStream(EMPTY_CONTENT);
-	}
-
-	/**
-	 * Return a variant of the given {@link InputStream} where calling
-	 * {@link InputStream#close() close()} has no effect.
-	 * @param in the InputStream to decorate
-	 * @return a version of the InputStream that ignores calls to close
-	 */
-	public static InputStream nonClosing(InputStream in) {
-		Assert.notNull(in, "No InputStream specified");
-		return new NonClosingInputStream(in);
-	}
-
-	/**
-	 * Return a variant of the given {@link OutputStream} where calling
-	 * {@link OutputStream#close() close()} has no effect.
-	 * @param out the OutputStream to decorate
-	 * @return a version of the OutputStream that ignores calls to close
-	 */
-	public static OutputStream nonClosing(OutputStream out) {
-		Assert.notNull(out, "No OutputStream specified");
-		return new NonClosingOutputStream(out);
-	}
-
-
-	private static class NonClosingInputStream extends FilterInputStream {
-
-		public NonClosingInputStream(InputStream in) {
-			super(in);
-		}
-
-		@Override
-		public void close() throws IOException {
-		}
-	}
-
-
-	private static class NonClosingOutputStream extends FilterOutputStream {
-
-		public NonClosingOutputStream(OutputStream out) {
-			super(out);
-		}
-
-		@Override
-		public void write(byte[] b, int off, int let) throws IOException {
-			// It is critical that we override this method for performance
-			this.out.write(b, off, let);
-		}
-
-		@Override
-		public void close() throws IOException {
-		}
-	}
-
-}
diff --git a/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java b/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java
deleted file mode 100644
index 0e239bf9..00000000
--- a/microsphere-spring-compatible/src/main/java/org/springframework/util/StringUtils.java
+++ /dev/null
@@ -1,1433 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import org.springframework.lang.Nullable;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-
-/**
- * Miscellaneous {@link String} utility methods.
- *
- * <p>Mainly for internal use within the framework; consider
- * <a href="https://commons.apache.org/proper/commons-lang/">Apache's Commons Lang</a>
- * for a more comprehensive suite of {@code String} utilities.
- *
- * <p>This class delivers some simple functionality that should really be
- * provided by the core Java {@link String} and {@link StringBuilder}
- * classes. It also provides easy-to-use methods to convert between
- * delimited strings, such as CSV strings, and collections and arrays.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Keith Donald
- * @author Rob Harrop
- * @author Rick Evans
- * @author Arjen Poutsma
- * @author Sam Brannen
- * @author Brian Clozel
- * @since 16 April 2001
- */
-public abstract class StringUtils {
-
-	private static final String[] EMPTY_STRING_ARRAY = {};
-
-	private static final String FOLDER_SEPARATOR = "/";
-
-	private static final char FOLDER_SEPARATOR_CHAR = '/';
-
-	private static final String WINDOWS_FOLDER_SEPARATOR = "\\";
-
-	private static final String TOP_PATH = "..";
-
-	private static final String CURRENT_PATH = ".";
-
-	private static final char EXTENSION_SEPARATOR = '.';
-
-	private static final int DEFAULT_TRUNCATION_THRESHOLD = 100;
-
-	private static final String TRUNCATION_SUFFIX = " (truncated)...";
-
-
-	//---------------------------------------------------------------------
-	// General convenience methods for working with Strings
-	//---------------------------------------------------------------------
-
-	/**
-	 * Check whether the given object (possibly a {@code String}) is empty.
-	 * This is effectively a shortcut for {@code !hasLength(String)}.
-	 * <p>This method accepts any Object as an argument, comparing it to
-	 * {@code null} and the empty String. As a consequence, this method
-	 * will never return {@code true} for a non-null non-String object.
-	 * <p>The Object signature is useful for general attribute handling code
-	 * that commonly deals with Strings but generally has to iterate over
-	 * Objects since attributes may e.g. be primitive value objects as well.
-	 * <p><b>Note: If the object is typed to {@code String} upfront, prefer
-	 * {@link #hasLength(String)} or {@link #hasText(String)} instead.</b>
-	 * @param str the candidate object (possibly a {@code String})
-	 * @since 3.2.1
-	 * @deprecated as of 5.3, in favor of {@link #hasLength(String)} and
-	 * {@link #hasText(String)} (or {@link ObjectUtils#isEmpty(Object)})
-	 */
-	@Deprecated
-	public static boolean isEmpty(@Nullable Object str) {
-		return (str == null || "".equals(str));
-	}
-
-	/**
-	 * Check that the given {@code CharSequence} is neither {@code null} nor
-	 * of length 0.
-	 * <p>Note: this method returns {@code true} for a {@code CharSequence}
-	 * that purely consists of whitespace.
-	 * <p><pre class="code">
-	 * StringUtils.hasLength(null) = false
-	 * StringUtils.hasLength("") = false
-	 * StringUtils.hasLength(" ") = true
-	 * StringUtils.hasLength("Hello") = true
-	 * </pre>
-	 * @param str the {@code CharSequence} to check (may be {@code null})
-	 * @return {@code true} if the {@code CharSequence} is not {@code null} and has length
-	 * @see #hasLength(String)
-	 * @see #hasText(CharSequence)
-	 */
-	public static boolean hasLength(@Nullable CharSequence str) {
-		return (str != null && str.length() > 0);
-	}
-
-	/**
-	 * Check that the given {@code String} is neither {@code null} nor of length 0.
-	 * <p>Note: this method returns {@code true} for a {@code String} that
-	 * purely consists of whitespace.
-	 * @param str the {@code String} to check (may be {@code null})
-	 * @return {@code true} if the {@code String} is not {@code null} and has length
-	 * @see #hasLength(CharSequence)
-	 * @see #hasText(String)
-	 */
-	public static boolean hasLength(@Nullable String str) {
-		return (str != null && !str.isEmpty());
-	}
-
-	/**
-	 * Check whether the given {@code CharSequence} contains actual <em>text</em>.
-	 * <p>More specifically, this method returns {@code true} if the
-	 * {@code CharSequence} is not {@code null}, its length is greater than
-	 * 0, and it contains at least one non-whitespace character.
-	 * <p><pre class="code">
-	 * StringUtils.hasText(null) = false
-	 * StringUtils.hasText("") = false
-	 * StringUtils.hasText(" ") = false
-	 * StringUtils.hasText("12345") = true
-	 * StringUtils.hasText(" 12345 ") = true
-	 * </pre>
-	 * @param str the {@code CharSequence} to check (may be {@code null})
-	 * @return {@code true} if the {@code CharSequence} is not {@code null},
-	 * its length is greater than 0, and it does not contain whitespace only
-	 * @see #hasText(String)
-	 * @see #hasLength(CharSequence)
-	 * @see Character#isWhitespace
-	 */
-	public static boolean hasText(@Nullable CharSequence str) {
-		return (str != null && str.length() > 0 && containsText(str));
-	}
-
-	/**
-	 * Check whether the given {@code String} contains actual <em>text</em>.
-	 * <p>More specifically, this method returns {@code true} if the
-	 * {@code String} is not {@code null}, its length is greater than 0,
-	 * and it contains at least one non-whitespace character.
-	 * @param str the {@code String} to check (may be {@code null})
-	 * @return {@code true} if the {@code String} is not {@code null}, its
-	 * length is greater than 0, and it does not contain whitespace only
-	 * @see #hasText(CharSequence)
-	 * @see #hasLength(String)
-	 * @see Character#isWhitespace
-	 */
-	public static boolean hasText(@Nullable String str) {
-		return (str != null && !str.isEmpty() && containsText(str));
-	}
-
-	private static boolean containsText(CharSequence str) {
-		int strLen = str.length();
-		for (int i = 0; i < strLen; i++) {
-			if (!Character.isWhitespace(str.charAt(i))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given {@code CharSequence} contains any whitespace characters.
-	 * @param str the {@code CharSequence} to check (may be {@code null})
-	 * @return {@code true} if the {@code CharSequence} is not empty and
-	 * contains at least 1 whitespace character
-	 * @see Character#isWhitespace
-	 */
-	public static boolean containsWhitespace(@Nullable CharSequence str) {
-		if (!hasLength(str)) {
-			return false;
-		}
-
-		int strLen = str.length();
-		for (int i = 0; i < strLen; i++) {
-			if (Character.isWhitespace(str.charAt(i))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the given {@code String} contains any whitespace characters.
-	 * @param str the {@code String} to check (may be {@code null})
-	 * @return {@code true} if the {@code String} is not empty and
-	 * contains at least 1 whitespace character
-	 * @see #containsWhitespace(CharSequence)
-	 */
-	public static boolean containsWhitespace(@Nullable String str) {
-		return containsWhitespace((CharSequence) str);
-	}
-
-	/**
-	 * Trim leading and trailing whitespace from the given {@code String}.
-	 * @param str the {@code String} to check
-	 * @return the trimmed {@code String}
-	 * @see Character#isWhitespace
-	 */
-	public static String trimWhitespace(String str) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int beginIndex = 0;
-		int endIndex = str.length() - 1;
-
-		while (beginIndex <= endIndex && Character.isWhitespace(str.charAt(beginIndex))) {
-			beginIndex++;
-		}
-
-		while (endIndex > beginIndex && Character.isWhitespace(str.charAt(endIndex))) {
-			endIndex--;
-		}
-
-		return str.substring(beginIndex, endIndex + 1);
-	}
-
-	/**
-	 * Trim <em>all</em> whitespace from the given {@code CharSequence}:
-	 * leading, trailing, and in between characters.
-	 * @param str the {@code CharSequence} to check
-	 * @return the trimmed {@code CharSequence}
-	 * @since 5.3.22
-	 * @see #trimAllWhitespace(String)
-	 * @see Character#isWhitespace
-	 */
-	public static CharSequence trimAllWhitespace(CharSequence str) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int len = str.length();
-		StringBuilder sb = new StringBuilder(str.length());
-		for (int i = 0; i < len; i++) {
-			char c = str.charAt(i);
-			if (!Character.isWhitespace(c)) {
-				sb.append(c);
-			}
-		}
-		return sb;
-	}
-
-	/**
-	 * Trim <em>all</em> whitespace from the given {@code String}:
-	 * leading, trailing, and in between characters.
-	 * @param str the {@code String} to check
-	 * @return the trimmed {@code String}
-	 * @see #trimAllWhitespace(CharSequence)
-	 * @see Character#isWhitespace
-	 */
-	public static String trimAllWhitespace(String str) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		return trimAllWhitespace((CharSequence) str).toString();
-	}
-
-	/**
-	 * Trim leading whitespace from the given {@code String}.
-	 * @param str the {@code String} to check
-	 * @return the trimmed {@code String}
-	 * @see Character#isWhitespace
-	 */
-	public static String trimLeadingWhitespace(String str) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int beginIdx = 0;
-		while (beginIdx < str.length() && Character.isWhitespace(str.charAt(beginIdx))) {
-			beginIdx++;
-		}
-		return str.substring(beginIdx);
-	}
-
-	/**
-	 * Trim trailing whitespace from the given {@code String}.
-	 * @param str the {@code String} to check
-	 * @return the trimmed {@code String}
-	 * @see Character#isWhitespace
-	 */
-	public static String trimTrailingWhitespace(String str) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int endIdx = str.length() - 1;
-		while (endIdx >= 0 && Character.isWhitespace(str.charAt(endIdx))) {
-			endIdx--;
-		}
-		return str.substring(0, endIdx + 1);
-	}
-
-	/**
-	 * Trim all occurrences of the supplied leading character from the given {@code String}.
-	 * @param str the {@code String} to check
-	 * @param leadingCharacter the leading character to be trimmed
-	 * @return the trimmed {@code String}
-	 */
-	public static String trimLeadingCharacter(String str, char leadingCharacter) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int beginIdx = 0;
-		while (beginIdx < str.length() && leadingCharacter == str.charAt(beginIdx)) {
-			beginIdx++;
-		}
-		return str.substring(beginIdx);
-	}
-
-	/**
-	 * Trim all occurrences of the supplied trailing character from the given {@code String}.
-	 * @param str the {@code String} to check
-	 * @param trailingCharacter the trailing character to be trimmed
-	 * @return the trimmed {@code String}
-	 */
-	public static String trimTrailingCharacter(String str, char trailingCharacter) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		int endIdx = str.length() - 1;
-		while (endIdx >= 0 && trailingCharacter == str.charAt(endIdx)) {
-			endIdx--;
-		}
-		return str.substring(0, endIdx + 1);
-	}
-
-	/**
-	 * Test if the given {@code String} matches the given single character.
-	 * @param str the {@code String} to check
-	 * @param singleCharacter the character to compare to
-	 * @since 5.2.9
-	 */
-	public static boolean matchesCharacter(@Nullable String str, char singleCharacter) {
-		return (str != null && str.length() == 1 && str.charAt(0) == singleCharacter);
-	}
-
-	/**
-	 * Test if the given {@code String} starts with the specified prefix,
-	 * ignoring upper/lower case.
-	 * @param str the {@code String} to check
-	 * @param prefix the prefix to look for
-	 * @see String#startsWith
-	 */
-	public static boolean startsWithIgnoreCase(@Nullable String str, @Nullable String prefix) {
-		return (str != null && prefix != null && str.length() >= prefix.length() &&
-				str.regionMatches(true, 0, prefix, 0, prefix.length()));
-	}
-
-	/**
-	 * Test if the given {@code String} ends with the specified suffix,
-	 * ignoring upper/lower case.
-	 * @param str the {@code String} to check
-	 * @param suffix the suffix to look for
-	 * @see String#endsWith
-	 */
-	public static boolean endsWithIgnoreCase(@Nullable String str, @Nullable String suffix) {
-		return (str != null && suffix != null && str.length() >= suffix.length() &&
-				str.regionMatches(true, str.length() - suffix.length(), suffix, 0, suffix.length()));
-	}
-
-	/**
-	 * Test whether the given string matches the given substring
-	 * at the given index.
-	 * @param str the original string (or StringBuilder)
-	 * @param index the index in the original string to start matching against
-	 * @param substring the substring to match at the given index
-	 */
-	public static boolean substringMatch(CharSequence str, int index, CharSequence substring) {
-		if (index + substring.length() > str.length()) {
-			return false;
-		}
-		for (int i = 0; i < substring.length(); i++) {
-			if (str.charAt(index + i) != substring.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Count the occurrences of the substring {@code sub} in string {@code str}.
-	 * @param str string to search in
-	 * @param sub string to search for
-	 */
-	public static int countOccurrencesOf(String str, String sub) {
-		if (!hasLength(str) || !hasLength(sub)) {
-			return 0;
-		}
-
-		int count = 0;
-		int pos = 0;
-		int idx;
-		while ((idx = str.indexOf(sub, pos)) != -1) {
-			++count;
-			pos = idx + sub.length();
-		}
-		return count;
-	}
-
-	/**
-	 * Replace all occurrences of a substring within a string with another string.
-	 * @param inString {@code String} to examine
-	 * @param oldPattern {@code String} to replace
-	 * @param newPattern {@code String} to insert
-	 * @return a {@code String} with the replacements
-	 */
-	public static String replace(String inString, String oldPattern, @Nullable String newPattern) {
-		if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {
-			return inString;
-		}
-		int index = inString.indexOf(oldPattern);
-		if (index == -1) {
-			// no occurrence -> can return input as-is
-			return inString;
-		}
-
-		int capacity = inString.length();
-		if (newPattern.length() > oldPattern.length()) {
-			capacity += 16;
-		}
-		StringBuilder sb = new StringBuilder(capacity);
-
-		int pos = 0;  // our position in the old string
-		int patLen = oldPattern.length();
-		while (index >= 0) {
-			sb.append(inString, pos, index);
-			sb.append(newPattern);
-			pos = index + patLen;
-			index = inString.indexOf(oldPattern, pos);
-		}
-
-		// append any characters to the right of a match
-		sb.append(inString, pos, inString.length());
-		return sb.toString();
-	}
-
-	/**
-	 * Delete all occurrences of the given substring.
-	 * @param inString the original {@code String}
-	 * @param pattern the pattern to delete all occurrences of
-	 * @return the resulting {@code String}
-	 */
-	public static String delete(String inString, String pattern) {
-		return replace(inString, pattern, "");
-	}
-
-	/**
-	 * Delete any character in a given {@code String}.
-	 * @param inString the original {@code String}
-	 * @param charsToDelete a set of characters to delete.
-	 * E.g. "az\n" will delete 'a's, 'z's and new lines.
-	 * @return the resulting {@code String}
-	 */
-	public static String deleteAny(String inString, @Nullable String charsToDelete) {
-		if (!hasLength(inString) || !hasLength(charsToDelete)) {
-			return inString;
-		}
-
-		int lastCharIndex = 0;
-		char[] result = new char[inString.length()];
-		for (int i = 0; i < inString.length(); i++) {
-			char c = inString.charAt(i);
-			if (charsToDelete.indexOf(c) == -1) {
-				result[lastCharIndex++] = c;
-			}
-		}
-		if (lastCharIndex == inString.length()) {
-			return inString;
-		}
-		return new String(result, 0, lastCharIndex);
-	}
-
-	//---------------------------------------------------------------------
-	// Convenience methods for working with formatted Strings
-	//---------------------------------------------------------------------
-
-	/**
-	 * Quote the given {@code String} with single quotes.
-	 * @param str the input {@code String} (e.g. "myString")
-	 * @return the quoted {@code String} (e.g. "'myString'"),
-	 * or {@code null} if the input was {@code null}
-	 */
-	@Nullable
-	public static String quote(@Nullable String str) {
-		return (str != null ? "'" + str + "'" : null);
-	}
-
-	/**
-	 * Turn the given Object into a {@code String} with single quotes
-	 * if it is a {@code String}; keeping the Object as-is else.
-	 * @param obj the input Object (e.g. "myString")
-	 * @return the quoted {@code String} (e.g. "'myString'"),
-	 * or the input object as-is if not a {@code String}
-	 */
-	@Nullable
-	public static Object quoteIfString(@Nullable Object obj) {
-		return (obj instanceof String ? quote((String) obj) : obj);
-	}
-
-	/**
-	 * Unqualify a string qualified by a '.' dot character. For example,
-	 * "this.name.is.qualified", returns "qualified".
-	 * @param qualifiedName the qualified name
-	 */
-	public static String unqualify(String qualifiedName) {
-		return unqualify(qualifiedName, '.');
-	}
-
-	/**
-	 * Unqualify a string qualified by a separator character. For example,
-	 * "this:name:is:qualified" returns "qualified" if using a ':' separator.
-	 * @param qualifiedName the qualified name
-	 * @param separator the separator
-	 */
-	public static String unqualify(String qualifiedName, char separator) {
-		return qualifiedName.substring(qualifiedName.lastIndexOf(separator) + 1);
-	}
-
-	/**
-	 * Capitalize a {@code String}, changing the first letter to
-	 * upper case as per {@link Character#toUpperCase(char)}.
-	 * No other letters are changed.
-	 * @param str the {@code String} to capitalize
-	 * @return the capitalized {@code String}
-	 */
-	public static String capitalize(String str) {
-		return changeFirstCharacterCase(str, true);
-	}
-
-	/**
-	 * Uncapitalize a {@code String}, changing the first letter to
-	 * lower case as per {@link Character#toLowerCase(char)}.
-	 * No other letters are changed.
-	 * @param str the {@code String} to uncapitalize
-	 * @return the uncapitalized {@code String}
-	 */
-	public static String uncapitalize(String str) {
-		return changeFirstCharacterCase(str, false);
-	}
-
-	private static String changeFirstCharacterCase(String str, boolean capitalize) {
-		if (!hasLength(str)) {
-			return str;
-		}
-
-		char baseChar = str.charAt(0);
-		char updatedChar;
-		if (capitalize) {
-			updatedChar = Character.toUpperCase(baseChar);
-		}
-		else {
-			updatedChar = Character.toLowerCase(baseChar);
-		}
-		if (baseChar == updatedChar) {
-			return str;
-		}
-
-		char[] chars = str.toCharArray();
-		chars[0] = updatedChar;
-		return new String(chars);
-	}
-
-	/**
-	 * Extract the filename from the given Java resource path,
-	 * e.g. {@code "mypath/myfile.txt" &rarr; "myfile.txt"}.
-	 * @param path the file path (may be {@code null})
-	 * @return the extracted filename, or {@code null} if none
-	 */
-	@Nullable
-	public static String getFilename(@Nullable String path) {
-		if (path == null) {
-			return null;
-		}
-
-		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
-		return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);
-	}
-
-	/**
-	 * Extract the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" &rarr; "txt".
-	 * @param path the file path (may be {@code null})
-	 * @return the extracted filename extension, or {@code null} if none
-	 */
-	@Nullable
-	public static String getFilenameExtension(@Nullable String path) {
-		if (path == null) {
-			return null;
-		}
-
-		int extIndex = path.lastIndexOf(EXTENSION_SEPARATOR);
-		if (extIndex == -1) {
-			return null;
-		}
-
-		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
-		if (folderIndex > extIndex) {
-			return null;
-		}
-
-		return path.substring(extIndex + 1);
-	}
-
-	/**
-	 * Strip the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" &rarr; "mypath/myfile".
-	 * @param path the file path
-	 * @return the path with stripped filename extension
-	 */
-	public static String stripFilenameExtension(String path) {
-		int extIndex = path.lastIndexOf(EXTENSION_SEPARATOR);
-		if (extIndex == -1) {
-			return path;
-		}
-
-		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
-		if (folderIndex > extIndex) {
-			return path;
-		}
-
-		return path.substring(0, extIndex);
-	}
-
-	/**
-	 * Apply the given relative path to the given Java resource path,
-	 * assuming standard Java folder separation (i.e. "/" separators).
-	 * @param path the path to start from (usually a full file path)
-	 * @param relativePath the relative path to apply
-	 * (relative to the full file path above)
-	 * @return the full file path that results from applying the relative path
-	 */
-	public static String applyRelativePath(String path, String relativePath) {
-		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
-		if (separatorIndex != -1) {
-			String newPath = path.substring(0, separatorIndex);
-			if (!relativePath.startsWith(FOLDER_SEPARATOR)) {
-				newPath += FOLDER_SEPARATOR_CHAR;
-			}
-			return newPath + relativePath;
-		}
-		else {
-			return relativePath;
-		}
-	}
-
-	/**
-	 * Normalize the path by suppressing sequences like "path/.." and
-	 * inner simple dots.
-	 * <p>The result is convenient for path comparison. For other uses,
-	 * notice that Windows separators ("\") are replaced by simple slashes.
-	 * <p><strong>NOTE</strong> that {@code cleanPath} should not be depended
-	 * upon in a security context. Other mechanisms should be used to prevent
-	 * path-traversal issues.
-	 * @param path the original path
-	 * @return the normalized path
-	 */
-	public static String cleanPath(String path) {
-		if (!hasLength(path)) {
-			return path;
-		}
-
-		String normalizedPath = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
-		String pathToUse = normalizedPath;
-
-		// Shortcut if there is no work to do
-		if (pathToUse.indexOf('.') == -1) {
-			return pathToUse;
-		}
-
-		// Strip prefix from path to analyze, to not treat it as part of the
-		// first path element. This is necessary to correctly parse paths like
-		// "file:core/../core/io/Resource.class", where the ".." should just
-		// strip the first "core" directory while keeping the "file:" prefix.
-		int prefixIndex = pathToUse.indexOf(':');
-		String prefix = "";
-		if (prefixIndex != -1) {
-			prefix = pathToUse.substring(0, prefixIndex + 1);
-			if (prefix.contains(FOLDER_SEPARATOR)) {
-				prefix = "";
-			}
-			else {
-				pathToUse = pathToUse.substring(prefixIndex + 1);
-			}
-		}
-		if (pathToUse.startsWith(FOLDER_SEPARATOR)) {
-			prefix = prefix + FOLDER_SEPARATOR;
-			pathToUse = pathToUse.substring(1);
-		}
-
-		String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);
-		// we never require more elements than pathArray and in the common case the same number
-		Deque<String> pathElements = new ArrayDeque<>(pathArray.length);
-		int tops = 0;
-
-		for (int i = pathArray.length - 1; i >= 0; i--) {
-			String element = pathArray[i];
-			if (CURRENT_PATH.equals(element)) {
-				// Points to current directory - drop it.
-			}
-			else if (TOP_PATH.equals(element)) {
-				// Registering top path found.
-				tops++;
-			}
-			else {
-				if (tops > 0) {
-					// Merging path element with element corresponding to top path.
-					tops--;
-				}
-				else {
-					// Normal path element found.
-					pathElements.addFirst(element);
-				}
-			}
-		}
-
-		// All path elements stayed the same - shortcut
-		if (pathArray.length == pathElements.size()) {
-			return normalizedPath;
-		}
-		// Remaining top paths need to be retained.
-		for (int i = 0; i < tops; i++) {
-			pathElements.addFirst(TOP_PATH);
-		}
-		// If nothing else left, at least explicitly point to current path.
-		if (pathElements.size() == 1 && pathElements.getLast().isEmpty() && !prefix.endsWith(FOLDER_SEPARATOR)) {
-			pathElements.addFirst(CURRENT_PATH);
-		}
-
-		final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
-		// avoid string concatenation with empty prefix
-		return prefix.isEmpty() ? joined : prefix + joined;
-	}
-
-	/**
-	 * Compare two paths after normalization of them.
-	 * @param path1 first path for comparison
-	 * @param path2 second path for comparison
-	 * @return whether the two paths are equivalent after normalization
-	 */
-	public static boolean pathEquals(String path1, String path2) {
-		return cleanPath(path1).equals(cleanPath(path2));
-	}
-
-	/**
-	 * Decode the given encoded URI component value. Based on the following rules:
-	 * <ul>
-	 * <li>Alphanumeric characters {@code "a"} through {@code "z"}, {@code "A"} through {@code "Z"},
-	 * and {@code "0"} through {@code "9"} stay the same.</li>
-	 * <li>Special characters {@code "-"}, {@code "_"}, {@code "."}, and {@code "*"} stay the same.</li>
-	 * <li>A sequence "{@code %<i>xy</i>}" is interpreted as a hexadecimal representation of the character.</li>
-	 * <li>For all other characters (including those already decoded), the output is undefined.</li>
-	 * </ul>
-	 * @param source the encoded String
-	 * @param charset the character set
-	 * @return the decoded value
-	 * @throws IllegalArgumentException when the given source contains invalid encoded sequences
-	 * @since 5.0
-	 * @see java.net.URLDecoder#decode(String, String)
-	 */
-	public static String uriDecode(String source, Charset charset) {
-		int length = source.length();
-		if (length == 0) {
-			return source;
-		}
-		Assert.notNull(charset, "Charset must not be null");
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(length);
-		boolean changed = false;
-		for (int i = 0; i < length; i++) {
-			int ch = source.charAt(i);
-			if (ch == '%') {
-				if (i + 2 < length) {
-					char hex1 = source.charAt(i + 1);
-					char hex2 = source.charAt(i + 2);
-					int u = Character.digit(hex1, 16);
-					int l = Character.digit(hex2, 16);
-					if (u == -1 || l == -1) {
-						throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
-					}
-					baos.write((char) ((u << 4) + l));
-					i += 2;
-					changed = true;
-				}
-				else {
-					throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
-				}
-			}
-			else {
-				baos.write(ch);
-			}
-		}
-		return (changed ? StreamUtils.copyToString(baos, charset) : source);
-	}
-
-	/**
-	 * Parse the given {@code String} value into a {@link Locale}, accepting
-	 * the {@link Locale#toString} format as well as BCP 47 language tags as
-	 * specified by {@link Locale#forLanguageTag}.
-	 * @param localeValue the locale value: following either {@code Locale's}
-	 * {@code toString()} format ("en", "en_UK", etc.), also accepting spaces as
-	 * separators (as an alternative to underscores), or BCP 47 (e.g. "en-UK")
-	 * @return a corresponding {@code Locale} instance, or {@code null} if none
-	 * @throws IllegalArgumentException in case of an invalid locale specification
-	 * @since 5.0.4
-	 * @see #parseLocaleString
-	 * @see Locale#forLanguageTag
-	 */
-	@Nullable
-	public static Locale parseLocale(String localeValue) {
-		String[] tokens = tokenizeLocaleSource(localeValue);
-		if (tokens.length == 1) {
-			validateLocalePart(localeValue);
-			Locale resolved = Locale.forLanguageTag(localeValue);
-			if (resolved.getLanguage().length() > 0) {
-				return resolved;
-			}
-		}
-		return parseLocaleTokens(localeValue, tokens);
-	}
-
-	/**
-	 * Parse the given {@code String} representation into a {@link Locale}.
-	 * <p>For many parsing scenarios, this is an inverse operation of
-	 * {@link Locale#toString Locale's toString}, in a lenient sense.
-	 * This method does not aim for strict {@code Locale} design compliance;
-	 * it is rather specifically tailored for typical Spring parsing needs.
-	 * <p><b>Note: This delegate does not accept the BCP 47 language tag format.
-	 * Please use {@link #parseLocale} for lenient parsing of both formats.</b>
-	 * @param localeString the locale {@code String}: following {@code Locale's}
-	 * {@code toString()} format ("en", "en_UK", etc.), also accepting spaces as
-	 * separators (as an alternative to underscores)
-	 * @return a corresponding {@code Locale} instance, or {@code null} if none
-	 * @throws IllegalArgumentException in case of an invalid locale specification
-	 */
-	@Nullable
-	public static Locale parseLocaleString(String localeString) {
-		return parseLocaleTokens(localeString, tokenizeLocaleSource(localeString));
-	}
-
-	private static String[] tokenizeLocaleSource(String localeSource) {
-		return tokenizeToStringArray(localeSource, "_ ", false, false);
-	}
-
-	@Nullable
-	private static Locale parseLocaleTokens(String localeString, String[] tokens) {
-		String language = (tokens.length > 0 ? tokens[0] : "");
-		String country = (tokens.length > 1 ? tokens[1] : "");
-		validateLocalePart(language);
-		validateLocalePart(country);
-
-		String variant = "";
-		if (tokens.length > 2) {
-			// There is definitely a variant, and it is everything after the country
-			// code sans the separator between the country code and the variant.
-			int endIndexOfCountryCode = localeString.indexOf(country, language.length()) + country.length();
-			// Strip off any leading '_' and whitespace, what's left is the variant.
-			variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));
-			if (variant.startsWith("_")) {
-				variant = trimLeadingCharacter(variant, '_');
-			}
-		}
-
-		if (variant.isEmpty() && country.startsWith("#")) {
-			variant = country;
-			country = "";
-		}
-
-		return (language.length() > 0 ? new Locale(language, country, variant) : null);
-	}
-
-	private static void validateLocalePart(String localePart) {
-		for (int i = 0; i < localePart.length(); i++) {
-			char ch = localePart.charAt(i);
-			if (ch != ' ' && ch != '_' && ch != '-' && ch != '#' && !Character.isLetterOrDigit(ch)) {
-				throw new IllegalArgumentException(
-						"Locale part \"" + localePart + "\" contains invalid characters");
-			}
-		}
-	}
-
-	/**
-	 * Determine the RFC 3066 compliant language tag,
-	 * as used for the HTTP "Accept-Language" header.
-	 * @param locale the Locale to transform to a language tag
-	 * @return the RFC 3066 compliant language tag as {@code String}
-	 * @deprecated as of 5.0.4, in favor of {@link Locale#toLanguageTag()}
-	 */
-	@Deprecated
-	public static String toLanguageTag(Locale locale) {
-		return locale.getLanguage() + (hasText(locale.getCountry()) ? "-" + locale.getCountry() : "");
-	}
-
-	/**
-	 * Parse the given {@code timeZoneString} value into a {@link TimeZone}.
-	 * @param timeZoneString the time zone {@code String}, following {@link TimeZone#getTimeZone(String)}
-	 * but throwing {@link IllegalArgumentException} in case of an invalid time zone specification
-	 * @return a corresponding {@link TimeZone} instance
-	 * @throws IllegalArgumentException in case of an invalid time zone specification
-	 */
-	public static TimeZone parseTimeZoneString(String timeZoneString) {
-		TimeZone timeZone = TimeZone.getTimeZone(timeZoneString);
-		if ("GMT".equals(timeZone.getID()) && !timeZoneString.startsWith("GMT")) {
-			// We don't want that GMT fallback...
-			throw new IllegalArgumentException("Invalid time zone specification '" + timeZoneString + "'");
-		}
-		return timeZone;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Convenience methods for working with String arrays
-	//---------------------------------------------------------------------
-
-	/**
-	 * Copy the given {@link Collection} into a {@code String} array.
-	 * <p>The {@code Collection} must contain {@code String} elements only.
-	 * @param collection the {@code Collection} to copy
-	 * (potentially {@code null} or empty)
-	 * @return the resulting {@code String} array
-	 */
-	public static String[] toStringArray(@Nullable Collection<String> collection) {
-		return (!CollectionUtils.isEmpty(collection) ? collection.toArray(EMPTY_STRING_ARRAY) : EMPTY_STRING_ARRAY);
-	}
-
-	/**
-	 * Copy the given {@link Enumeration} into a {@code String} array.
-	 * <p>The {@code Enumeration} must contain {@code String} elements only.
-	 * @param enumeration the {@code Enumeration} to copy
-	 * (potentially {@code null} or empty)
-	 * @return the resulting {@code String} array
-	 */
-	public static String[] toStringArray(@Nullable Enumeration<String> enumeration) {
-		return (enumeration != null ? toStringArray(Collections.list(enumeration)) : EMPTY_STRING_ARRAY);
-	}
-
-	/**
-	 * Append the given {@code String} to the given {@code String} array,
-	 * returning a new array consisting of the input array contents plus
-	 * the given {@code String}.
-	 * @param array the array to append to (can be {@code null})
-	 * @param str the {@code String} to append
-	 * @return the new array (never {@code null})
-	 */
-	public static String[] addStringToArray(@Nullable String[] array, String str) {
-		if (ObjectUtils.isEmpty(array)) {
-			return new String[] {str};
-		}
-
-		String[] newArr = new String[array.length + 1];
-		System.arraycopy(array, 0, newArr, 0, array.length);
-		newArr[array.length] = str;
-		return newArr;
-	}
-
-	/**
-	 * Concatenate the given {@code String} arrays into one,
-	 * with overlapping array elements included twice.
-	 * <p>The order of elements in the original arrays is preserved.
-	 * @param array1 the first array (can be {@code null})
-	 * @param array2 the second array (can be {@code null})
-	 * @return the new array ({@code null} if both given arrays were {@code null})
-	 */
-	@Nullable
-	public static String[] concatenateStringArrays(@Nullable String[] array1, @Nullable String[] array2) {
-		if (ObjectUtils.isEmpty(array1)) {
-			return array2;
-		}
-		if (ObjectUtils.isEmpty(array2)) {
-			return array1;
-		}
-
-		String[] newArr = new String[array1.length + array2.length];
-		System.arraycopy(array1, 0, newArr, 0, array1.length);
-		System.arraycopy(array2, 0, newArr, array1.length, array2.length);
-		return newArr;
-	}
-
-	/**
-	 * Merge the given {@code String} arrays into one, with overlapping
-	 * array elements only included once.
-	 * <p>The order of elements in the original arrays is preserved
-	 * (with the exception of overlapping elements, which are only
-	 * included on their first occurrence).
-	 * @param array1 the first array (can be {@code null})
-	 * @param array2 the second array (can be {@code null})
-	 * @return the new array ({@code null} if both given arrays were {@code null})
-	 * @deprecated as of 4.3.15, in favor of manual merging via {@link LinkedHashSet}
-	 * (with every entry included at most once, even entries within the first array)
-	 */
-	@Deprecated
-	@Nullable
-	public static String[] mergeStringArrays(@Nullable String[] array1, @Nullable String[] array2) {
-		if (ObjectUtils.isEmpty(array1)) {
-			return array2;
-		}
-		if (ObjectUtils.isEmpty(array2)) {
-			return array1;
-		}
-
-		List<String> result = new ArrayList<>(Arrays.asList(array1));
-		for (String str : array2) {
-			if (!result.contains(str)) {
-				result.add(str);
-			}
-		}
-		return toStringArray(result);
-	}
-
-	/**
-	 * Sort the given {@code String} array if necessary.
-	 * @param array the original array (potentially empty)
-	 * @return the array in sorted form (never {@code null})
-	 */
-	public static String[] sortStringArray(String[] array) {
-		if (ObjectUtils.isEmpty(array)) {
-			return array;
-		}
-
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Trim the elements of the given {@code String} array, calling
-	 * {@code String.trim()} on each non-null element.
-	 * @param array the original {@code String} array (potentially empty)
-	 * @return the resulting array (of the same size) with trimmed elements
-	 */
-	public static String[] trimArrayElements(String[] array) {
-		if (ObjectUtils.isEmpty(array)) {
-			return array;
-		}
-
-		String[] result = new String[array.length];
-		for (int i = 0; i < array.length; i++) {
-			String element = array[i];
-			result[i] = (element != null ? element.trim() : null);
-		}
-		return result;
-	}
-
-	/**
-	 * Remove duplicate strings from the given array.
-	 * <p>As of 4.2, it preserves the original order, as it uses a {@link LinkedHashSet}.
-	 * @param array the {@code String} array (potentially empty)
-	 * @return an array without duplicates, in natural sort order
-	 */
-	public static String[] removeDuplicateStrings(String[] array) {
-		if (ObjectUtils.isEmpty(array)) {
-			return array;
-		}
-
-		Set<String> set = new LinkedHashSet<>(Arrays.asList(array));
-		return toStringArray(set);
-	}
-
-	/**
-	 * Split a {@code String} at the first occurrence of the delimiter.
-	 * Does not include the delimiter in the result.
-	 * @param toSplit the string to split (potentially {@code null} or empty)
-	 * @param delimiter to split the string up with (potentially {@code null} or empty)
-	 * @return a two element array with index 0 being before the delimiter, and
-	 * index 1 being after the delimiter (neither element includes the delimiter);
-	 * or {@code null} if the delimiter wasn't found in the given input {@code String}
-	 */
-	@Nullable
-	public static String[] split(@Nullable String toSplit, @Nullable String delimiter) {
-		if (!hasLength(toSplit) || !hasLength(delimiter)) {
-			return null;
-		}
-		int offset = toSplit.indexOf(delimiter);
-		if (offset < 0) {
-			return null;
-		}
-
-		String beforeDelimiter = toSplit.substring(0, offset);
-		String afterDelimiter = toSplit.substring(offset + delimiter.length());
-		return new String[] {beforeDelimiter, afterDelimiter};
-	}
-
-	/**
-	 * Take an array of strings and split each element based on the given delimiter.
-	 * A {@code Properties} instance is then generated, with the left of the delimiter
-	 * providing the key, and the right of the delimiter providing the value.
-	 * <p>Will trim both the key and value before adding them to the {@code Properties}.
-	 * @param array the array to process
-	 * @param delimiter to split each element using (typically the equals symbol)
-	 * @return a {@code Properties} instance representing the array contents,
-	 * or {@code null} if the array to process was {@code null} or empty
-	 */
-	@Nullable
-	public static Properties splitArrayElementsIntoProperties(String[] array, String delimiter) {
-		return splitArrayElementsIntoProperties(array, delimiter, null);
-	}
-
-	/**
-	 * Take an array of strings and split each element based on the given delimiter.
-	 * A {@code Properties} instance is then generated, with the left of the
-	 * delimiter providing the key, and the right of the delimiter providing the value.
-	 * <p>Will trim both the key and value before adding them to the
-	 * {@code Properties} instance.
-	 * @param array the array to process
-	 * @param delimiter to split each element using (typically the equals symbol)
-	 * @param charsToDelete one or more characters to remove from each element
-	 * prior to attempting the split operation (typically the quotation mark
-	 * symbol), or {@code null} if no removal should occur
-	 * @return a {@code Properties} instance representing the array contents,
-	 * or {@code null} if the array to process was {@code null} or empty
-	 */
-	@Nullable
-	public static Properties splitArrayElementsIntoProperties(
-			String[] array, String delimiter, @Nullable String charsToDelete) {
-
-		if (ObjectUtils.isEmpty(array)) {
-			return null;
-		}
-
-		Properties result = new Properties();
-		for (String element : array) {
-			if (charsToDelete != null) {
-				element = deleteAny(element, charsToDelete);
-			}
-			String[] splittedElement = split(element, delimiter);
-			if (splittedElement == null) {
-				continue;
-			}
-			result.setProperty(splittedElement[0].trim(), splittedElement[1].trim());
-		}
-		return result;
-	}
-
-	/**
-	 * Tokenize the given {@code String} into a {@code String} array via a
-	 * {@link StringTokenizer}.
-	 * <p>Trims tokens and omits empty tokens.
-	 * <p>The given {@code delimiters} string can consist of any number of
-	 * delimiter characters. Each of those characters can be used to separate
-	 * tokens. A delimiter is always a single character; for multi-character
-	 * delimiters, consider using {@link #delimitedListToStringArray}.
-	 * @param str the {@code String} to tokenize (potentially {@code null} or empty)
-	 * @param delimiters the delimiter characters, assembled as a {@code String}
-	 * (each of the characters is individually considered as a delimiter)
-	 * @return an array of the tokens
-	 * @see StringTokenizer
-	 * @see String#trim()
-	 * @see #delimitedListToStringArray
-	 */
-	public static String[] tokenizeToStringArray(@Nullable String str, String delimiters) {
-		return tokenizeToStringArray(str, delimiters, true, true);
-	}
-
-	/**
-	 * Tokenize the given {@code String} into a {@code String} array via a
-	 * {@link StringTokenizer}.
-	 * <p>The given {@code delimiters} string can consist of any number of
-	 * delimiter characters. Each of those characters can be used to separate
-	 * tokens. A delimiter is always a single character; for multi-character
-	 * delimiters, consider using {@link #delimitedListToStringArray}.
-	 * @param str the {@code String} to tokenize (potentially {@code null} or empty)
-	 * @param delimiters the delimiter characters, assembled as a {@code String}
-	 * (each of the characters is individually considered as a delimiter)
-	 * @param trimTokens trim the tokens via {@link String#trim()}
-	 * @param ignoreEmptyTokens omit empty tokens from the result array
-	 * (only applies to tokens that are empty after trimming; StringTokenizer
-	 * will not consider subsequent delimiters as token in the first place).
-	 * @return an array of the tokens
-	 * @see StringTokenizer
-	 * @see String#trim()
-	 * @see #delimitedListToStringArray
-	 */
-	public static String[] tokenizeToStringArray(
-			@Nullable String str, String delimiters, boolean trimTokens, boolean ignoreEmptyTokens) {
-
-		if (str == null) {
-			return EMPTY_STRING_ARRAY;
-		}
-
-		StringTokenizer st = new StringTokenizer(str, delimiters);
-		List<String> tokens = new ArrayList<>();
-		while (st.hasMoreTokens()) {
-			String token = st.nextToken();
-			if (trimTokens) {
-				token = token.trim();
-			}
-			if (!ignoreEmptyTokens || token.length() > 0) {
-				tokens.add(token);
-			}
-		}
-		return toStringArray(tokens);
-	}
-
-	/**
-	 * Take a {@code String} that is a delimited list and convert it into a
-	 * {@code String} array.
-	 * <p>A single {@code delimiter} may consist of more than one character,
-	 * but it will still be considered as a single delimiter string, rather
-	 * than as a bunch of potential delimiter characters, in contrast to
-	 * {@link #tokenizeToStringArray}.
-	 * @param str the input {@code String} (potentially {@code null} or empty)
-	 * @param delimiter the delimiter between elements (this is a single delimiter,
-	 * rather than a bunch individual delimiter characters)
-	 * @return an array of the tokens in the list
-	 * @see #tokenizeToStringArray
-	 */
-	public static String[] delimitedListToStringArray(@Nullable String str, @Nullable String delimiter) {
-		return delimitedListToStringArray(str, delimiter, null);
-	}
-
-	/**
-	 * Take a {@code String} that is a delimited list and convert it into
-	 * a {@code String} array.
-	 * <p>A single {@code delimiter} may consist of more than one character,
-	 * but it will still be considered as a single delimiter string, rather
-	 * than as a bunch of potential delimiter characters, in contrast to
-	 * {@link #tokenizeToStringArray}.
-	 * @param str the input {@code String} (potentially {@code null} or empty)
-	 * @param delimiter the delimiter between elements (this is a single delimiter,
-	 * rather than a bunch individual delimiter characters)
-	 * @param charsToDelete a set of characters to delete; useful for deleting unwanted
-	 * line breaks: e.g. "\r\n\f" will delete all new lines and line feeds in a {@code String}
-	 * @return an array of the tokens in the list
-	 * @see #tokenizeToStringArray
-	 */
-	public static String[] delimitedListToStringArray(
-			@Nullable String str, @Nullable String delimiter, @Nullable String charsToDelete) {
-
-		if (str == null) {
-			return EMPTY_STRING_ARRAY;
-		}
-		if (delimiter == null) {
-			return new String[] {str};
-		}
-
-		List<String> result = new ArrayList<>();
-		if (delimiter.isEmpty()) {
-			for (int i = 0; i < str.length(); i++) {
-				result.add(deleteAny(str.substring(i, i + 1), charsToDelete));
-			}
-		}
-		else {
-			int pos = 0;
-			int delPos;
-			while ((delPos = str.indexOf(delimiter, pos)) != -1) {
-				result.add(deleteAny(str.substring(pos, delPos), charsToDelete));
-				pos = delPos + delimiter.length();
-			}
-			if (str.length() > 0 && pos <= str.length()) {
-				// Add rest of String, but not in case of empty input.
-				result.add(deleteAny(str.substring(pos), charsToDelete));
-			}
-		}
-		return toStringArray(result);
-	}
-
-	/**
-	 * Convert a comma delimited list (e.g., a row from a CSV file) into an
-	 * array of strings.
-	 * @param str the input {@code String} (potentially {@code null} or empty)
-	 * @return an array of strings, or the empty array in case of empty input
-	 */
-	public static String[] commaDelimitedListToStringArray(@Nullable String str) {
-		return delimitedListToStringArray(str, ",");
-	}
-
-	/**
-	 * Convert a comma delimited list (e.g., a row from a CSV file) into a set.
-	 * <p>Note that this will suppress duplicates, and as of 4.2, the elements in
-	 * the returned set will preserve the original order in a {@link LinkedHashSet}.
-	 * @param str the input {@code String} (potentially {@code null} or empty)
-	 * @return a set of {@code String} entries in the list
-	 * @see #removeDuplicateStrings(String[])
-	 */
-	public static Set<String> commaDelimitedListToSet(@Nullable String str) {
-		String[] tokens = commaDelimitedListToStringArray(str);
-		return new LinkedHashSet<>(Arrays.asList(tokens));
-	}
-
-	/**
-	 * Convert a {@link Collection} to a delimited {@code String} (e.g. CSV).
-	 * <p>Useful for {@code toString()} implementations.
-	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
-	 * @param delim the delimiter to use (typically a ",")
-	 * @param prefix the {@code String} to start each element with
-	 * @param suffix the {@code String} to end each element with
-	 * @return the delimited {@code String}
-	 */
-	public static String collectionToDelimitedString(
-			@Nullable Collection<?> coll, String delim, String prefix, String suffix) {
-
-		if (CollectionUtils.isEmpty(coll)) {
-			return "";
-		}
-
-		int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length();
-		for (Object element : coll) {
-			totalLength += String.valueOf(element).length();
-		}
-
-		StringBuilder sb = new StringBuilder(totalLength);
-		Iterator<?> it = coll.iterator();
-		while (it.hasNext()) {
-			sb.append(prefix).append(it.next()).append(suffix);
-			if (it.hasNext()) {
-				sb.append(delim);
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Convert a {@code Collection} into a delimited {@code String} (e.g. CSV).
-	 * <p>Useful for {@code toString()} implementations.
-	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
-	 * @param delim the delimiter to use (typically a ",")
-	 * @return the delimited {@code String}
-	 */
-	public static String collectionToDelimitedString(@Nullable Collection<?> coll, String delim) {
-		return collectionToDelimitedString(coll, delim, "", "");
-	}
-
-	/**
-	 * Convert a {@code Collection} into a delimited {@code String} (e.g., CSV).
-	 * <p>Useful for {@code toString()} implementations.
-	 * @param coll the {@code Collection} to convert (potentially {@code null} or empty)
-	 * @return the delimited {@code String}
-	 */
-	public static String collectionToCommaDelimitedString(@Nullable Collection<?> coll) {
-		return collectionToDelimitedString(coll, ",");
-	}
-
-	/**
-	 * Convert a {@code String} array into a delimited {@code String} (e.g. CSV).
-	 * <p>Useful for {@code toString()} implementations.
-	 * @param arr the array to display (potentially {@code null} or empty)
-	 * @param delim the delimiter to use (typically a ",")
-	 * @return the delimited {@code String}
-	 */
-	public static String arrayToDelimitedString(@Nullable Object[] arr, String delim) {
-		if (ObjectUtils.isEmpty(arr)) {
-			return "";
-		}
-		if (arr.length == 1) {
-			return ObjectUtils.nullSafeToString(arr[0]);
-		}
-
-		StringJoiner sj = new StringJoiner(delim);
-		for (Object elem : arr) {
-			sj.add(String.valueOf(elem));
-		}
-		return sj.toString();
-	}
-
-	/**
-	 * Convert a {@code String} array into a comma delimited {@code String}
-	 * (i.e., CSV).
-	 * <p>Useful for {@code toString()} implementations.
-	 * @param arr the array to display (potentially {@code null} or empty)
-	 * @return the delimited {@code String}
-	 */
-	public static String arrayToCommaDelimitedString(@Nullable Object[] arr) {
-		return arrayToDelimitedString(arr, ",");
-	}
-
-	/**
-	 * Truncate the supplied {@link CharSequence}.
-	 * <p>Delegates to {@link #truncate(CharSequence, int)}, supplying {@code 100}
-	 * as the threshold.
-	 * @param charSequence the {@code CharSequence} to truncate
-	 * @return a truncated string, or a string representation of the original
-	 * {@code CharSequence} if its length does not exceed the threshold
-	 * @since 5.3.27
-	 */
-	public static String truncate(CharSequence charSequence) {
-		return truncate(charSequence, DEFAULT_TRUNCATION_THRESHOLD);
-	}
-
-	/**
-	 * Truncate the supplied {@link CharSequence}.
-	 * <p>If the length of the {@code CharSequence} is greater than the threshold,
-	 * this method returns a {@linkplain CharSequence#subSequence(int, int)
-	 * subsequence} of the {@code CharSequence} (up to the threshold) appended
-	 * with the suffix {@code " (truncated)..."}. Otherwise, this method returns
-	 * {@code charSequence.toString()}.
-	 * @param charSequence the {@code CharSequence} to truncate
-	 * @param threshold the maximum length after which to truncate; must be a
-	 * positive number
-	 * @return a truncated string, or a string representation of the original
-	 * {@code CharSequence} if its length does not exceed the threshold
-	 * @since 5.3.27
-	 */
-	public static String truncate(CharSequence charSequence, int threshold) {
-		Assert.isTrue(threshold > 0,
-				() -> "Truncation threshold must be a positive number: " + threshold);
-		if (charSequence.length() > threshold) {
-			return charSequence.subSequence(0, threshold) + TRUNCATION_SUFFIX;
-		}
-		return charSequence.toString();
-	}
-
-}
diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index b72e50c6..a81c474c 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -65,6 +65,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-indexer</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- SLF4j API -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -94,8 +100,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -117,30 +123,12 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.lettuce</groupId>
-            <artifactId>lettuce-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <profiles>
 
         <profile>
-            <id>spring-framework-4.3</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.github.microsphere-projects</groupId>
-                    <artifactId>microsphere-spring-compatible</artifactId>
-                    <version>${revision}</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>spring-framework-5.0</id>
+            <id>spring-framework-6.0</id>
             <dependencies>
                 <dependency>
                     <groupId>org.springframework</groupId>
@@ -171,11 +159,7 @@
         <profile>
             <id>spring-framework-5.2</id>
             <dependencies>
-                <dependency>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context-indexer</artifactId>
-                    <optional>true</optional>
-                </dependency>
+
             </dependencies>
         </profile>
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
index 5032c894..264b1878 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/Dependency.java
@@ -18,7 +18,6 @@
 
 import io.microsphere.collection.CollectionUtils;
 import io.microsphere.util.ArrayUtils;
-import org.springframework.util.Assert;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
@@ -30,6 +29,7 @@
 import static io.microsphere.collection.ListUtils.newArrayList;
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static java.util.Collections.emptyList;
+import static org.springframework.util.Assert.hasText;
 
 /**
  * Spring Bean Dependency
@@ -63,7 +63,7 @@ protected Dependency(String beanName, Dependency parent, String... dependentBean
     }
 
     protected Dependency(String beanName, Dependency parent, Collection<Dependency> children) {
-        Assert.hasText(beanName, "The bean name of dependency must not be blank");
+        hasText(beanName, "The bean name of dependency must not be blank");
         this.beanName = beanName;
         this.parent = parent;
         this.doAddChildren(children);
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
index 67705ab8..d9dfafc7 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessor.java
@@ -46,7 +46,6 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
@@ -78,6 +77,8 @@
 import static java.util.Collections.unmodifiableCollection;
 import static org.springframework.core.BridgeMethodResolver.findBridgedMethod;
 import static org.springframework.core.BridgeMethodResolver.isVisibilityBridgeMethodPair;
+import static org.springframework.util.Assert.isInstanceOf;
+import static org.springframework.util.Assert.notEmpty;
 
 /**
  * The generic {@link BeanPostProcessor} implementation to support the dependency injection for the customized annotations.
@@ -165,7 +166,7 @@ public AnnotatedInjectionBeanPostProcessor(Class<? extends Annotation> annotatio
      * @param annotationTypes the multiple types of {@link Annotation annotations}
      */
     public AnnotatedInjectionBeanPostProcessor(Collection<Class<? extends Annotation>> annotationTypes) {
-        Assert.notEmpty(annotationTypes, "The argument of annotations' types must not empty");
+        notEmpty(annotationTypes, "The argument of annotations' types must not empty");
         this.annotationTypes = annotationTypes;
     }
 
@@ -183,7 +184,7 @@ public final Collection<Class<? extends Annotation>> getAnnotationTypes() {
 
     @Override
     public final void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory, "AnnotationInjectedBeanPostProcessor requires a ConfigurableListableBeanFactory");
+        isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory, "AnnotationInjectedBeanPostProcessor requires a ConfigurableListableBeanFactory");
         this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
index 7c4abda8..b2f271b9 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessor.java
@@ -36,7 +36,6 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -54,6 +53,8 @@
 import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
+import static org.springframework.util.Assert.noNullElements;
+import static org.springframework.util.Assert.notEmpty;
 import static org.springframework.util.ClassUtils.resolveClassName;
 import static org.springframework.util.CollectionUtils.isEmpty;
 
@@ -116,8 +117,8 @@ public AnnotationBeanDefinitionRegistryPostProcessor(Class<? extends Annotation>
     }
 
     public void addSupportedAnnotationType(Class<? extends Annotation>... annotationTypes) {
-        Assert.notEmpty(annotationTypes, "The argument of annotation types can't be empty");
-        Assert.noNullElements(annotationTypes, "Any element of annotation types can't be null");
+        notEmpty(annotationTypes, "The argument of annotation types can't be empty");
+        noNullElements(annotationTypes, "Any element of annotation types can't be null");
         this.supportedAnnotationTypes.addAll(asList(annotationTypes));
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
index c5bec6a9..b698f0b0 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
@@ -36,7 +36,6 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.core.env.Environment;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
@@ -61,6 +60,7 @@
 import static org.springframework.core.BridgeMethodResolver.isVisibilityBridgeMethodPair;
 import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
 import static org.springframework.core.annotation.AnnotationUtils.getAnnotation;
+import static org.springframework.util.Assert.isInstanceOf;
 
 /**
  * Abstract generic {@link BeanPostProcessor} implementation for customized annotation that annotated injected-object.
@@ -119,7 +119,7 @@ public final Class<A> getAnnotationType() {
     }
 
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory,
+        isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory,
                 "AnnotationInjectedBeanPostProcessor requires a ConfigurableListableBeanFactory");
         this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
     }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
index f5bdc9a0..4fb0187b 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingRegistrar.java
@@ -34,7 +34,6 @@
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import java.util.LinkedHashSet;
@@ -55,6 +54,7 @@
 import static java.lang.Boolean.valueOf;
 import static java.util.Collections.singleton;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+import static org.springframework.util.Assert.isInstanceOf;
 
 /**
  * The {@link ImportBeanDefinitionRegistrar} implementation for {@link EnableConfigurationBeanBinding @EnableConfigurationBinding}
@@ -175,11 +175,8 @@ private void registerConfigurationBindingBeanPostProcessor(BeanDefinitionRegistr
 
     @Override
     public void setEnvironment(Environment environment) {
-
-        Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
-
+        isInstanceOf(ConfigurableEnvironment.class, environment);
         this.environment = (ConfigurableEnvironment) environment;
-
     }
 
     private Set<String> resolveMultipleBeanNames(Map<String, Object> properties) {
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
index 6ecc4ebe..3489875f 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/annotation/ConfigurationBeanBindingsRegister.java
@@ -23,9 +23,10 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.Assert;
 
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
+import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
+import static org.springframework.util.Assert.isInstanceOf;
 
 /**
  * The {@link ImportBeanDefinitionRegistrar Registrar class} for {@link EnableConfigurationBeanBindings}
@@ -54,7 +55,6 @@ public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionR
 
     @Override
     public void setEnvironment(Environment environment) {
-        Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
-        this.environment = (ConfigurableEnvironment) environment;
+        this.environment = asConfigurableEnvironment(environment);
     }
 }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
index e34fccc1..e4f482b5 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -36,7 +36,6 @@
 import java.util.function.Supplier;
 
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
-import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.util.ArrayUtils.EMPTY_OBJECT_ARRAY;
 import static io.microsphere.util.ArrayUtils.length;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
index 757febeb..f637b011 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolver.java
@@ -39,8 +39,6 @@
 import java.util.List;
 
 import static io.microsphere.invoke.MethodHandleUtils.findVirtual;
-import static io.microsphere.lang.function.ThrowableSupplier.execute;
-import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asDefaultListableBeanFactory;
 import static io.microsphere.spring.beans.factory.support.AutowireCandidateResolvingListener.loadListeners;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyInitializer.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyInitializer.java
index 8bff0e4c..f78b1077 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyInitializer.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyInitializer.java
@@ -22,9 +22,9 @@
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
 import static io.microsphere.spring.config.ConfigurationPropertyRepository.BEAN_NAME;
-import static io.microsphere.spring.util.BeanRegistrar.registerBean;
-import static io.microsphere.spring.util.SpringFactoriesLoaderUtils.registerFactories;
+import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.registerFactories;
 
 /**
  * The Initializer for Collecting Configuration Property
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
index 82c2b9b4..c0e01147 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java
@@ -24,19 +24,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.ConfigurablePropertyResolver;
-import org.springframework.core.env.Environment;
-import org.springframework.lang.Nullable;
 
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_PREFIX;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_SUFFIX;
-import static org.springframework.util.SystemPropertyUtils.VALUE_SEPARATOR;
 
 /**
  * The listener class for collecting the {@link ConfigurationProperty}
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
index 7978dae2..7cdd1c38 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/ConfigurationProperty.java
@@ -19,9 +19,9 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
-import java.util.LinkedHashSet;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Set;
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
index e8b8101f..ae98f7d3 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/config/context/annotation/PropertySourceExtensionLoader.java
@@ -37,7 +37,6 @@
 import org.springframework.core.io.support.PropertySourceFactory;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PathMatcher;
 
@@ -61,6 +60,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singleton;
 import static java.util.Collections.sort;
+import static org.springframework.util.Assert.notNull;
 import static org.springframework.util.StringUtils.hasText;
 
 /**
@@ -324,7 +324,7 @@ private void updateResourcePropertySources(Iterable<ResourcePropertySource> newR
     }
 
     private String handleSourceName(String resourcePropertySourceName) {
-        Assert.notNull(resourcePropertySourceName, "resourcePropertySourceName is null.");
+        notNull(resourcePropertySourceName, "resourcePropertySourceName is null.");
         return resourcePropertySourceName.substring(0, resourcePropertySourceName.lastIndexOf("@"));
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
index fe85a2eb..6f5d44bc 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidate.java
@@ -34,11 +34,13 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
 
 import javax.annotation.Nonnull;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
+import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
 import static io.microsphere.text.FormatUtils.format;
+import static org.springframework.util.Assert.isInstanceOf;
 
 /**
  * The {@link Import @Import} candidate is an instance of {@link ImportSelector} or {@link ImportBeanDefinitionRegistrar}
@@ -88,18 +90,14 @@ public final void setBeanClassLoader(ClassLoader classLoader) {
     @Override
     public final void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         if (this.beanFactory == null) {
-            Class<ConfigurableListableBeanFactory> targetType = ConfigurableListableBeanFactory.class;
-            Assert.isInstanceOf(targetType, beanFactory, "The 'beanFactory' argument must be an instance of class " + targetType.getName());
-            this.beanFactory = targetType.cast(beanFactory);
+            this.beanFactory = asConfigurableListableBeanFactory(beanFactory);
         }
     }
 
     @Override
     public final void setEnvironment(Environment environment) {
         if (this.environment == null) {
-            Class<ConfigurableEnvironment> targetType = ConfigurableEnvironment.class;
-            Assert.isInstanceOf(targetType, environment, "The 'environment' argument must be an instance of class " + targetType.getName());
-            this.environment = targetType.cast(environment);
+            this.environment = asConfigurableEnvironment(environment);
         }
     }
 
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
index f083e060..d555cd77 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/EnvironmentUtils.java
@@ -24,7 +24,6 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.Environment;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Nonnull;
@@ -44,6 +43,7 @@
 import static java.util.Collections.unmodifiableMap;
 import static java.util.stream.Collectors.toSet;
 import static java.util.stream.StreamSupport.stream;
+import static org.springframework.util.Assert.isInstanceOf;
 import static org.springframework.util.StringUtils.hasText;
 
 /**
@@ -64,7 +64,7 @@ public abstract class EnvironmentUtils extends BaseUtils {
      * @throws IllegalArgumentException If <code>environment</code> argument is not an instance of {@link ConfigurableEnvironment}
      */
     public static ConfigurableEnvironment asConfigurableEnvironment(Environment environment) throws IllegalArgumentException {
-        Assert.isInstanceOf(ConfigurableEnvironment.class, environment,
+        isInstanceOf(ConfigurableEnvironment.class, environment,
                 "The 'environment' argument is not a instance of ConfigurableEnvironment, " +
                         "is it running in Spring container?");
         return (ConfigurableEnvironment) environment;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
index 3890acf8..b497706c 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironment.java
@@ -22,6 +22,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MissingRequiredPropertiesException;
 import org.springframework.core.env.MutablePropertySources;
@@ -87,6 +88,13 @@ public class ListenableConfigurableEnvironment implements ConfigurableEnvironmen
     @Nullable
     private static final MethodHandle MATCHES_PROFILES_METHOD_HANDLE = findVirtual(Environment.class, "matchesProfiles", String[].class);
 
+    /**
+     * The {@link MethodHandle} of {@link ConfigurablePropertyResolver#setEscapeCharacter(Character)} since Spring Framework 6.2
+     */
+    @Nullable
+    private static final MethodHandle SET_ESCAPE_CHARACTER_METHOD_HANDLE = findVirtual(ConfigurablePropertyResolver.class, "setEscapeCharacter", Character.class);
+
+
     private final ConfigurableEnvironment delegate;
 
     private List<EnvironmentListener> environmentListeners;
@@ -347,6 +355,25 @@ public void setValueSeparator(String valueSeparator) {
         forEachEnvironmentListener(listener -> listener.afterSetValueSeparator(delegate, valueSeparator));
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @since Spring Framework 6.2
+     */
+    public void setEscapeCharacter(Character escapeCharacter) {
+        if (SET_ESCAPE_CHARACTER_METHOD_HANDLE != null) {
+            try {
+                SET_ESCAPE_CHARACTER_METHOD_HANDLE.invokeExact(delegate, escapeCharacter);
+            } catch (Throwable e) {
+                if (logger.isWarnEnabled()) {
+                    logger.warn("Failed to invokeExact on {} with arg : '{}'", SET_ESCAPE_CHARACTER_METHOD_HANDLE,
+                            escapeCharacter, e);
+                }
+            }
+        }
+        throw new UnsupportedOperationException("The method setEscapeCharacter(Character) is not supported before Spring Framework 6.2");
+    }
+
     @Override
     public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
         forEachEnvironmentListener(listener -> listener.beforeSetIgnoreUnresolvableNestedPlaceholders(delegate, ignoreUnresolvableNestedPlaceholders));
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
index d4460718..e14281f6 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceLoaderUtils.java
@@ -18,7 +18,6 @@
 
 import io.microsphere.util.BaseUtils;
 import io.microsphere.util.ClassLoaderUtils;
-import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringProtocolURLStreamHandler.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringProtocolURLStreamHandler.java
index eccf35b7..e53a08d3 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringProtocolURLStreamHandler.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringProtocolURLStreamHandler.java
@@ -32,7 +32,6 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -42,6 +41,9 @@
 import java.net.URLStreamHandler;
 import java.util.List;
 
+import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asConfigurableListableBeanFactory;
+import static io.microsphere.spring.core.env.EnvironmentUtils.asConfigurableEnvironment;
+
 /**
  * The Spring {@link URLStreamHandler} component supports supports the "spring" sub-protocols,
  * like "spring:{sub-protocol}:{ext-1}: ... :{ext-n}://...",
@@ -115,13 +117,11 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 
     @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory, "The 'beanFactory' argument must be an instance of " + ConfigurableListableBeanFactory.class.getName());
-        this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
+        this.beanFactory = asConfigurableListableBeanFactory(beanFactory);
     }
 
     @Override
     public void setEnvironment(Environment environment) {
-        Assert.isInstanceOf(ConfigurableEnvironment.class, environment, "The 'environment' argument must be an instance of " + ConfigurableEnvironment.class.getName());
-        this.environment = (ConfigurableEnvironment) environment;
+        this.environment = asConfigurableEnvironment(environment);
     }
 }
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringSubProtocolURLConnectionFactory.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringSubProtocolURLConnectionFactory.java
index 01363244..e7c34bb4 100644
--- a/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringSubProtocolURLConnectionFactory.java
+++ b/microsphere-spring-context/src/main/java/io/microsphere/spring/net/SpringSubProtocolURLConnectionFactory.java
@@ -17,11 +17,12 @@
 package io.microsphere.spring.net;
 
 import io.microsphere.net.SubProtocolURLConnectionFactory;
-import org.springframework.util.Assert;
 
 import java.net.URL;
 import java.util.List;
 
+import static org.springframework.util.Assert.notNull;
+
 /**
  * Spring Abstract {@link SubProtocolURLConnectionFactory}
  *
@@ -36,7 +37,7 @@ public abstract class SpringSubProtocolURLConnectionFactory implements SubProtoc
     public final boolean supports(URL url, List<String> subProtocols) {
         String actualSubProtocol = getActualSubProtocol(subProtocols);
         String subProtocol = getSubProtocol();
-        Assert.notNull(subProtocol, "The 'subProtocol' argument must not be null");
+        notNull(subProtocol, "The 'subProtocol' argument must not be null");
         return subProtocol.equals(actualSubProtocol);
     }
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
index 46fe9d0d..59040e7d 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/BeanUtilsTest.java
@@ -3,8 +3,7 @@
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
 import io.microsphere.spring.util.User;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -30,12 +29,13 @@
 import static io.microsphere.spring.beans.BeanUtils.resolveBeanType;
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.util.ClassUtils.isAssignable;
 
 /**
@@ -112,7 +112,7 @@ public void testGetBeanNamesOnXmlBean() {
 
         String[] beanNames = getBeanNames(context, User.class);
 
-        Assert.assertTrue(Arrays.asList(beanNames).contains("user"));
+        assertTrue(Arrays.asList(beanNames).contains("user"));
 
         context.close();
 
@@ -297,7 +297,7 @@ public void testSort() {
 
         Map<String, OrderedBean> sortedBeansMap = BeanUtils.sort(orderedBeansMap);
 
-        Assert.assertArrayEquals(expectedBeansMap.values().toArray(), sortedBeansMap.values().toArray());
+        assertArrayEquals(expectedBeansMap.values().toArray(), sortedBeansMap.values().toArray());
 
     }
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
index 4fe2a53a..2320e707 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/PropertyValuesUtilsTest.java
@@ -1,10 +1,13 @@
 package io.microsphere.spring.beans;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.PropertyValues;
 import org.springframework.mock.env.MockEnvironment;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 /**
  * {@link PropertyValuesUtils} Test
  *
@@ -21,18 +24,18 @@ public void testGetSubPropertyValues() {
 
         PropertyValues propertyValues = PropertyValuesUtils.getSubPropertyValues(environment, "user");
 
-        Assert.assertNotNull(propertyValues);
+        assertNotNull(propertyValues);
 
-        Assert.assertFalse(propertyValues.contains("name"));
-        Assert.assertFalse(propertyValues.contains("age"));
+        assertFalse(propertyValues.contains("name"));
+        assertFalse(propertyValues.contains("age"));
 
         environment.setProperty("user.name", "Mercy");
         environment.setProperty("user.age", "30");
 
         propertyValues = PropertyValuesUtils.getSubPropertyValues(environment, "user");
 
-        Assert.assertEquals("Mercy", propertyValues.getPropertyValue("name").getValue());
-        Assert.assertEquals("30", propertyValues.getPropertyValue("age").getValue());
+        assertEquals("Mercy", propertyValues.getPropertyValue("name").getValue());
+        assertEquals("30", propertyValues.getPropertyValue("age").getValue());
 
     }
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
index 445999ae..b3633e86 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java
@@ -16,10 +16,9 @@
  */
 package io.microsphere.spring.beans.factory;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +27,10 @@
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getBeans;
 import static io.microsphere.spring.beans.factory.BeanFactoryUtils.getOptionalBean;
 import static io.microsphere.util.ArrayUtils.of;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link BeanFactoryUtils} Test
@@ -39,12 +41,12 @@ public class BeanFactoryUtilsTest {
 
     private AnnotationConfigApplicationContext applicationContext;
 
-    @Before
+    @BeforeEach
     public void init() {
         applicationContext = new AnnotationConfigApplicationContext();
     }
 
-    @After
+    @AfterEach
     public void afterTest() {
         applicationContext.close();
     }
@@ -58,7 +60,7 @@ public void testGetOptionalBean() {
 
         BaseTestBean testBean = getOptionalBean(applicationContext, "baseTestBean", BaseTestBean.class);
 
-        Assert.assertNotNull(testBean);
+        assertNotNull(testBean);
 
         assertEquals("Hello,World", testBean.getName());
 
@@ -71,15 +73,15 @@ public void testGetOptionalBeanIfAbsent() {
 
         BaseTestBean testBean = getOptionalBean(applicationContext, "baseTestBean", BaseTestBean.class);
 
-        Assert.assertNull(testBean);
+        assertNull(testBean);
 
         testBean = getOptionalBean(applicationContext, "1", BaseTestBean.class);
 
-        Assert.assertNull(testBean);
+        assertNull(testBean);
 
         testBean = getOptionalBean(applicationContext, null, BaseTestBean.class);
 
-        Assert.assertNull(testBean);
+        assertNull(testBean);
     }
 
     @Test
@@ -115,7 +117,7 @@ public void testGetBeansIfAbsent() {
 
         List<BaseTestBean> testBeans = getBeans(applicationContext, new String[]{"baseTestBean"}, BaseTestBean.class);
 
-        Assert.assertTrue(testBeans.isEmpty());
+        assertTrue(testBeans.isEmpty());
 
     }
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTest.java
index abe05b0b..9835310b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTest.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.beans.factory;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link Dependency} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTreeWalkerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTreeWalkerTest.java
index 594feb3b..b5e2a966 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTreeWalkerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/DependencyTreeWalkerTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.beans.factory;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * {@link DependencyTreeWalker} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AbstractEnableConfigurationBeanBindingTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AbstractEnableConfigurationBeanBindingTest.java
index a5045d98..762e269c 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AbstractEnableConfigurationBeanBindingTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AbstractEnableConfigurationBeanBindingTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.beans.factory.annotation;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.MutablePropertySources;
@@ -36,7 +36,7 @@ public abstract class AbstractEnableConfigurationBeanBindingTest {
 
     protected AnnotationConfigApplicationContext context;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         context = new AnnotationConfigApplicationContext();
         context.register(getClass());
@@ -56,7 +56,7 @@ protected void customizePropertySources(MutablePropertySources propertySources)
         context.refresh();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         context.close();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessorTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessorTest.java
index a315019f..d18e85a1 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessorTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotatedInjectionBeanPostProcessorTest.java
@@ -17,9 +17,8 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.util.User;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -27,14 +26,17 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link AnnotatedInjectionBeanPostProcessor} Test
  *
  * @since 1.0.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         AnnotationInjectedBeanPostProcessorTest.TestConfiguration.class,
         AnnotatedInjectionBeanPostProcessorTest.ReferencedInjectedBeanPostProcessor.class,
@@ -69,26 +71,26 @@ public class AnnotatedInjectionBeanPostProcessorTest {
     @Test
     public void testCustomizedAnnotationBeanPostProcessor() {
 
-        Assert.assertEquals(environment, processor.getEnvironment());
-        Assert.assertEquals(beanFactory.getBeanClassLoader(), processor.getClassLoader());
-        Assert.assertEquals(beanFactory, processor.getBeanFactory());
+        assertEquals(environment, processor.getEnvironment());
+        assertEquals(beanFactory.getBeanClassLoader(), processor.getClassLoader());
+        assertEquals(beanFactory, processor.getBeanFactory());
 
-        Assert.assertEquals(1, processor.getAnnotationTypes().size());
-        Assert.assertTrue(processor.getAnnotationTypes().contains(Referenced.class));
-        Assert.assertEquals(Ordered.LOWEST_PRECEDENCE - 3, processor.getOrder());
+        assertEquals(1, processor.getAnnotationTypes().size());
+        assertTrue(processor.getAnnotationTypes().contains(Referenced.class));
+        assertEquals(Ordered.LOWEST_PRECEDENCE - 3, processor.getOrder());
     }
 
     @Test
     public void testReferencedUser() {
-        Assert.assertEquals("mercyblitz", parent.user.getName());
-        Assert.assertEquals(32, parent.user.getAge());
-        Assert.assertEquals(parent.user, parent.parentUser);
-        Assert.assertEquals(parent.user, child.childUser);
-        Assert.assertEquals(parent.user, userHolder.user);
-        Assert.assertEquals(parent.user, genericChild.s);
-        Assert.assertEquals(parent.user, genericChild.s1);
-        Assert.assertEquals(parent.user, genericChild.s2);
-        Assert.assertEquals(parent.user, child.user);
+        assertEquals("mercyblitz", parent.user.getName());
+        assertEquals(32, parent.user.getAge());
+        assertEquals(parent.user, parent.parentUser);
+        assertEquals(parent.user, child.childUser);
+        assertEquals(parent.user, userHolder.user);
+        assertEquals(parent.user, genericChild.s);
+        assertEquals(parent.user, genericChild.s1);
+        assertEquals(parent.user, genericChild.s2);
+        assertEquals(parent.user, child.user);
     }
 
     public static class ReferencedInjectedBeanPostProcessor extends AnnotatedInjectionBeanPostProcessor {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessorTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessorTest.java
index d9e0120c..102a417b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessorTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationBeanDefinitionRegistryPostProcessorTest.java
@@ -17,14 +17,14 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.context.annotation.ExposingClassPathBeanDefinitionScanner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -35,8 +35,8 @@
 import java.util.Map;
 
 import static io.microsphere.spring.beans.factory.annotation.AnnotationBeanDefinitionRegistryPostProcessor.getAnnotation;
-import static junit.framework.TestCase.assertNotNull;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * {@link AnnotationBeanDefinitionRegistryPostProcessor} Test
@@ -44,7 +44,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         AnnotationBeanDefinitionRegistryPostProcessorTest.ServiceAnnotationBeanDefinitionRegistryPostProcessor.class,
         AnnotationBeanDefinitionRegistryPostProcessorTest.class
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessorTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessorTest.java
index 5f5e497e..4a8ed1c1 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessorTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessorTest.java
@@ -17,9 +17,8 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.util.User;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.InjectionMetadata;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -28,7 +27,10 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link AnnotationInjectedBeanPostProcessor} Test
@@ -36,7 +38,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         AnnotationInjectedBeanPostProcessorTest.TestConfiguration.class,
         AnnotationInjectedBeanPostProcessorTest.ReferencedAnnotationInjectedBeanPostProcessor.class
@@ -67,25 +69,25 @@ public class AnnotationInjectedBeanPostProcessorTest {
     @Test
     public void testCustomizedAnnotationBeanPostProcessor() {
 
-        Assert.assertEquals(environment, processor.getEnvironment());
-        Assert.assertEquals(beanFactory.getBeanClassLoader(), processor.getClassLoader());
-        Assert.assertEquals(beanFactory, processor.getBeanFactory());
+        assertEquals(environment, processor.getEnvironment());
+        assertEquals(beanFactory.getBeanClassLoader(), processor.getClassLoader());
+        assertEquals(beanFactory, processor.getBeanFactory());
 
-        Assert.assertEquals(Referenced.class, processor.getAnnotationType());
-        Assert.assertEquals(1, processor.getInjectedObjects().size());
-        Assert.assertTrue(processor.getInjectedObjects().contains(parent.parentUser));
-        Assert.assertEquals(2, processor.getInjectedFieldObjectsMap().size());
-        Assert.assertEquals(1, processor.getInjectedMethodObjectsMap().size());
-        Assert.assertEquals(Ordered.HIGHEST_PRECEDENCE, processor.getOrder());
+        assertEquals(Referenced.class, processor.getAnnotationType());
+        assertEquals(1, processor.getInjectedObjects().size());
+        assertTrue(processor.getInjectedObjects().contains(parent.parentUser));
+        assertEquals(2, processor.getInjectedFieldObjectsMap().size());
+        assertEquals(1, processor.getInjectedMethodObjectsMap().size());
+        assertEquals(Ordered.HIGHEST_PRECEDENCE, processor.getOrder());
     }
 
     @Test
     public void testReferencedUser() {
-        Assert.assertEquals("mercyblitz", parent.user.getName());
-        Assert.assertEquals(32, parent.user.getAge());
-        Assert.assertEquals(parent.user, parent.parentUser);
-        Assert.assertEquals(parent.user, child.childUser);
-        Assert.assertEquals(parent.user, userHolder.user);
+        assertEquals("mercyblitz", parent.user.getName());
+        assertEquals(32, parent.user.getAge());
+        assertEquals(parent.user, parent.parentUser);
+        assertEquals(parent.user, child.childUser);
+        assertEquals(parent.user, userHolder.user);
     }
 
     static class TestConfiguration {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTest.java
index 8485a303..a42e81c1 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTest.java
@@ -27,10 +27,10 @@
 import io.microsphere.spring.context.config.ConfigurationBeanCustomizer;
 import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.util.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Bean;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 @EnableConfigurationBeanBinding(prefix = "usr", type = User.class)
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForAlias.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForAlias.java
index 45f2297c..fc3a1be4 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForAlias.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForAlias.java
@@ -1,16 +1,16 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.util.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link EnableConfigurationBeanBinding} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
index d575122f..5699799c 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
@@ -26,15 +26,15 @@
 import io.microsphere.spring.beans.BeanUtils;
 import io.microsphere.spring.context.config.DefaultConfigurationBeanBinder;
 import io.microsphere.spring.util.User;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Bean;
 
 import java.util.Collection;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnableConfigurationBeanBinding(prefix = "users", type = User.class, multiple = true, ignoreUnknownFields = false,
         ignoreInvalidFields = false)
@@ -57,7 +57,7 @@ public ConfigurationBeanBindingPostProcessor configurationBeanBindingPostProcess
 
     private ConfigurationBeanBindingPostProcessor configurationBeanBindingPostProcessor;
 
-    @Before
+    @BeforeEach
     public void init() {
         aUser = context.getBean("a", User.class);
         bUser = context.getBean("b", User.class);
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingsTest.java
index a76d4d3b..0c942ff2 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/annotation/EnableConfigurationBeanBindingsTest.java
@@ -17,10 +17,10 @@
 package io.microsphere.spring.beans.factory.annotation;
 
 import io.microsphere.spring.util.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Configuration;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link EnableConfigurationBeanBindings} Test cases
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
index eafe23ce..af459e5c 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtilsTest.java
@@ -17,8 +17,8 @@
 package io.microsphere.spring.beans.factory.config;
 
 import io.microsphere.spring.util.User;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -30,7 +30,6 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.function.BiConsumer;
@@ -46,14 +45,13 @@
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.isSetInstanceSupplierMethodPresent;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.resolveBeanType;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.setInstanceSupplier;
-import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtilsTest.BEAN_NAME;
 import static io.microsphere.spring.core.SpringVersion.CURRENT;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_0;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 
@@ -78,7 +76,7 @@ public class BeanDefinitionUtilsTest {
 
     private AbstractBeanDefinition beanDefinition;
 
-    @Before
+    @BeforeEach
     public void init() {
         this.beanDefinition = genericBeanDefinition(User.class);
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
index d4615e21..b969eac2 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/config/GenericBeanPostProcessorAdapterTest.java
@@ -2,12 +2,11 @@
 
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeansException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * {@link GenericBeanPostProcessorAdapter} Test
@@ -92,8 +91,8 @@ public void testPostProcess() {
 
         String bean = "test";
 
-        Assert.assertEquals("test", beanPostProcessor.postProcessBeforeInitialization(bean, ""));
-        Assert.assertEquals("test", beanPostProcessor.postProcessAfterInitialization(bean, ""));
+        assertEquals("test", beanPostProcessor.postProcessBeforeInitialization(bean, ""));
+        assertEquals("test", beanPostProcessor.postProcessAfterInitialization(bean, ""));
     }
 
     @Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
index 3016150b..a7cb0185 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/BeanRegistrarTest.java
@@ -20,9 +20,9 @@
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
 import io.microsphere.spring.util.User;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
@@ -37,11 +37,11 @@
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSingleton;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSpringFactoriesBeans;
 import static java.beans.Introspector.decapitalize;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 
@@ -56,12 +56,12 @@ public class BeanRegistrarTest {
 
     private DefaultListableBeanFactory beanFactory;
 
-    @Before
+    @BeforeEach
     public void init() {
         this.beanFactory = new DefaultListableBeanFactory();
     }
 
-    @After
+    @AfterEach
     public void destroy() {
         this.beanFactory.destroySingletons();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ConfigurationBeanAliasGeneratorTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ConfigurationBeanAliasGeneratorTest.java
index d28cf09b..65966b72 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ConfigurationBeanAliasGeneratorTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ConfigurationBeanAliasGeneratorTest.java
@@ -1,11 +1,11 @@
 package io.microsphere.spring.beans.factory.support;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ConfigurationBeanAliasGeneratorTest {
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
index fef2745b..c5145daa 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverTest.java
@@ -2,8 +2,8 @@
 
 
 import io.microsphere.spring.test.TestBean;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,10 +13,10 @@
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * {@link ListenableAutowireCandidateResolver} Test
@@ -25,7 +25,7 @@
  * @see ListenableAutowireCandidateResolver
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @TestPropertySource(
         properties = {
                 "microsphere.spring.listenable-autowire-candidate-resolver.enabled=true",
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/EnableTTLCachingTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/EnableTTLCachingTest.java
index 33a1c7ae..5e47d906 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/EnableTTLCachingTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/EnableTTLCachingTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.cache.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
@@ -26,13 +26,13 @@
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link EnableTTLCaching} Test
@@ -40,7 +40,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         EnableTTLCachingTest.class, EnableTTLCachingTest.TestData.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
index 91dfba71..e4d02cd9 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/cache/annotation/TTLCacheableTest.java
@@ -17,8 +17,8 @@
 //package io.microsphere.spring.cache.annotation;
 //
 //import io.microsphere.spring.test.redis.EnableRedisTest;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.cache.Cache;
 //import org.springframework.cache.CacheManager;
@@ -31,14 +31,14 @@
 //import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 //import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 //import org.springframework.test.context.ContextConfiguration;
-//import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.test.context.junit.jupiter.SpringExtension;
 //
 //import java.util.Collection;
 //import java.util.concurrent.ThreadLocalRandom;
 //
 //import static java.util.Collections.singletonList;
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotEquals;
+//import static org.junit.jupiter.api.Assertions.assertEquals;
+//import static org.junit.jupiter.api.Assertions.assertNotEquals;
 //
 ///**
 // * {@link TTLCacheable} Test
@@ -46,7 +46,7 @@
 // * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 // * @since 1.0.0
 // */
-//@RunWith(SpringRunner.class)
+//@ExtendWith(SpringExtension.class)
 //@ContextConfiguration(classes = {
 //        TTLCacheableTest.class, TTLCacheableTest.CachingData.class
 //})
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
index ea59c21b..aec76de0 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyRepositoryTest.java
@@ -16,19 +16,19 @@
  */
 package io.microsphere.spring.config;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link ConfigurationPropertyRepository} Test
@@ -37,7 +37,7 @@
  * @see ConfigurationPropertyRepository
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
         classes = {
                 ConfigurationPropertyRepository.class,
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
index bba9d7a3..e054ea7f 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/ConfigurationPropertyTest.java
@@ -16,12 +16,12 @@
  */
 package io.microsphere.spring.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * {@link ConfigurationProperty} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
index ed5b6ab8..41d8e5a5 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourceTest.java
@@ -16,18 +16,18 @@
  */
 package io.microsphere.spring.config.context.annotation;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link DefaultPropertiesPropertySource} Test
@@ -36,7 +36,7 @@
  * @see DefaultPropertiesPropertySource
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         DefaultPropertiesPropertySourceTest.class
 })
@@ -50,7 +50,7 @@ public class DefaultPropertiesPropertySourceTest {
 
     private MutablePropertySources propertySources;
 
-    @Before
+    @BeforeEach
     public void before() {
         this.propertySources = environment.getPropertySources();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
index 2fda2506..430ecdb0 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/DefaultPropertiesPropertySourcesTest.java
@@ -16,18 +16,18 @@
  */
 package io.microsphere.spring.config.context.annotation;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.microsphere.spring.core.env.PropertySourcesUtils.DEFAULT_PROPERTIES_PROPERTY_SOURCE_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link DefaultPropertiesPropertySources} Test
@@ -36,7 +36,7 @@
  * @see DefaultPropertiesPropertySources
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DefaultPropertiesPropertySourcesTest.class})
 @DefaultPropertiesPropertySource(value = {"classpath*:/META-INF/test/a.properties"})
 @DefaultPropertiesPropertySource(value = {"classpath*:/META-INF/test/b.properties"})
@@ -47,7 +47,7 @@ public class DefaultPropertiesPropertySourcesTest {
 
     private MutablePropertySources propertySources;
 
-    @Before
+    @BeforeEach
     public void before() {
         this.propertySources = environment.getPropertySources();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceTest.java
index fd05bea8..1d3c41db 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourceTest.java
@@ -16,14 +16,14 @@
  */
 package io.microsphere.spring.config.context.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link ResourcePropertySource} Test
@@ -32,7 +32,7 @@
  * @see ResourcePropertySource
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         ResourcePropertySourceTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourcesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourcesTest.java
index b7c4e63c..33cb8958 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourcesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/context/annotation/ResourcePropertySourcesTest.java
@@ -16,15 +16,15 @@
  */
 package io.microsphere.spring.config.context.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link ResourcePropertySources} Test
@@ -33,7 +33,7 @@
  * @see ResourcePropertySource
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         ResourcePropertySourcesTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/JsonPropertySourceTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/JsonPropertySourceTest.java
index db51550a..15277abe 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/JsonPropertySourceTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/JsonPropertySourceTest.java
@@ -16,14 +16,14 @@
  */
 package io.microsphere.spring.config.env.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link JsonPropertySource} Test
@@ -32,7 +32,7 @@
  * @see JsonPropertySource
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         JsonPropertySourceTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/YamlPropertySourceTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/YamlPropertySourceTest.java
index 5976e6d3..ee44b23a 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/YamlPropertySourceTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/env/annotation/YamlPropertySourceTest.java
@@ -16,14 +16,14 @@
  */
 package io.microsphere.spring.config.env.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
@@ -31,7 +31,7 @@
 import java.util.Date;
 import java.util.Objects;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link YamlPropertySource} Test
@@ -40,7 +40,7 @@
  * @see YamlPropertySource
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         YamlPropertySourceTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/constants/PropertyConstantsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/constants/PropertyConstantsTest.java
index 5ccd5314..c9b491b7 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/constants/PropertyConstantsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/constants/PropertyConstantsTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.constants;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link PropertyConstants} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
index 2e3f17bb..614f60cf 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/ApplicationContextUtilsTest.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.context;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -28,8 +28,8 @@
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.getApplicationContextAwareProcessor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link ApplicationContextUtils} Test
@@ -42,13 +42,13 @@ public class ApplicationContextUtilsTest {
 
     private GenericApplicationContext context;
 
-    @Before
+    @BeforeEach
     public void init() {
         context = new GenericApplicationContext();
         context.refresh();
     }
 
-    @After
+    @AfterEach
     public void destroy() {
         context.close();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
index 5a731093..80e60cc8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtilsTest.java
@@ -2,14 +2,14 @@
 
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static io.microsphere.spring.context.annotation.AnnotatedBeanDefinitionRegistryUtils.scanBasePackages;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.context.annotation.AnnotationConfigUtils.registerAnnotationConfigProcessors;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
@@ -24,7 +24,7 @@ public class AnnotatedBeanDefinitionRegistryUtilsTest {
 
     private DefaultListableBeanFactory registry = null;
 
-    @Before
+    @BeforeEach
     public void init() {
         registry = new DefaultListableBeanFactory();
         registry.setAllowBeanDefinitionOverriding(false);
@@ -44,7 +44,7 @@ public void testRegisterBeans() {
 
         beanNames = registry.getBeanNamesForType(AnnotatedBeanDefinitionRegistryUtils.class);
 
-        Assert.assertTrue(isEmpty(beanNames));
+        assertTrue(isEmpty(beanNames));
 
         registerBeans(registry);
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidateTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidateTest.java
index 037a9f6e..c6624f03 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidateTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/BeanCapableImportCandidateTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -32,9 +32,9 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link BeanCapableImportCandidate} Test
@@ -43,7 +43,7 @@
  * @see 1.0.0
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         BeanCapableImportCandidateTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
index 9e8b64c3..806d33c5 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/annotation/EnableEventExtensionTest.java
@@ -20,9 +20,9 @@
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.event.ApplicationEventInterceptor;
 import io.microsphere.spring.context.event.ApplicationListenerInterceptor;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
@@ -35,11 +35,11 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
 
 /**
@@ -48,7 +48,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         EnableEventExtensionTest.class,
         EnableEventExtensionTest.Config.class,
@@ -122,7 +122,7 @@ public void onPayloadApplicationEvent(String event) {
         }
     }
 
-    @After
+    @AfterEach
     public void rest() {
         eventValueRef.set(0);
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
index 22802650..fcffe175 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/BeanTimeStatisticsTest.java
@@ -19,18 +19,18 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
 import io.microsphere.util.StopWatch;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {BeanTimeStatistics.class, BeanTimeStatisticsTest.class},
         initializers = {EventPublishingBeanInitializer.class})
 public class BeanTimeStatisticsTest {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/DeferredApplicationEventPublisherTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/DeferredApplicationEventPublisherTest.java
index e10842b2..b9e2e63b 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/DeferredApplicationEventPublisherTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/DeferredApplicationEventPublisherTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -27,10 +27,10 @@
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link DeferredApplicationEventPublisher} Test
@@ -38,7 +38,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
         classes = TestConfig.class,
         loader = AnnotationConfigContextLoader.class
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/EventPublishingBeanInitializerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/EventPublishingBeanInitializerTest.java
index 5325a9b7..ae0cd2b0 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/EventPublishingBeanInitializerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/EventPublishingBeanInitializerTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * {@link BeanListener} Test
@@ -27,7 +27,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {EventPublishingBeanInitializerTest.class, LoggingBeanListener.class}, initializers = {EventPublishingBeanInitializer.class})
 public class EventPublishingBeanInitializerTest {
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterTest.java
index 8dd80121..e92cd565 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/InterceptingApplicationEventMulticasterTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -25,11 +25,11 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.event.ApplicationEventMulticaster;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
 
 /**
@@ -38,7 +38,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         InterceptingApplicationEventMulticasterTest.class
 })
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/JavaBeansPropertyChangeListenerAdapterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/JavaBeansPropertyChangeListenerAdapterTest.java
index 97067622..570da531 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/JavaBeansPropertyChangeListenerAdapterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/JavaBeansPropertyChangeListenerAdapterTest.java
@@ -17,18 +17,18 @@
 package io.microsphere.spring.context.event;
 
 import io.microsphere.spring.util.User;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.beans.PropertyChangeSupport;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * {@link JavaBeansPropertyChangeListenerAdapter} Test
@@ -36,7 +36,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {JavaBeansPropertyChangeListenerAdapterTest.class})
 public class JavaBeansPropertyChangeListenerAdapterTest {
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/LoggingBeanFactoryListenerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/LoggingBeanFactoryListenerTest.java
index 470f523b..0bff8c98 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/LoggingBeanFactoryListenerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/LoggingBeanFactoryListenerTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * {@link LoggingBeanFactoryListener} Test
@@ -27,7 +27,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         LoggingBeanFactoryListener.class,
         LoggingBeanFactoryListenerTest.class},
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/OnceApplicationContextEventListenerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/OnceApplicationContextEventListenerTest.java
index 2aaab309..c0298dd0 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/OnceApplicationContextEventListenerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/context/event/OnceApplicationContextEventListenerTest.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.context.event;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -27,7 +27,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 /**
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
index 405934b4..8698c088 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java
@@ -17,11 +17,11 @@
 package io.microsphere.spring.core;
 
 import io.microsphere.util.Version;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.microsphere.spring.core.SpringVersion.resolveVersion;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link SpringVersion} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
index d352375e..2ea3cf99 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/AnnotationUtilsTest.java
@@ -1,7 +1,6 @@
 package io.microsphere.spring.core.annotation;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.context.annotation.Bean;
@@ -25,9 +24,10 @@
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAttributes;
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CONTEXT_VERSION;
 import static io.microsphere.util.ArrayUtils.of;
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.util.ReflectionUtils.findMethod;
 
 /**
@@ -125,7 +125,7 @@ public void testFindAnnotations() {
 
         annotationsList = annotationsMap.get(ElementType.PACKAGE);
 
-        Assert.assertNull(annotationsList);
+        assertNull(annotationsList);
 
 
         method = findMethod(ClassAnnotationHandler.class, "handle",
@@ -133,12 +133,12 @@ public void testFindAnnotations() {
 
         annotationsMap = findAnnotations(method, RuntimeAnnotation.class);
 
-        Assert.assertTrue(annotationsMap.isEmpty());
+        assertTrue(annotationsMap.isEmpty());
 
         Map<ElementType, List<ClassAnnotation>> classAnnotationsMap = findAnnotations(method,
                 ClassAnnotation.class);
 
-        Assert.assertTrue(classAnnotationsMap.isEmpty());
+        assertTrue(classAnnotationsMap.isEmpty());
     }
 
     @Test
@@ -147,10 +147,10 @@ public void testGetAttributes() {
         Bean annotation = getAnnotation("dummyBean", Bean.class);
 
         Map<String, Object> attributes = getAttributes(annotation, true);
-        Assert.assertTrue(Arrays.equals(new String[]{"dummy-bean"}, (String[]) attributes.get("name")));
+        assertTrue(Arrays.equals(new String[]{"dummy-bean"}, (String[]) attributes.get("name")));
 
         attributes = getAttributes(annotation, true);
-        Assert.assertTrue(Arrays.equals(new String[]{"dummy-bean"}, (String[]) attributes.get("name")));
+        assertTrue(Arrays.equals(new String[]{"dummy-bean"}, (String[]) attributes.get("name")));
 
         attributes = getAttributes(annotation, false);
         if (SPRING_CONTEXT_VERSION.getMajor() < 6) {
@@ -171,16 +171,16 @@ public void testGetAttributes() {
         annotation = getAnnotation("dummyBean2", Bean.class);
 
         attributes = getAttributes(annotation, true);
-        Assert.assertTrue(attributes.isEmpty());
+        assertTrue(attributes.isEmpty());
 
         attributes = getAttributes(annotation, environment, true);
-        Assert.assertTrue(attributes.isEmpty());
+        assertTrue(attributes.isEmpty());
 
         environment.setProperty("beanName", "Your Bean Name");
 
         annotation = getAnnotation("dummyBean3", Bean.class);
         attributes = getAttributes(annotation, environment, true);
-        Assert.assertTrue(Arrays.deepEquals(of(environment.getProperty("beanName")), (String[]) attributes.get("name")));
+        assertTrue(Arrays.deepEquals(of(environment.getProperty("beanName")), (String[]) attributes.get("name")));
 
     }
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
index e02edd7b..e02e3ec7 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
@@ -16,14 +16,14 @@
  */
 package io.microsphere.spring.core.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.microsphere.spring.core.annotation.GenericAnnotationAttributes.of;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link GenericAnnotationAttributes} Test
@@ -31,7 +31,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {GenericAnnotationAttributesTest.class})
 public class GenericAnnotationAttributesTest {
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributesTest.java
index c3c756f7..c6766e2e 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/ResolvablePlaceholderAnnotationAttributesTest.java
@@ -16,18 +16,18 @@
  */
 package io.microsphere.spring.core.annotation;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.beans.ConstructorProperties;
 
 import static io.microsphere.spring.core.annotation.ResolvablePlaceholderAnnotationAttributes.of;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link ResolvablePlaceholderAnnotationAttributes} Test
@@ -35,7 +35,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {ResolvablePlaceholderAnnotationAttributesTest.class})
 @TestPropertySource(properties = {"a=1", "b=2"})
 public class ResolvablePlaceholderAnnotationAttributesTest {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/SpringConverterAdapterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/SpringConverterAdapterTest.java
index 4357758b..6d20f952 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/SpringConverterAdapterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/SpringConverterAdapterTest.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.core.convert;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.GenericConverter;
 
@@ -26,9 +26,9 @@
 import java.util.Set;
 
 import static io.microsphere.spring.core.convert.SpringConverterAdapter.buildConvertiblePair;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.core.convert.TypeDescriptor.forObject;
 import static org.springframework.core.convert.TypeDescriptor.valueOf;
 
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/annotation/EnableSpringConverterAdapterTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/annotation/EnableSpringConverterAdapterTest.java
index 8ddf0eae..9a60e9e8 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/annotation/EnableSpringConverterAdapterTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/annotation/EnableSpringConverterAdapterTest.java
@@ -17,17 +17,17 @@
 package io.microsphere.spring.core.convert.annotation;
 
 import io.microsphere.spring.core.convert.support.ConversionServiceResolver;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.Duration;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link EnableSpringConverterAdapter} Test
@@ -35,7 +35,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = EnableSpringConverterAdapterTest.class)
 @EnableSpringConverterAdapter
 public class EnableSpringConverterAdapterTest {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/support/ConversionServiceResolverTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/support/ConversionServiceResolverTest.java
index 87e14f15..9cf46e93 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/support/ConversionServiceResolverTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/convert/support/ConversionServiceResolverTest.java
@@ -15,15 +15,15 @@
  */
 package io.microsphere.spring.core.convert.support;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
 import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
 import static org.springframework.util.ClassUtils.isAssignable;
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
index 4582bc46..f4b84443 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/EnvironmentUtilsTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.core.env;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -30,9 +30,9 @@
 import static io.microsphere.spring.core.env.EnvironmentUtils.resolveCommaDelimitedValueToList;
 import static io.microsphere.spring.core.env.EnvironmentUtils.resolvePlaceholders;
 import static java.util.Collections.emptyMap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link EnvironmentUtils} Test
@@ -45,7 +45,7 @@ public class EnvironmentUtilsTest {
 
     private ConfigurableEnvironment environment;
 
-    @Before
+    @BeforeEach
     public void init() throws Exception {
         MockEnvironment mockEnvironment = new MockEnvironment();
         mockEnvironment.setProperty("a", "1");
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
index 8c70a045..90b3acdd 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/ListenableConfigurableEnvironmentTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.core.env;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -26,16 +26,16 @@
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.microsphere.spring.core.SpringVersion.CURRENT;
 import static io.microsphere.spring.core.SpringVersion.SPRING_5_1;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link ListenableConfigurableEnvironment} Test
@@ -43,7 +43,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
         classes = ListenableConfigurableEnvironmentTest.class,
         initializers = ListenableConfigurableEnvironmentInitializer.class
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
index 978b8637..193ed81c 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/env/PropertySourcesUtilsTest.java
@@ -1,7 +1,7 @@
 package io.microsphere.spring.core.env;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.AbstractEnvironment;
@@ -33,10 +33,10 @@
 import static io.microsphere.spring.core.env.PropertySourcesUtils.getMapPropertySource;
 import static io.microsphere.spring.core.env.PropertySourcesUtils.getPropertySource;
 import static io.microsphere.spring.core.env.PropertySourcesUtils.getSubProperties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.core.convert.support.DefaultConversionService.getSharedInstance;
 
 /**
@@ -51,7 +51,7 @@ public class PropertySourcesUtilsTest {
 
     private ConfigurableEnvironment environment;
 
-    @Before
+    @BeforeEach
     public void before() {
         MockEnvironment mockEnvironment = new MockEnvironment();
         mockEnvironment.setProperty("test-key", "test-value");
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
index 869ea2f8..bde10402 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceLoaderUtilsTest.java
@@ -16,13 +16,13 @@
  */
 package io.microsphere.spring.core.io;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourcePatternResolver;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link ResourceLoaderUtils} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
index 0c91417e..740e3605 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/ResourceUtilsTest.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.core.io;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -28,7 +28,7 @@
 
 import static io.microsphere.spring.core.io.ResourceLoaderUtils.getResourceLoader;
 import static io.microsphere.spring.core.io.ResourceUtils.FILE_URL_RESOURCE_CLASS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link ResourceUtils} Test
@@ -45,7 +45,7 @@ public class ResourceUtilsTest {
 
     private Resource urlResource;
 
-    @Before
+    @BeforeEach
     public void init() throws IOException {
         this.classPathResource = resourceLoader.getResource("classpath:/META-INF/spring.factories");
         URL url = this.classPathResource.getURL();
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
index 72b3660b..869977b9 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtilsTest.java
@@ -18,9 +18,9 @@
 
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -30,10 +30,10 @@
 import java.util.List;
 
 import static io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils.loadFactories;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * {@link SpringFactoriesLoaderUtils} Test
@@ -48,14 +48,14 @@ public class SpringFactoriesLoaderUtilsTest {
 
     private DefaultListableBeanFactory beanFactory;
 
-    @Before
+    @BeforeEach
     public void before() {
         context = new GenericApplicationContext();
         beanFactory = context.getDefaultListableBeanFactory();
         context.refresh();
     }
 
-    @After
+    @AfterEach
     public void after() {
         context.close();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/net/SpringProtocolURLStreamHandlerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/net/SpringProtocolURLStreamHandlerTest.java
index 47a475e0..2427d603 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/net/SpringProtocolURLStreamHandlerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/net/SpringProtocolURLStreamHandlerTest.java
@@ -16,11 +16,11 @@
  */
 package io.microsphere.spring.net;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.StreamUtils;
 
 import java.io.IOException;
@@ -31,7 +31,7 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * {@link SpringProtocolURLStreamHandler} Test
@@ -41,7 +41,7 @@
  * @see SpringEnvironmentURLConnectionFactory
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {SpringProtocolURLStreamHandler.class, SpringTestURLConnectionFactory.class})
 @TestPropertySource(properties = {"microsphere.net.a=1", "microsphere.net.b=2", "microsphere.net.c=3",})
 public class SpringProtocolURLStreamHandlerTest {
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
index 82669646..b3f76bd2 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/BeanInitializerTest.java
@@ -20,17 +20,17 @@
 import io.microsphere.spring.test.Bean;
 import io.microsphere.spring.test.TestBean;
 import io.microsphere.spring.test.TestBean2;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.hasAlias;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerInfrastructureBean;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerSpringFactoriesBeans;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 
 /**
@@ -44,7 +44,7 @@ public class BeanInitializerTest {
 
     private DefaultListableBeanFactory registry;
 
-    @Before
+    @BeforeEach
     public void init() {
         registry = new DefaultListableBeanFactory();
     }
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
index 7aeac2d1..c6e8dbf1 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java
@@ -16,7 +16,7 @@
  */
 package io.microsphere.spring.util;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.util.MimeType;
 
 import static io.microsphere.spring.util.MimeTypeUtils.APPLICATION_GRAPHQL;
@@ -26,10 +26,10 @@
 import static io.microsphere.spring.util.MimeTypeUtils.isPresentIn;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link MimeTypeUtils} Test
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
index a2d77810..936eac28 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
@@ -18,7 +18,7 @@
 
 
 import io.microsphere.util.Version;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.util.StringUtils;
 
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_AOP_VERSION;
@@ -27,7 +27,8 @@
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CONTEXT_VERSION;
 import static io.microsphere.spring.util.SpringVersionUtils.SPRING_CORE_VERSION;
 import static io.microsphere.spring.util.SpringVersionUtils.getSpringVersion;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * {@link SpringVersionUtils} Test
@@ -37,21 +38,25 @@
  */
 public class SpringVersionUtilsTest {
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testGetSpringVersionOnNPE() {
-        getSpringVersion((Class) null);
+        assertThrows(NullPointerException.class, () -> {
+            getSpringVersion((Class) null);
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testGetSpringVersionOnIAE() {
-        getSpringVersion(String.class);
+        assertThrows(IllegalArgumentException.class, () -> {
+            getSpringVersion(String.class);
+        });
     }
 
     @Test
     public void testGetSpringVersion() {
         Version version = getSpringVersion(StringUtils.class);
-        assertEquals(version,SPRING_AOP_VERSION);
-        assertEquals(SPRING_CORE_VERSION,SPRING_AOP_VERSION);
+        assertEquals(version, SPRING_AOP_VERSION);
+        assertEquals(SPRING_CORE_VERSION, SPRING_AOP_VERSION);
         assertEquals(SPRING_AOP_VERSION, SPRING_BEANS_VERSION);
         assertEquals(SPRING_BEANS_VERSION, SPRING_CONTEXT_VERSION);
         assertEquals(SPRING_CONTEXT_VERSION, SPRING_CONTEXT_SUPPORT_VERSION);
diff --git a/microsphere-spring-guice/pom.xml b/microsphere-spring-guice/pom.xml
index 660b80bf..adfaac5f 100644
--- a/microsphere-spring-guice/pom.xml
+++ b/microsphere-spring-guice/pom.xml
@@ -48,8 +48,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java b/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
index 296038d7..1f79885d 100644
--- a/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
+++ b/microsphere-spring-guice/src/test/java/io/microsphere/spring/guice/annotation/EnableGuiceTest.java
@@ -17,14 +17,14 @@
 package io.microsphere.spring.guice.annotation;
 
 import com.google.inject.Inject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 
 /**
@@ -33,7 +33,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         EnableGuiceTest.class
 })
diff --git a/microsphere-spring-jdbc/pom.xml b/microsphere-spring-jdbc/pom.xml
index 2d8c8585..381b9a86 100644
--- a/microsphere-spring-jdbc/pom.xml
+++ b/microsphere-spring-jdbc/pom.xml
@@ -56,8 +56,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
index 0ac8d48f..f80b9b4e 100644
--- a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
+++ b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/annotation/EnableP6DataSourceTest.java
@@ -19,19 +19,19 @@
 //import com.p6spy.engine.common.ConnectionInformation;
 //import com.p6spy.engine.logging.LoggingEventListener;
 //import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.beans.factory.annotation.Qualifier;
 //import org.springframework.test.context.ContextConfiguration;
-//import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.test.context.junit.jupiter.SpringExtension;
 //
 //import javax.sql.DataSource;
 //import java.sql.Connection;
 //import java.sql.SQLException;
 //
-//import static org.junit.Assert.assertNotNull;
-//import static org.junit.Assert.assertSame;
+//import static org.junit.jupiter.api.Assertions.assertNotNull;
+//import static org.junit.jupiter.api.Assertions.assertSame;
 //
 ///**
 // * {@link EnableP6DataSource} Test
@@ -39,7 +39,7 @@
 // * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 // * @since 1.0.0
 // */
-//@RunWith(SpringRunner.class)
+//@ExtendWith(SpringExtension.class)
 //@ContextConfiguration(classes = {
 //        EnableP6DataSourceTest.class
 //})
diff --git a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
index 4d79c8ae..9e629539 100644
--- a/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
+++ b/microsphere-spring-jdbc/src/test/java/io/microsphere/spring/jdbc/p6spy/beans/factory/config/P6DataSourceBeanPostProcessorTest.java
@@ -18,18 +18,18 @@
 //
 //import com.p6spy.engine.spy.P6DataSource;
 //import io.microsphere.spring.test.jdbc.embedded.EnableEmbeddedDatabase;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.beans.factory.annotation.Qualifier;
 //import org.springframework.jdbc.datasource.DriverManagerDataSource;
 //import org.springframework.test.context.ContextConfiguration;
 //import org.springframework.test.context.TestPropertySource;
-//import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.test.context.junit.jupiter.SpringExtension;
 //
 //import javax.sql.DataSource;
 //
-//import static org.junit.Assert.assertEquals;
+//import static org.junit.jupiter.api.Assertions.assertEquals;
 //
 ///**
 // * {@link P6DataSourceBeanPostProcessor} Test
@@ -37,7 +37,7 @@
 // * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 // * @since 1.0.0
 // */
-//@RunWith(SpringRunner.class)
+//@ExtendWith(SpringExtension.class)
 //@ContextConfiguration(classes = {P6DataSourceBeanPostProcessor.class, P6DataSourceBeanPostProcessorTest.class})
 //@TestPropertySource(properties = {"microsphere.jdbc.p6spy.excluded-datasource-beans=nonWrappedDataSource"})
 //@EnableEmbeddedDatabase(dataSource = "nonWrappedDataSource")
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 1ad6afcb..69d8418b 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -20,15 +20,13 @@
 
     <properties>
         <microsphere-java.version>0.0.9</microsphere-java.version>
-        <spring.version>5.3.39</spring.version>
-        <servlet-api.version>4.0.1</servlet-api.version>
+        <servlet-api.version>6.1.0</servlet-api.version>
         <jackson.version>2.18.2</jackson.version>
         <snakeyaml.version>2.3</snakeyaml.version>
-        <lettuce.version>6.1.10.RELEASE</lettuce.version>
-        <slf4j.version>1.7.36</slf4j.version>
-        <logback.version>1.2.12</logback.version>
-        <junit.version>4.13.2</junit.version>
-        <mockito.version>4.11.0</mockito.version>
+        <slf4j.version>2.0.16</slf4j.version>
+        <logback.version>1.5.15</logback.version>
+        <junit.version>5.11.4</junit.version>
+        <mockito.version>5.14.2</mockito.version>
     </properties>
 
     <dependencyManagement>
@@ -61,13 +59,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- Lettuce -->
-            <dependency>
-                <groupId>io.lettuce</groupId>
-                <artifactId>lettuce-core</artifactId>
-                <version>${lettuce.version}</version>
-            </dependency>
-
             <!-- YAML -->
             <dependency>
                 <groupId>org.yaml</groupId>
@@ -75,22 +66,23 @@
                 <version>${snakeyaml.version}</version>
             </dependency>
 
-            <!-- Servlet API -->
+            <!-- Jakarta Servlet API -->
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
                 <version>${servlet-api.version}</version>
-                <scope>provided</scope>
             </dependency>
 
-            <!-- JUnit -->
+            <!-- JUnit BOM -->
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
                 <version>${junit.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
-            <!-- Mockito Bom -->
+            <!-- Mockito BOM -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>
@@ -110,37 +102,26 @@
 
     <profiles>
         <profile>
-            <id>spring-framework-4.3</id>
-            <properties>
-                <spring.version>4.3.30.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-5.0</id>
-            <properties>
-                <spring.version>5.0.20.RELEASE</spring.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>spring-framework-5.1</id>
+            <id>spring-framework-6.0</id>
             <properties>
-                <spring.version>5.1.20.RELEASE</spring.version>
+                <spring.version>6.0.23</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-framework-5.2</id>
+            <id>spring-framework-6.1</id>
             <properties>
-                <spring.version>5.2.25.RELEASE</spring.version>
+                <spring.version>6.1.16</spring.version>
             </properties>
         </profile>
 
         <profile>
-            <id>spring-framework-5.3</id>
+            <id>spring-framework-6.2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <spring.version>5.3.39</spring.version>
+                <spring.version>6.2.1</spring.version>
             </properties>
         </profile>
     </profiles>
diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
index a5d4b363..ad16c45d 100644
--- a/microsphere-spring-web/pom.xml
+++ b/microsphere-spring-web/pom.xml
@@ -36,8 +36,8 @@
 
         <!-- Servlet API -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -67,7 +67,7 @@
             <artifactId>jackson-databind</artifactId>
             <optional>true</optional>
         </dependency>
-        
+
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -77,8 +77,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
index 413f8a2f..594ecb6e 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
@@ -35,7 +35,7 @@
 import static io.microsphere.constants.SymbolConstants.DOUBLE_QUOTATION_CHAR;
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.CUSTOMIZED;
 import static io.microsphere.util.StringUtils.EMPTY_STRING_ARRAY;
-import static org.springframework.util.Assert.isTrue;
+import static org.springframework.util.isTrue;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
index 4889c2f4..67171e81 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactoryTest.java
@@ -16,19 +16,19 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Optional;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.springframework.util.StreamUtils.copyToString;
 
 /**
@@ -38,7 +38,7 @@
  * @since 1.0.0
  */
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SmartWebEndpointMappingFactoryTest.class)
 public class SmartWebEndpointMappingFactoryTest {
 
@@ -49,7 +49,7 @@ public class SmartWebEndpointMappingFactoryTest {
 
     private String fullJson;
 
-    @Before
+    @BeforeEach
     public void init() throws Throwable {
         this.fullJson = copyToString(this.fullJsonResource.getInputStream(), UTF_8);
     }
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
index 3f46e956..d6ca9e96 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java
@@ -16,19 +16,19 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.IOException;
 
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.CUSTOMIZED;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.util.StreamUtils.copyToString;
 
 /**
@@ -37,7 +37,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = WebEndpointMappingTest.class)
 public class WebEndpointMappingTest {
 
@@ -46,7 +46,7 @@ public class WebEndpointMappingTest {
 
     private String fullJson;
 
-    @Before
+    @BeforeEach
     public void init() throws Throwable {
         this.fullJson = copyToString(this.fullJsonResource.getInputStream(), UTF_8);
     }
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
index 5a2af218..f7faf278 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestMethodsRuleTest.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link WebRequestMethodsRule} Test
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
index 3307e21e..b0264103 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/rule/WebRequestPattensRuleTest.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.web.rule;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link WebRequestPattensRule} Test
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
index a62cd50c..05528beb 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
@@ -17,8 +17,8 @@
 //package io.microsphere.spring.web.servlet;
 //
 //import io.microsphere.spring.web.metadata.WebEndpointMapping;
-//import org.junit.Before;
-//import org.junit.Test;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
 //
 //import javax.servlet.DispatcherType;
 //import javax.servlet.FilterRegistration;
@@ -28,8 +28,8 @@
 //
 //import static io.microsphere.util.ArrayUtils.of;
 //import static io.microsphere.util.ArrayUtils.size;
-//import static org.junit.Assert.assertArrayEquals;
-//import static org.junit.Assert.assertEquals;
+//import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+//import static org.junit.jupiter.api.Assertions.assertEquals;
 //
 ///**
 // * {@link FilterRegistrationWebEndpointMappingFactory} Test
@@ -47,7 +47,7 @@
 //
 //    private FilterRegistration.Dynamic registration;
 //
-//    @Before
+//    @BeforeEach
 //    public void init() throws ServletException {
 //        filterName = "test-filter";
 //        url = "/test-filter";
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
index 85d1b39d..6234d7c5 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
@@ -18,8 +18,8 @@
 
 import io.microsphere.spring.web.metadata.ServletRegistrationWebEndpointMappingFactory;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockServletConfig;
 
 import javax.servlet.ServletException;
@@ -27,8 +27,8 @@
 import java.util.Optional;
 
 import static io.microsphere.util.ArrayUtils.of;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link ServletRegistrationWebEndpointMappingFactory} Test
@@ -50,7 +50,7 @@ public class ServletRegistrationWebEndpointMappingFactoryTest {
 
     private TestServlet testServlet;
 
-    @Before
+    @BeforeEach
     public void init() throws ServletException {
         servletName = "test-servlet";
         url = "/test";
diff --git a/microsphere-spring-webmvc/pom.xml b/microsphere-spring-webmvc/pom.xml
index ae7b62be..388db38a 100644
--- a/microsphere-spring-webmvc/pom.xml
+++ b/microsphere-spring-webmvc/pom.xml
@@ -36,8 +36,8 @@
 
         <!-- Servlet API -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -64,8 +64,8 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
index 22676a22..da414fd4 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
@@ -35,8 +35,8 @@ public class HandlerMetadata<H, M> {
     private final M metadata;
 
     public HandlerMetadata(H handler, M metadata) {
-        Assert.notNull(handler, "The 'handler' must not be null!");
-        Assert.notNull(metadata, "The 'metadata' must not be null!");
+        notNull(handler, "The 'handler' must not be null!");
+        notNull(metadata, "The 'metadata' must not be null!");
         this.handler = handler;
         this.metadata = metadata;
     }
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
index 975c5e90..2e755fe1 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
@@ -376,9 +376,9 @@ protected static String appendInitParameter(String existedParameterValue, String
      */
     public static void appendInitParameters(ServletContext servletContext, String parameterName, String... parameterValues) {
 
-        Assert.notNull(servletContext);
-        Assert.hasLength(parameterName);
-        Assert.notNull(parameterValues);
+        notNull(servletContext);
+        hasLength(parameterName);
+        notNull(parameterValues);
 
         String existedParameterValue = servletContext.getInitParameter(parameterName);
 
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
index 755631c6..9cbd05e8 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/metadata/RequestMappingInfoWebEndpointMappingFactoryTest.java
@@ -18,13 +18,13 @@
 
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.webmvc.controller.TestController;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
@@ -34,9 +34,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * {@link RequestMappingMetadataWebEndpointMappingFactory} Test
@@ -44,7 +44,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = {
         TestController.class,
@@ -71,7 +71,7 @@ public RequestMappingHandlerMapping requestMappingHandlerMapping() {
         }
     }
 
-    @Before
+    @BeforeEach
     public void init() {
         factory = new RequestMappingMetadataWebEndpointMappingFactory(requestMappingInfoHandlerMapping);
         this.handlerMethods = requestMappingInfoHandlerMapping.getHandlerMethods();
diff --git a/pom.xml b/pom.xml
index 1c63c2ca..603e3413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
 
     <properties>
         <revision>0.0.4-SNAPSHOT</revision>
+        <java.version>17</java.version>
     </properties>
 
     <modules>

From 42f42dde9eddef76ca5a143d17a55697d12f49d5 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 2 Jan 2025 21:58:33 +0800
Subject: [PATCH 156/157] Polish #42

---
 microsphere-spring-context/pom.xml            |   6 +
 ...tingConfigurationPropertyListenerTest.java | 166 +++++++++---------
 .../GenericAnnotationAttributesTest.java      |   2 +-
 microsphere-spring-parent/pom.xml             |  19 +-
 .../WebExtensionBeanDefinitionRegistrar.java  |   2 +-
 .../AbstractWebEndpointMappingFactory.java    |   2 +-
 ...RegistrationWebEndpointMappingFactory.java |   5 +-
 ...RegistrationWebEndpointMappingFactory.java |   6 +-
 ...RegistrationWebEndpointMappingFactory.java |   5 +-
 .../SmartWebEndpointMappingFactory.java       |   4 +-
 .../web/metadata/WebEndpointMapping.java      |  38 ++--
 .../metadata/WebEndpointMappingFactory.java   |   9 +-
 .../metadata/WebEndpointMappingRegistry.java  |   1 -
 .../DelegatingHandlerMethodAdvice.java        |   2 +-
 .../method/support/HandlerMethodAdvice.java   |   3 +-
 .../support/HandlerMethodInterceptor.java     |   3 +-
 .../web/rule/AbstractNameValueExpression.java |   3 +-
 .../web/rule/AbstractWebRequestRule.java      |   1 -
 .../web/rule/ConsumeMediaTypeExpression.java  |   2 +-
 .../web/rule/GenericMediaTypeExpression.java  |   3 +-
 .../spring/web/rule/NameValueExpression.java  |   3 +-
 .../web/rule/ProduceMediaTypeExpression.java  |   2 +-
 .../web/rule/StringNameValueExpression.java   |   3 +-
 .../web/rule/WebRequestPattensRule.java       |   2 +-
 .../web/rule/WebRequestProducesRule.java      |   3 +-
 .../spring/web/rule/WebRequestRule.java       |   3 +-
 .../spring/web/util/WebRequestUtils.java      |   1 -
 ...strationWebEndpointMappingFactoryTest.java |   6 +-
 ...strationWebEndpointMappingFactoryTest.java |   4 +-
 .../web/servlet/TestFilterRegistration.java   |   5 +-
 .../spring/web/servlet/TestServlet.java       |   4 +-
 .../web/servlet/TestServletContext.java       |   8 +-
 .../web/servlet/TestServletRegistration.java  |   7 +-
 .../servlet/filter/ContentCachingFilter.java  |  14 +-
 .../spring/web/servlet/util/WebUtils.java     |  18 +-
 .../StoringResponseBodyReturnValueAdvice.java |   2 +-
 ...ebMvcExtensionBeanDefinitionRegistrar.java |   2 +-
 .../WebMvcExtensionConfiguration.java         |   4 +-
 ...entNegotiationManagerWebMvcConfigurer.java |   3 +-
 .../handler/ReversedProxyHandlerMapping.java  |   8 +-
 ...ctPageRenderContextHandlerInterceptor.java |  20 +--
 .../AnnotatedMethodHandlerInterceptor.java    |   6 +-
 .../LazyCompositeHandlerInterceptor.java      |   4 +-
 .../interceptor/MethodHandlerInterceptor.java |   8 +-
 .../webmvc/metadata/HandlerMetadata.java      |   4 +-
 .../metadata/WebEndpointMappingRegistrar.java |  10 +-
 .../HandlerMethodArgumentResolverAdvice.java  |   3 +-
 .../InterceptingHandlerMethodProcessor.java   |  10 +-
 .../spring/webmvc/util/WebMvcUtils.java       |  29 ++-
 ...tentAnnotatedMethodHandlerInterceptor.java |   6 +-
 pom.xml                                       |   2 +-
 51 files changed, 242 insertions(+), 244 deletions(-)

diff --git a/microsphere-spring-context/pom.xml b/microsphere-spring-context/pom.xml
index a81c474c..1f2d0d93 100644
--- a/microsphere-spring-context/pom.xml
+++ b/microsphere-spring-context/pom.xml
@@ -38,6 +38,12 @@
         <dependency>
             <groupId>io.github.microsphere-projects</groupId>
             <artifactId>microsphere-java-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Spring Framework -->
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/CollectingConfigurationPropertyListenerTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/CollectingConfigurationPropertyListenerTest.java
index 14afa5bd..a6f1b904 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/config/CollectingConfigurationPropertyListenerTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/config/CollectingConfigurationPropertyListenerTest.java
@@ -1,83 +1,83 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.microsphere.spring.config;
-
-import io.microsphere.spring.beans.factory.support.ListenableAutowireCandidateResolverInitializer;
-import io.microsphere.spring.core.env.ListenableConfigurableEnvironmentInitializer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * {@link CollectingConfigurationPropertyListener} Test
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @since CollectingConfigurationPropertyListener
- */
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(
-        classes = CollectingConfigurationPropertyListenerTest.class,
-        initializers = {
-                ListenableConfigurableEnvironmentInitializer.class,
-                ListenableAutowireCandidateResolverInitializer.class,
-                CollectingConfigurationPropertyInitializer.class
-        }
-)
-@TestPropertySource(
-        properties = {
-                "microsphere.spring.listenable-environment.enabled=true",
-                "microsphere.spring.listenable-autowire-candidate-resolver.enabled=true",
-                "spring.profiles.active=test",
-                "user.name=Mercy",
-                "score=99"
-        }
-)
-class CollectingConfigurationPropertyListenerTest {
-
-    @Value("${user.name}")
-    private String userName;
-
-    @Value("${score}")
-    private Integer score;
-
-    @Autowired
-    private ConfigurableEnvironment environment;
-
-    @Autowired
-    private ConfigurationPropertyRepository configurationPropertyRepository;
-
-    @Test
-    public void test() {
-        String profiles = environment.resolvePlaceholders("${spring.profiles.active}");
-        assertEquals("test", profiles);
-
-        ConfigurationProperty configurationProperty = configurationPropertyRepository.get("user.name");
-        assertEquals(String.class, configurationProperty.getType());
-        assertEquals("Mercy", configurationProperty.getValue());
-        assertTrue(configurationProperty.isRequired());
-        assertFalse(configurationProperty.getMetadata().getTargets().isEmpty());
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements.  See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License.  You may obtain a copy of the License at
+// *
+// *     http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package io.microsphere.spring.config;
+//
+//import io.microsphere.spring.beans.factory.support.ListenableAutowireCandidateResolverInitializer;
+//import io.microsphere.spring.core.env.ListenableConfigurableEnvironmentInitializer;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.core.env.ConfigurableEnvironment;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.TestPropertySource;
+//import org.springframework.test.context.junit.jupiter.SpringExtension;
+//
+//import static org.junit.jupiter.api.Assertions.assertEquals;
+//import static org.junit.jupiter.api.Assertions.assertFalse;
+//import static org.junit.jupiter.api.Assertions.assertTrue;
+//
+///**
+// * {@link CollectingConfigurationPropertyListener} Test
+// *
+// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+// * @since CollectingConfigurationPropertyListener
+// */
+//@ExtendWith(SpringExtension.class)
+//@ContextConfiguration(
+//        classes = CollectingConfigurationPropertyListenerTest.class,
+//        initializers = {
+//                ListenableConfigurableEnvironmentInitializer.class,
+//                ListenableAutowireCandidateResolverInitializer.class,
+//                CollectingConfigurationPropertyInitializer.class
+//        }
+//)
+//@TestPropertySource(
+//        properties = {
+//                "microsphere.spring.listenable-environment.enabled=true",
+//                "microsphere.spring.listenable-autowire-candidate-resolver.enabled=true",
+//                "spring.profiles.active=test",
+//                "user.name=Mercy",
+//                "score=99"
+//        }
+//)
+//class CollectingConfigurationPropertyListenerTest {
+//
+//    @Value("${user.name}")
+//    private String userName;
+//
+//    @Value("${score}")
+//    private Integer score;
+//
+//    @Autowired
+//    private ConfigurableEnvironment environment;
+//
+//    @Autowired
+//    private ConfigurationPropertyRepository configurationPropertyRepository;
+//
+//    @Test
+//    public void test() {
+//        String profiles = environment.resolvePlaceholders("${spring.profiles.active}");
+//        assertEquals("test", profiles);
+//
+//        ConfigurationProperty configurationProperty = configurationPropertyRepository.get("user.name");
+//        assertEquals(String.class, configurationProperty.getType());
+//        assertEquals("Mercy", configurationProperty.getValue());
+//        assertTrue(configurationProperty.isRequired());
+//        assertFalse(configurationProperty.getMetadata().getTargets().isEmpty());
+//    }
+//}
diff --git a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
index e02e3ec7..6dc7f7ed 100644
--- a/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
+++ b/microsphere-spring-context/src/test/java/io/microsphere/spring/core/annotation/GenericAnnotationAttributesTest.java
@@ -48,7 +48,7 @@ public void test() {
         assertEquals(contextConfiguration.loader(), annotationAttributes.getClass("loader"));
         assertEquals(contextConfiguration.inheritInitializers(), annotationAttributes.getBoolean("inheritInitializers"));
         assertEquals(contextConfiguration.inheritLocations(), annotationAttributes.getBoolean("inheritLocations"));
-        assertEquals(contextConfiguration.value(), annotationAttributes.getStringArray("value"));
+        assertArrayEquals(contextConfiguration.value(), annotationAttributes.getStringArray("value"));
 
     }
 }
diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
index 69d8418b..28a2ecfa 100644
--- a/microsphere-spring-parent/pom.xml
+++ b/microsphere-spring-parent/pom.xml
@@ -32,15 +32,6 @@
     <dependencyManagement>
         <dependencies>
 
-            <!-- Microsphere Dependencies -->
-            <dependency>
-                <groupId>io.github.microsphere-projects</groupId>
-                <artifactId>microsphere-java-dependencies</artifactId>
-                <version>${microsphere-java.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- Spring Framework BOM -->
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -91,12 +82,22 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Logback -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
 
+            <!-- Microsphere Dependencies -->
+            <dependency>
+                <groupId>io.github.microsphere-projects</groupId>
+                <artifactId>microsphere-java-dependencies</artifactId>
+                <version>${microsphere-java.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
index f2226b94..dfdd6e57 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/annotation/WebExtensionBeanDefinitionRegistrar.java
@@ -24,8 +24,8 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 
-import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 
 /**
  * {@link ImportBeanDefinitionRegistrar} for Spring Web Extension
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
index 4e1efbce..e56624d3 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/AbstractWebEndpointMappingFactory.java
@@ -18,8 +18,8 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.Optional;
 
 import static java.util.Optional.ofNullable;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
index 1c7fa760..0d2bb3f8 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/FilterRegistrationWebEndpointMappingFactory.java
@@ -16,8 +16,9 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import javax.servlet.FilterRegistration;
-import javax.servlet.ServletContext;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.ServletContext;
+
 import java.util.Collection;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
index 0f16bda9..355eaeb4 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/RegistrationWebEndpointMappingFactory.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import javax.annotation.Nonnull;
+import jakarta.servlet.Registration;
+import jakarta.servlet.ServletContext;
 
-import javax.servlet.Registration;
-import javax.servlet.ServletContext;
+import javax.annotation.Nonnull;
 import java.util.Collection;
 
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.SERVLET;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
index efee856c..5798f00d 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/ServletRegistrationWebEndpointMappingFactory.java
@@ -16,8 +16,9 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
+
 import java.util.Collection;
 
 /**
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
index 18b7a50a..6bf025d7 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/SmartWebEndpointMappingFactory.java
@@ -16,13 +16,13 @@
  */
 package io.microsphere.spring.web.metadata;
 
-import io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.core.io.support.SpringFactoriesLoaderUtils;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
index 594ecb6e..c3247b1d 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java
@@ -17,11 +17,11 @@
 package io.microsphere.spring.web.metadata;
 
 import io.microsphere.util.ArrayUtils;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,14 +35,14 @@
 import static io.microsphere.constants.SymbolConstants.DOUBLE_QUOTATION_CHAR;
 import static io.microsphere.spring.web.metadata.WebEndpointMapping.Kind.CUSTOMIZED;
 import static io.microsphere.util.StringUtils.EMPTY_STRING_ARRAY;
-import static org.springframework.util.isTrue;
+import static org.springframework.util.Assert.isTrue;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**
  * The meta-data class for Web Endpoint Mapping that could be one of these endpoints:
  * <ul>
- *     <li>{@link javax.servlet.Servlet Servlet}</li>
- *     <li>{@link javax.servlet.Filter Servlet's Filter}</li>
+ *     <li>{@link jakarta.servlet.Servlet Servlet}</li>
+ *     <li>{@link jakarta.servlet.Filter Servlet's Filter}</li>
  *     <li>Spring WebMVC {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}</li>
  *     <li>Spring WebFlux {@link org.springframework.web.reactive.DispatcherHandler DispatcherHandler}</li>
  *     <li>Customized</li>
@@ -51,8 +51,8 @@
  * The method {@link #getKind()} can be used to identify the kind of endpoints, and the method
  * {@link #getEndpoint()} is an abstract presentation of actual endpoint that may be :
  * <ul>
- *     <li>{@link javax.servlet.ServletRegistration#getName() the name of Servlet}</li>
- *     <li>{@link javax.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
+ *     <li>{@link jakarta.servlet.ServletRegistration#getName() the name of Servlet}</li>
+ *     <li>{@link jakarta.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
  *     <li>the any handler of Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}:
  *      <ul>
  *          <li>The {@link String} presenting the name of Handler bean</li>
@@ -72,17 +72,17 @@
  * <p>
  * The method {@link #getSource()} can trace the source of {@link WebEndpointMapping} if present, it could be :
  * <ul>
- *     <li>{@link javax.servlet.ServletContext ServletContext}</li>
+ *     <li>{@link jakarta.servlet.ServletContext ServletContext}</li>
  *     <li>Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}</li>
  *     <li>Spring WebFlux {@link org.springframework.web.reactive.HandlerMapping}</li>
  * </ul>, or it's {@link #NON_SOURCE non-source}
  *
  * @param <E> the type of endpoint
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- * @see javax.servlet.ServletRegistration
- * @see javax.servlet.FilterRegistration
- * @see javax.servlet.annotation.WebServlet
- * @see javax.servlet.annotation.WebFilter
+ * @see jakarta.servlet.ServletRegistration
+ * @see jakarta.servlet.FilterRegistration
+ * @see jakarta.servlet.annotation.WebServlet
+ * @see jakarta.servlet.annotation.WebFilter
  * @see org.springframework.web.servlet.DispatcherServlet
  * @see org.springframework.web.reactive.DispatcherHandler
  * @see org.springframework.web.servlet.HandlerMapping
@@ -134,12 +134,12 @@ public class WebEndpointMapping<E> {
     public enum Kind {
 
         /**
-         * {@link javax.servlet.Servlet}
+         * {@link jakarta.servlet.Servlet}
          */
         SERVLET,
 
         /**
-         * {@link javax.servlet.Filter}
+         * {@link jakarta.servlet.Filter}
          */
         FILTER,
 
@@ -317,8 +317,8 @@ private WebEndpointMapping() {
     /**
      * The kind of endpoint:
      * <ul>
-     *     <li>{@link javax.servlet.Servlet Servlet}</li>
-     *     <li>{@link javax.servlet.Filter Servlet's Filter}</li>
+     *     <li>{@link jakarta.servlet.Servlet Servlet}</li>
+     *     <li>{@link jakarta.servlet.Filter Servlet's Filter}</li>
      *     <li>Spring WebMVC {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}</li>
      *     <li>Spring WebFlux {@link org.springframework.web.reactive.DispatcherHandler DispatcherHandler}</li>
      *     <li>Customized</li>
@@ -334,8 +334,8 @@ public Kind getKind() {
     /**
      * The abstract presentation of actual endpoint that may be :
      * <ul>
-     *     <li>{@link javax.servlet.ServletRegistration#getName() the name of Servlet}</li>
-     *     <li>{@link javax.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
+     *     <li>{@link jakarta.servlet.ServletRegistration#getName() the name of Servlet}</li>
+     *     <li>{@link jakarta.servlet.FilterRegistration#getName() the name of Servlet's Filter}</li>
      *     <li>the any handler of Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}:
      *      <ul>
      *          <li>The {@link String} presenting the name of Handler bean</li>
@@ -372,7 +372,7 @@ public int getId() {
     /**
      * The source of {@link WebEndpointMapping} if present, it could be :
      * <ul>
-     *     <li>{@link javax.servlet.ServletContext ServletContext}</li>
+     *     <li>{@link jakarta.servlet.ServletContext ServletContext}</li>
      *     <li>Spring WebMVC {@link org.springframework.web.servlet.HandlerMapping}</li>
      *     <li>Spring WebFlux {@link org.springframework.web.reactive.HandlerMapping}</li>
      * </ul>, or it's {@link #NON_SOURCE non-source}
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
index c6b48b17..b4ce2924 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingFactory.java
@@ -17,7 +17,6 @@
 package io.microsphere.spring.web.metadata;
 
 import javax.annotation.Nonnull;
-
 import java.util.Optional;
 
 import static org.springframework.core.ResolvableType.forClass;
@@ -36,8 +35,8 @@ public interface WebEndpointMappingFactory<E> {
      *
      * @param endpoint could be one of these :
      *                 <ul>
-     *                 <li>{@link javax.servlet.ServletRegistration}</li>
-     *                 <li>{@link javax.servlet.FilterRegistration}</li>
+     *                 <li>{@link jakarta.servlet.ServletRegistration}</li>
+     *                 <li>{@link jakarta.servlet.FilterRegistration}</li>
      *                 <li>{@link org.springframework.web.servlet.mvc.method.RequestMappingInfo}</li>
      *                 <li>{@link org.springframework.web.reactive.result.method.RequestMappingInfo}</li>
      *                 </ul>
@@ -52,8 +51,8 @@ default boolean supports(E endpoint) {
      *
      * @param endpoint could be one of these :
      *                 <ul>
-     *                 <li>{@link javax.servlet.ServletRegistration}</li>
-     *                 <li>{@link javax.servlet.FilterRegistration}</li>
+     *                 <li>{@link jakarta.servlet.ServletRegistration}</li>
+     *                 <li>{@link jakarta.servlet.FilterRegistration}</li>
      *                 <li>{@link org.springframework.web.servlet.mvc.method.RequestMappingInfo}</li>
      *                 <li>{@link org.springframework.web.reactive.result.method.RequestMappingInfo}</li>
      *                 </ul>
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
index f88b8358..74adb525 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMappingRegistry.java
@@ -17,7 +17,6 @@
 package io.microsphere.spring.web.metadata;
 
 import javax.annotation.Nonnull;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
index 44919236..7ae1d343 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java
@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.web.method.support;
 
-import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.MethodParameter;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
index 78eafb53..bc20c6f9 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodAdvice.java
@@ -17,11 +17,12 @@
 package io.microsphere.spring.web.method.support;
 
 import org.springframework.core.MethodParameter;
-import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.HandlerMethod;
 
+import javax.annotation.Nullable;
+
 /**
  * Intercepting {@link HandlerMethod} facade interface
  *
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
index 01b712dd..98749a32 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/HandlerMethodInterceptor.java
@@ -1,10 +1,11 @@
 package io.microsphere.spring.web.method.support;
 
-import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.HandlerMethod;
 
+import javax.annotation.Nullable;
+
 /**
  * {@link HandlerMethod} Interceptor that allows for customized {@link HandlerMethod} execution chains.
  * Applications can register any number of existing or custom interceptors
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
index d3d3da6d..6b22d5a1 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractNameValueExpression.java
@@ -16,10 +16,11 @@
 
 package io.microsphere.spring.web.rule;
 
-import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 
+import javax.annotation.Nullable;
+
 import static io.microsphere.constants.SymbolConstants.EQUAL_CHAR;
 import static io.microsphere.constants.SymbolConstants.EXCLAMATION;
 import static io.microsphere.constants.SymbolConstants.EXCLAMATION_CHAR;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
index 2b59c8f2..0abe52e5 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/AbstractWebRequestRule.java
@@ -17,7 +17,6 @@
 package io.microsphere.spring.web.rule;
 
 import javax.annotation.Nullable;
-
 import java.util.Collection;
 import java.util.StringJoiner;
 
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
index 97c4b121..584de722 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ConsumeMediaTypeExpression.java
@@ -17,9 +17,9 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
index 063017ef..72d47e52 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/GenericMediaTypeExpression.java
@@ -17,9 +17,10 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.annotation.Nullable;
+
 /**
  * Supports media type expressions as described in:
  * {@link RequestMapping#consumes()} and {@link RequestMapping#produces()}.
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
index b006a656..4c6ae5fb 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/NameValueExpression.java
@@ -16,9 +16,10 @@
 
 package io.microsphere.spring.web.rule;
 
-import javax.annotation.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.annotation.Nullable;
+
 /**
  * A contract for {@code "name!=value"} style expression used to specify request
  * parameters and request header conditions in {@code @RequestMapping}.
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
index e8b1059a..b2a9f040 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/ProduceMediaTypeExpression.java
@@ -17,10 +17,10 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
index 2e9047e5..486b0306 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/StringNameValueExpression.java
@@ -16,9 +16,10 @@
 
 package io.microsphere.spring.web.rule;
 
-import javax.annotation.Nullable;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Nullable;
+
 /**
  * String {@link NameValueExpression}
  *
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
index a239f9dc..845aabec 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPattensRule.java
@@ -16,7 +16,6 @@
  */
 package io.microsphere.spring.web.rule;
 
-import javax.annotation.Nullable;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PathMatcher;
@@ -25,6 +24,7 @@
 import org.springframework.web.util.UrlPathHelper;
 import org.springframework.web.util.pattern.PathPattern;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
index d73ef344..016523d8 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestProducesRule.java
@@ -17,15 +17,14 @@
 package io.microsphere.spring.web.rule;
 
 import org.springframework.http.MediaType;
-import javax.annotation.Nullable;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.MimeType;
 import org.springframework.web.HttpMediaTypeException;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
index 58fd6133..386b364c 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestRule.java
@@ -16,9 +16,10 @@
  */
 package io.microsphere.spring.web.rule;
 
-import javax.annotation.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 
+import javax.annotation.Nullable;
+
 /**
  * {@link NativeWebRequest} Rule was inspired by {@linkplain org.springframework.web.servlet.mvc.condition.RequestCondition}
  *
diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
index dbfb602b..828dcf36 100644
--- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
+++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/util/WebRequestUtils.java
@@ -18,7 +18,6 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.util.UrlPathHelper;
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
index 05528beb..a01ab01f 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/FilterRegistrationWebEndpointMappingFactoryTest.java
@@ -20,9 +20,9 @@
 //import org.junit.jupiter.api.BeforeEach;
 //import org.junit.jupiter.api.Test;
 //
-//import javax.servlet.DispatcherType;
-//import javax.servlet.FilterRegistration;
-//import javax.servlet.ServletException;
+//import jakarta.servlet.DispatcherType;
+//import jakarta.servlet.FilterRegistration;
+//import jakarta.servlet.ServletException;
 //import java.util.EnumSet;
 //import java.util.Optional;
 //
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
index 6234d7c5..e72c3796 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/ServletRegistrationWebEndpointMappingFactoryTest.java
@@ -18,12 +18,12 @@
 
 import io.microsphere.spring.web.metadata.ServletRegistrationWebEndpointMappingFactory;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockServletConfig;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
 import java.util.Optional;
 
 import static io.microsphere.util.ArrayUtils.of;
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestFilterRegistration.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestFilterRegistration.java
index 0e4b0a51..340cf6b9 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestFilterRegistration.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestFilterRegistration.java
@@ -16,8 +16,9 @@
  */
 package io.microsphere.spring.web.servlet;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterRegistration;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterRegistration;
+
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServlet.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServlet.java
index 8bfbeabd..fd963481 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServlet.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServlet.java
@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.web.servlet;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 
 /**
  * {@link Servlet} for Testing
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
index 463bf079..7b257837 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletContext.java
@@ -16,12 +16,12 @@
  */
 package io.microsphere.spring.web.servlet;
 
-import javax.annotation.Nullable;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
 import org.springframework.mock.web.MockServletContext;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
+import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletRegistration.java b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletRegistration.java
index 5bb8a010..31fadf14 100644
--- a/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletRegistration.java
+++ b/microsphere-spring-web/src/test/java/io/microsphere/spring/web/servlet/TestServletRegistration.java
@@ -16,9 +16,10 @@
  */
 package io.microsphere.spring.web.servlet;
 
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletSecurityElement;
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletSecurityElement;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
index c95f377d..79090d03 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/filter/ContentCachingFilter.java
@@ -2,16 +2,16 @@
 
 import io.microsphere.logging.Logger;
 import io.microsphere.logging.LoggerFactory;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+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.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingResponseWrapper;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/util/WebUtils.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/util/WebUtils.java
index f6341873..a652ca94 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/util/WebUtils.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/web/servlet/util/WebUtils.java
@@ -1,14 +1,14 @@
 package io.microsphere.spring.web.servlet.util;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.Registration;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.util.ClassUtils;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.Registration;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -28,9 +28,9 @@ public abstract class WebUtils {
     private static final boolean servlet3OrAbove;
 
     /**
-     * javax.servlet.ServletContainerInitializer @since 3.0
+     * jakarta.servlet.ServletContainerInitializer @since 3.0
      */
-    private static final String SERVLET_CONTAINER_INITIALIZER_CLASS_NAME = "javax.servlet.ServletContainerInitializer";
+    private static final String SERVLET_CONTAINER_INITIALIZER_CLASS_NAME = "jakarta.servlet.ServletContainerInitializer";
 
     static {
 
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/advice/StoringResponseBodyReturnValueAdvice.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/advice/StoringResponseBodyReturnValueAdvice.java
index 9d1a2b08..8ca55389 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/advice/StoringResponseBodyReturnValueAdvice.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/advice/StoringResponseBodyReturnValueAdvice.java
@@ -1,6 +1,7 @@
 package io.microsphere.spring.webmvc.advice;
 
 import io.microsphere.spring.webmvc.util.WebMvcUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -9,7 +10,6 @@
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 
 /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
index ee6e8abf..27e7b539 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionBeanDefinitionRegistrar.java
@@ -31,8 +31,8 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
+import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.spring.webmvc.interceptor.LazyCompositeHandlerInterceptor.BEAN_NAME;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
index fd07a295..5dce22e4 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/annotation/WebMvcExtensionConfiguration.java
@@ -21,7 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
 
 /**
  * The configuration class for {@link EnableWebMvcExtension}
@@ -31,7 +31,7 @@
  * @see EnableWebMvcExtension
  * @since 1.0.0
  */
-public class WebMvcExtensionConfiguration extends WebMvcConfigurerAdapter {
+public class WebMvcExtensionConfiguration implements WebMvcConfigurer {
 
     @Autowired
     private ObjectProvider<LazyCompositeHandlerInterceptor[]> lazyCompositeHandlerInterceptorProvider;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/config/ConfigurableContentNegotiationManagerWebMvcConfigurer.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/config/ConfigurableContentNegotiationManagerWebMvcConfigurer.java
index 18fd1ff3..80f8673b 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/config/ConfigurableContentNegotiationManagerWebMvcConfigurer.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/config/ConfigurableContentNegotiationManagerWebMvcConfigurer.java
@@ -8,7 +8,6 @@
 import org.springframework.web.accept.ContentNegotiationManagerFactoryBean;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import java.beans.PropertyEditorSupport;
 import java.lang.reflect.Field;
@@ -24,7 +23,7 @@
  * @see WebMvcConfigurer
  * @since 2017.03.23
  */
-public class ConfigurableContentNegotiationManagerWebMvcConfigurer extends WebMvcConfigurerAdapter {
+public class ConfigurableContentNegotiationManagerWebMvcConfigurer implements WebMvcConfigurer {
 
     /**
      * Property separator : "."
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
index ad2f10ad..163544f1 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/handler/ReversedProxyHandlerMapping.java
@@ -16,15 +16,15 @@
  */
 package io.microsphere.spring.webmvc.handler;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.webmvc.metadata.HandlerMetadataWebEndpointMappingFactory;
 import io.microsphere.spring.webmvc.metadata.RequestMappingMetadataWebEndpointMappingFactory;
 import io.microsphere.util.ArrayUtils;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.context.ApplicationListener;
-import javax.annotation.Nullable;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
@@ -35,7 +35,7 @@
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import javax.servlet.http.HttpServletRequest;
+import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AbstractPageRenderContextHandlerInterceptor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AbstractPageRenderContextHandlerInterceptor.java
index 58a2f541..30ee6306 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AbstractPageRenderContextHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AbstractPageRenderContextHandlerInterceptor.java
@@ -1,13 +1,12 @@
 package io.microsphere.spring.webmvc.interceptor;
 
-import io.microsphere.spring.webmvc.util.WebMvcUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import static io.microsphere.spring.webmvc.util.WebMvcUtils.isPageRenderRequest;
 
 /**
  * Abstract Page Render Context {@link HandlerInterceptor}
@@ -16,23 +15,14 @@
  * @see HandlerInterceptor
  * @since 2017.02.01
  */
-public abstract class AbstractPageRenderContextHandlerInterceptor extends HandlerInterceptorAdapter {
-
+public abstract class AbstractPageRenderContextHandlerInterceptor implements HandlerInterceptor {
 
     public final void postHandle(
             HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
             throws Exception {
-
-        if (WebMvcUtils.isPageRenderRequest(modelAndView)) {
-
+        if (isPageRenderRequest(modelAndView)) {
             postHandleOnPageRenderContext(request, response, handler, modelAndView);
-
-        } else {
-
-            super.postHandle(request, response, handler, modelAndView);
-
         }
-
     }
 
     /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AnnotatedMethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AnnotatedMethodHandlerInterceptor.java
index c8029936..3d37cdb9 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AnnotatedMethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/AnnotatedMethodHandlerInterceptor.java
@@ -1,13 +1,13 @@
 package io.microsphere.spring.webmvc.interceptor;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.core.ResolvableType;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.lang.annotation.Annotation;
 
 /**
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/LazyCompositeHandlerInterceptor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/LazyCompositeHandlerInterceptor.java
index 01d39522..b11aff05 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/LazyCompositeHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/LazyCompositeHandlerInterceptor.java
@@ -20,13 +20,13 @@
 import io.microsphere.lang.function.ThrowableConsumer;
 import io.microsphere.lang.function.ThrowableFunction;
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
index 07027d22..c7c96ac0 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/interceptor/MethodHandlerInterceptor.java
@@ -1,15 +1,15 @@
 package io.microsphere.spring.webmvc.interceptor;
 
 import io.microsphere.spring.webmvc.util.WebMvcUtils;
-import javax.annotation.Nullable;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.annotation.Nullable;
 
 /**
  *
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
index da414fd4..80b71cfd 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/HandlerMetadata.java
@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.webmvc.metadata;
 
-import org.springframework.util.Assert;
-
 import java.util.Objects;
 
+import static org.springframework.util.Assert.notNull;
+
 /**
  * The metadata class for Spring WebMVC's Handler
  *
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
index 72d7aef8..0ad5be2a 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/metadata/WebEndpointMappingRegistrar.java
@@ -16,6 +16,8 @@
  */
 package io.microsphere.spring.webmvc.metadata;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.lifecycle.AbstractSmartLifecycle;
 import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
 import io.microsphere.spring.web.event.WebEventPublisher;
@@ -24,8 +26,9 @@
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.web.metadata.WebEndpointMappingRegistry;
 import io.microsphere.util.Version;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerMapping;
@@ -33,9 +36,6 @@
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 
-import javax.servlet.FilterRegistration;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
index 392ce258..d132a052 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/HandlerMethodArgumentResolverAdvice.java
@@ -17,13 +17,14 @@
 package io.microsphere.spring.webmvc.method.support;
 
 import org.springframework.core.MethodParameter;
-import javax.annotation.Nullable;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+import javax.annotation.Nullable;
+
 /**
  * The advice interface for {@link HandlerMethodArgumentResolver}
  *
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
index d61d696a..1c7a0aa0 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/method/support/InterceptingHandlerMethodProcessor.java
@@ -16,17 +16,18 @@
  */
 package io.microsphere.spring.webmvc.method.support;
 
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
 import io.microsphere.spring.web.method.support.HandlerMethodAdvice;
 import io.microsphere.spring.web.method.support.HandlerMethodArgumentInterceptor;
 import io.microsphere.spring.web.method.support.HandlerMethodInterceptor;
-import io.microsphere.logging.Logger;
-import io.microsphere.logging.LoggerFactory;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.MethodParameter;
-import javax.annotation.Nullable;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
@@ -40,8 +41,7 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.annotation.Nullable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
index 2e755fe1..15871557 100644
--- a/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
+++ b/microsphere-spring-webmvc/src/main/java/io/microsphere/spring/webmvc/util/WebMvcUtils.java
@@ -1,6 +1,10 @@
 package io.microsphere.spring.webmvc.util;
 
 import io.microsphere.spring.web.servlet.util.WebUtils;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.MethodParameter;
@@ -8,7 +12,6 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -30,10 +33,6 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.support.RequestContextUtils;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,8 +42,11 @@
 import java.util.List;
 import java.util.Set;
 
+import static org.springframework.util.Assert.notNull;
 import static org.springframework.util.ReflectionUtils.findMethod;
 import static org.springframework.util.ReflectionUtils.invokeMethod;
+import static org.springframework.util.StringUtils.hasLength;
+import static org.springframework.util.StringUtils.hasText;
 import static org.springframework.web.context.ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM;
 import static org.springframework.web.context.ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM;
 
@@ -350,7 +352,7 @@ public static WebApplicationContext getWebApplicationContext(HttpServletRequest
 
     protected static String appendInitParameter(String existedParameterValue, String... parameterValues) {
 
-        String[] existedParameterValues = StringUtils.hasLength(existedParameterValue) ?
+        String[] existedParameterValues = hasLength(existedParameterValue) ?
                 existedParameterValue.split(INIT_PARAM_DELIMITERS) :
                 new String[0];
 
@@ -376,15 +378,14 @@ protected static String appendInitParameter(String existedParameterValue, String
      */
     public static void appendInitParameters(ServletContext servletContext, String parameterName, String... parameterValues) {
 
-        notNull(servletContext);
-        hasLength(parameterName);
-        notNull(parameterValues);
+        notNull(servletContext, "The argument 'servletContext' must not be null!");
+        notNull(parameterValues, "The argument 'parameterValues' must not be null!");
 
         String existedParameterValue = servletContext.getInitParameter(parameterName);
 
         String newParameterValue = appendInitParameter(existedParameterValue, parameterValues);
 
-        if (StringUtils.hasLength(newParameterValue)) {
+        if (hasLength(newParameterValue)) {
             servletContext.setInitParameter(parameterName, newParameterValue);
         }
 
@@ -453,17 +454,11 @@ public static void appendFrameworkServletContextInitializerClassInitParameter(
      * @return If current request is for page render , return <code>true</code> , or <code>false</code>.
      */
     public static boolean isPageRenderRequest(ModelAndView modelAndView) {
-
         if (modelAndView != null) {
-
             String viewName = modelAndView.getViewName();
-
-            return StringUtils.hasText(viewName);
-
+            return hasText(viewName);
         }
-
         return false;
-
     }
 
     private static String getHandlerMethodRequestBodyArgumentAttributeName(Method method) {
diff --git a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
index 61d3325e..36808374 100644
--- a/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
+++ b/microsphere-spring-webmvc/src/test/java/io/microsphere/spring/webmvc/interceptor/IdempotentAnnotatedMethodHandlerInterceptor.java
@@ -19,14 +19,14 @@
 import io.microsphere.spring.web.event.HandlerMethodArgumentsResolvedEvent;
 import io.microsphere.spring.webmvc.IdempotentException;
 import io.microsphere.spring.webmvc.annotation.Idempotent;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.context.ApplicationListener;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.HandlerMethod;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
diff --git a/pom.xml b/pom.xml
index 603e3413..8d450cd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.0.4-SNAPSHOT</revision>
+        <revision>2.0.0-SNAPSHOT</revision>
         <java.version>17</java.version>
     </properties>
 

From fb329668911d16fa092a50ffd1f9076b454c11ac Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 2 Jan 2025 22:04:57 +0800
Subject: [PATCH 157/157] Change the github workflows files

---
 .github/workflows/maven-build.yml   | 13 ++++++-------
 .github/workflows/maven-publish.yml |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 3a77688e..327c5a58 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -10,19 +10,18 @@ name: Maven Build
 
 on:
   push:
-    branches: [ 'dev-1.x' ]
+    branches: [ 'dev' ]
   pull_request:
-    branches: [ 'release-1.x' ]
+    branches: [ 'release' ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' , '17' , '21' ]
-        maven-profile-spring-boot: [
-          'spring-framework-5.3' , 'spring-framework-5.2', 'spring-framework-5.1' , 'spring-framework-5.0' ,
-          'spring-framework-4.3'
+        java: [ '17' , '21' ]
+        maven-profile-spring-framework: [
+          'spring-framework-6.0' , 'spring-framework-6.1', 'spring-framework-6.2'
         ]
     steps:
       - name: Checkout Source
@@ -42,7 +41,7 @@ jobs:
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
           test
-          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-boot }}
+          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-framework }}
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 0a0e69e9..90cba196 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -10,13 +10,13 @@ name: Maven Publish
 
 on:
   push:
-    branches: [ 'release-1.x' ]
+    branches: [ 'release' ]
   workflow_dispatch:
     inputs:
       revision:
         description: 'The version to publish'
         required: true
-        default: '0.0.1-SNAPSHOT'
+        default: '2.0.0-SNAPSHOT'
 
 jobs:
   build:
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Maven Central Repository
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME