Merge pull request #134 from microsphere-projects/dev

Release 0.2.4

Author: mercyblitz

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.3              |
-| **0.1.x**    | Compatible with Spring Framework 4.3.x - 5.3.x | 0.1.3              |
+| **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              |
 
 Then add the specific modules you need:
 

microsphere-spring-parent/pom.xml

@@ -26,7 +26,7 @@
         <snakeyaml.version>2.3</snakeyaml.version>
         <slf4j.version>2.0.16</slf4j.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <logback.version>1.5.15</logback.version>
+        <logback.version>1.5.19</logback.version>
         <junit.version>5.11.4</junit.version>
         <mockito.version>5.14.2</mockito.version>
         <jsonassert.version>1.5.3</jsonassert.version>
@@ -252,8 +252,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <spring.version>6.2.11</spring.version>
-                <reactor.version>2024.0.10</reactor.version>
+                <spring.version>6.2.12</spring.version>
+                <reactor.version>2024.0.11</reactor.version>
             </properties>
         </profile>
     </profiles>

microsphere-spring-web/src/main/java/io/microsphere/spring/web/metadata/WebEndpointMapping.java

@@ -1362,7 +1362,8 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         WebEndpointMapping that = (WebEndpointMapping) o;
-        return this.negated == that.negated
+        return this.kind == that.kind
+                && this.negated == that.negated
                 && arrayEquals(patterns, that.patterns)
                 && arrayEquals(methods, that.methods)
                 && arrayEquals(params, that.params)
@@ -1418,6 +1419,7 @@ public String toString() {
     public String toJSON() {
         StringBuilder stringBuilder = new StringBuilder(LEFT_CURLY_BRACE).append(LINE_SEPARATOR);
         append(stringBuilder, "id", this.id);
+        append(stringBuilder, "kind", this.kind, COMMA, LINE_SEPARATOR);
         append(stringBuilder, "negated", this.negated, COMMA, LINE_SEPARATOR);
         append(stringBuilder, "patterns", this.patterns, COMMA, LINE_SEPARATOR);
         append(stringBuilder, "methods", this.methods, COMMA, LINE_SEPARATOR);
@@ -1438,6 +1440,11 @@ private void append(StringBuilder appendable, String name, boolean value, String
         JSONUtils.append(appendable, name, value);
     }
 
+    private void append(StringBuilder appendable, String name, Kind kind, String... prefixes) {
+        append(prefixes, appendable);
+        JSONUtils.append(appendable, name, kind);
+    }
+
     private void append(StringBuilder appendable, String name, String[] values, String... prefixes) {
         if (isEmpty(values)) {
             return;
@@ -1451,4 +1458,4 @@ private void append(String[] values, StringBuilder appendable) {
             appendable.append(values[i]);
         }
     }
-}
+}

microsphere-spring-web/src/test/java/io/microsphere/spring/web/metadata/WebEndpointMappingTest.java

@@ -519,6 +519,9 @@ void testEquals() {
         assertNotEquals(mapping, null);
         assertNotEquals(mapping, this);
 
+        // equals with different kinds
+        assertNotEquals(mapping, minBuilder(FILTER).build());
+
         // equals with different patterns
         assertNotEquals(mapping, minServletBuilder().pattern("/**").build());
 

microsphere-spring-web/src/test/resources/META-INF/web-mapping-descriptor.json

@@ -1,5 +1,6 @@
 {
 "id":1,
+"kind":"CUSTOMIZED",
 "negated":true,
 "patterns":["/a","/b","/c"],
 "methods":["GET","POST"],

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.microsphere-projects</groupId>
         <artifactId>microsphere-build</artifactId>
-        <version>0.2.1</version>
+        <version>0.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.2.3-SNAPSHOT</revision>
+        <revision>0.2.4-SNAPSHOT</revision>
         <java.version>17</java.version>
     </properties>