Release 0.2.5

.github/workflows/maven-build.yml

@@ -21,7 +21,8 @@ jobs:
       matrix:
         java: [ '17' , '21' , '25' ]
         maven-profile-spring-framework: [
-          'spring-framework-6.0' , 'spring-framework-6.1', 'spring-framework-6.2'
+          'spring-framework-6.0' , 'spring-framework-6.1', 'spring-framework-6.2',
+          'spring-framework-7.0'
         ]
     steps:
       - name: Checkout Source

README.md

@@ -65,8 +65,8 @@ The easiest way to get started is by adding the Microsphere Spring BOM (Bill of
 
 | **Branches** | **Purpose**                                    | **Latest Version** |
 |--------------|------------------------------------------------|--------------------|
-| **0.2.x**    | Compatible with Spring Framework 6.0.x - 6.2.x | 0.2.4              |
-| **0.1.x**    | Compatible with Spring Framework 4.3.x - 5.3.x | 0.1.4              |
+| **0.2.x**    | Compatible with Spring Framework 6.0.x - 6.2.x | 0.2.5              |
+| **0.1.x**    | Compatible with Spring Framework 4.3.x - 5.3.x | 0.1.5              |
 
 Then add the specific modules you need:
 

microsphere-spring-context/src/main/java/io/microsphere/spring/core/SpringVersion.java

@@ -156,6 +156,12 @@ public enum SpringVersion {
 
     SPRING_6_2_11,
 
+    SPRING_6_2_12,
+
+    SPRING_7_0,
+
+    SPRING_7_0_0,
+
     CURRENT(of(org.springframework.core.SpringVersion.getVersion()));
 
     private final Version version;

microsphere-spring-context/src/main/java/io/microsphere/spring/util/MimeTypeUtils.java

@@ -21,8 +21,11 @@
 import org.springframework.util.MimeType;
 
 import java.util.Collection;
+import java.util.Comparator;
 
 import static io.microsphere.collection.CollectionUtils.isEmpty;
+import static io.microsphere.util.StringUtils.EMPTY_STRING;
+import static io.microsphere.util.StringUtils.substringAfter;
 
 /**
  * The utility class for MIME Type
@@ -101,14 +104,43 @@ public static String getSubtypeSuffix(MimeType one) {
             return null;
         }
         String subtype = one.getSubtype();
-        int suffixIndex = subtype.lastIndexOf('+');
-        if (suffixIndex != -1 && subtype.length() > suffixIndex) {
-            return subtype.substring(suffixIndex + 1);
+        String suffix = substringAfter(subtype, "+");
+        return EMPTY_STRING.equals(suffix) ? null : suffix;
+    }
+
+    /**
+     * A {@link Comparator} for {@link MimeType} that orders by specificity.
+     */
+    public static class SpecificityComparator<T extends MimeType> implements Comparator<T> {
+
+        @Override
+        public int compare(T mimeType1, T mimeType2) {
+            if (mimeType1.isWildcardType() && !mimeType2.isWildcardType()) {  // */* < audio/*
+                return 1;
+            } else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
+                return -1;
+            } else if (!mimeType1.getType().equals(mimeType2.getType())) {  // audio/basic == text/html
+                return 0;
+            } else {  // mediaType1.getType().equals(mediaType2.getType())
+                if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
+                    return 1;
+                } else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
+                    return -1;
+                } else if (!mimeType1.getSubtype().equals(mimeType2.getSubtype())) {  // audio/basic == audio/wave
+                    return 0;
+                } else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
+                    return compareParameters(mimeType1, mimeType2);
+                }
+            }
+        }
+
+        protected int compareParameters(T mimeType1, T mimeType2) {
+            int paramsSize1 = mimeType1.getParameters().size();
+            int paramsSize2 = mimeType2.getParameters().size();
+            return Integer.compare(paramsSize2, paramsSize1);  // audio/basic;level=1 < audio/basic
         }
-        return null;
     }
 
     private MimeTypeUtils() {
     }
-
 }

microsphere-spring-context/src/test/java/io/microsphere/spring/beans/factory/BeanFactoryUtilsTest.java

@@ -28,6 +28,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Component;
@@ -215,6 +216,10 @@ public <T> ObjectProvider<T> getBeanProvider(ResolvableType requiredType) {
                 return null;
             }
 
+            public <T> ObjectProvider<T> getBeanProvider(ParameterizedTypeReference<T> requiredType) {
+                return null;
+            }
+
             public boolean containsBean(String name) {
                 return false;
             }

microsphere-spring-context/src/test/java/io/microsphere/spring/core/SpringVersionTest.java

@@ -40,6 +40,8 @@ void testVersionRange() {
         testVersionRange(SpringVersion.SPRING_6_1, 0, 21);
         // Spring Framework 6.2 -> [6.2.0, 6.2.1]
         testVersionRange(SpringVersion.SPRING_6_2, 0, 10);
+        // Spring Framework 7.0 -> [7.0.0, 7.0.0]
+        testVersionRange(SpringVersion.SPRING_7_0, 0, 0);
     }
 
     private void testVersionRange(SpringVersion baseVersion, int start, int end) {
@@ -64,4 +66,4 @@ void testGetVersion() {
             assertTrue(springVersion.getVersion().eq(version));
         }
     }
-}
+}

microsphere-spring-context/src/test/java/io/microsphere/spring/util/MimeTypeUtilsTest.java

@@ -16,6 +16,7 @@
  */
 package io.microsphere.spring.util;
 
+import io.microsphere.spring.util.MimeTypeUtils.SpecificityComparator;
 import org.junit.jupiter.api.Test;
 import org.springframework.util.MimeType;
 
@@ -31,6 +32,7 @@
 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.util.MimeType.valueOf;
 
 /**
  * {@link MimeTypeUtils} Test
@@ -78,4 +80,38 @@ void testIsPresentIn() {
         assertTrue(isPresentIn(APPLICATION_GRAPHQL, asList(APPLICATION_TEXT, APPLICATION_GRAPHQL)));
         assertTrue(isPresentIn(APPLICATION_GRAPHQL, ofList(APPLICATION_GRAPHQL)));
     }
+
+    @Test
+    void testSpecificityComparator() {
+        SpecificityComparator<MimeType> comparator = new SpecificityComparator<>();
+
+        MimeType allTypes = valueOf("*/*");
+        MimeType audioType = valueOf("audio/*");
+        assertEquals(1, comparator.compare(allTypes, audioType));
+        assertEquals(0, comparator.compare(allTypes, allTypes));
+        assertEquals(-1, comparator.compare(audioType, allTypes));
+        assertEquals(0, comparator.compare(audioType, audioType));
+
+        MimeType audioWildcard = valueOf("audio/*");
+        MimeType audioBasic = valueOf("audio/basic");
+        MimeType audioWave = valueOf("audio/wave");
+        assertEquals(1, comparator.compare(audioWildcard, audioBasic));
+        assertEquals(-1, comparator.compare(audioBasic, audioWildcard));
+        assertEquals(0, comparator.compare(audioBasic, audioWave));
+
+        MimeType withParams = valueOf("audio/basic;level=1;charset=utf-8");
+        MimeType withoutParams = valueOf("audio/basic");
+        assertEquals(-1, comparator.compare(withParams, withoutParams));
+        assertEquals(1, comparator.compare(withoutParams, withParams));
+
+        audioType = valueOf("audio/basic");
+        MimeType textType = valueOf("text/html");
+        assertEquals(0, comparator.compare(audioType, textType));
+        assertEquals(0, comparator.compare(textType, audioType));
+
+        MimeType withOneParam = MimeType.valueOf("application/json;version=1");
+        MimeType withTwoParams = MimeType.valueOf("application/json;version=1;charset=utf-8");
+        assertEquals(1, comparator.compare(withOneParam, withTwoParams));
+        assertEquals(-1, comparator.compare(withTwoParams, withOneParam));
+    }
 }

microsphere-spring-parent/pom.xml

@@ -19,7 +19,7 @@
     <description>Microsphere Spring Parent</description>
 
     <properties>
-        <microsphere-java.version>0.1.6</microsphere-java.version>
+        <microsphere-java.version>0.1.7</microsphere-java.version>
         <servlet-api.version>6.1.0</servlet-api.version>
         <websocket-api.version>2.2.0</websocket-api.version>
         <jackson.version>2.18.2</jackson.version>
@@ -32,11 +32,19 @@
         <jsonassert.version>1.5.3</jsonassert.version>
         <sqlite-jdbc.version>3.41.2.2</sqlite-jdbc.version>
         <hamcrest.version>3.0</hamcrest.version>
-        <tomcat.version>10.1.46</tomcat.version>
+        <tomcat.version>10.1.47</tomcat.version>
         <zookeeper.version>3.9.4</zookeeper.version>
         <curator.version>5.9.0</curator.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Portfolio Milestone Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
     <dependencyManagement>
         <dependencies>
 
@@ -256,6 +264,15 @@
                 <reactor.version>2024.0.11</reactor.version>
             </properties>
         </profile>
+
+        <profile>
+            <id>spring-framework-7.0</id>
+            <properties>
+                <spring.version>7.0.0-RC3</spring.version>
+                <reactor.version>2025.0.0-RC1</reactor.version>
+                <junit.version>6.0.1</junit.version>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

microsphere-spring-test/pom.xml

@@ -129,38 +129,45 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jasper</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-tribes</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina-ha</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- Apache Zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- Apache Curator -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>