Merge pull request #210 from mercyblitz/dev

Dev 0.1.7

Author: mercyblitz

.github/workflows/maven-build.yml

@@ -12,7 +12,7 @@ on:
   push:
     branches: [ "dev" ]
   pull_request:
-    branches: [ "dev" , "main" , "release" ]
+    branches: [ "main" , "dev" , "release" ]
 
 jobs:
   build:

.github/workflows/maven-publish.yml

@@ -21,7 +21,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if:  ${{ inputs.revision }}
+    if: ${{ inputs.revision }}
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -48,6 +48,6 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
-          SIGN_KEY_ID:  ${{ secrets.OSS_SIGNING_KEY_ID_LONG }}
+          SIGN_KEY_ID: ${{ secrets.OSS_SIGNING_KEY_ID_LONG }}
           SIGN_KEY: ${{ secrets.OSS_SIGNING_KEY }}
           SIGN_KEY_PASS: ${{ secrets.OSS_SIGNING_PASSWORD }}

microsphere-java-core/src/main/java/io/microsphere/classloading/MavenArtifactResourceResolver.java

@@ -34,7 +34,7 @@
  * <ul>
  *     <li>The resolver checks if a given resource path matches the pattern of a Maven POM properties file using the
  *     {@link #isArtifactMetadata(String)} method. The pattern is typically:
- *     <code>META-INF/maven/&lt;groupId&gt;/&lt;artifactId&gt;/pom.properties</code>.</li>
+ *     <code>META-INF/maven/<groupId>/<artifactId>/pom.properties</code>.</li>
  *     <li>If a match is found, it reads the properties file via the
  *     {@link #resolve(URL, InputStream, ClassLoader)} method and extracts key metadata: groupId, artifactId, and version.</li>
  *     <li>It then constructs an {@link Artifact} object using these properties and associates it with the original URL.</li>

microsphere-java-core/src/main/java/io/microsphere/collection/AbstractDeque.java

@@ -33,8 +33,8 @@
  *
  * <h3>Example Usage</h3>
  * <pre>{@code
- * public class SimpleDeque&lt;E&gt; extends AbstractDeque&lt;E&gt; {
- *     private final List&lt;E&gt; list = new ArrayList&lt;&gt;();
+ * public class SimpleDeque<E> extends AbstractDeque<E> {
+ *     private final List<E> list = new ArrayList<>();
  *
  *     public void addFirst(E e) {
  *         list.add(0, e);

microsphere-java-core/src/main/java/io/microsphere/collection/UnmodifiableIterator.java

@@ -28,8 +28,8 @@
  *
  * <h3>Example Usage</h3>
  * <pre>
- *   List&lt;String&gt; list = Arrays.asList("one", "two", "three");
- *   Iterator&lt;String&gt; unmodifiableIterator = new UnmodifiableIterator&lt;&gt;(list.iterator());
+ *   List<String> list = Arrays.asList("one", "two", "three");
+ *   Iterator<String> unmodifiableIterator = new UnmodifiableIterator<>(list.iterator());
  *
  *   while (unmodifiableIterator.hasNext()) {
  *       System.out.println(unmodifiableIterator.next());

microsphere-java-core/src/main/java/io/microsphere/io/Serializer.java

@@ -26,7 +26,7 @@
  *
  * <h3>Example Usage</h3>
  * <pre>{@code
- * public class StringSerializer implements Serializer&lt;String&gt; {
+ * public class StringSerializer implements Serializer<String> {
  *     public byte[] serialize(String source) throws IOException {
  *         return source.getBytes(StandardCharsets.UTF_8);
  *     }

microsphere-java-core/src/main/java/io/microsphere/reflect/ExecutableDefinition.java

@@ -38,7 +38,7 @@
  *
  * <h3>Example Usage</h3>
  * <pre>{@code
- * public class MethodDefinition extends ExecutableDefinition&lt;Method&gt; {
+ * public class MethodDefinition extends ExecutableDefinition<Method> {
  *     public MethodDefinition(Version since, String declaredClassName, String name, String... parameterClassNames) {
  *         super(since, null, declaredClassName, name, parameterClassNames);
  *     }

microsphere-java-core/src/main/java/io/microsphere/util/Version.java

@@ -18,26 +18,30 @@
 
 import io.microsphere.annotation.Immutable;
 import io.microsphere.annotation.Nonnull;
+import io.microsphere.annotation.Nullable;
 import io.microsphere.lang.ClassDataRepository;
 
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Objects;
-import java.util.StringTokenizer;
 import java.util.function.BiPredicate;
 
 import static io.microsphere.constants.SymbolConstants.COMMA_CHAR;
 import static io.microsphere.constants.SymbolConstants.DOT;
 import static io.microsphere.constants.SymbolConstants.EQUAL;
 import static io.microsphere.constants.SymbolConstants.GREATER_THAN;
 import static io.microsphere.constants.SymbolConstants.GREATER_THAN_OR_EQUAL_TO;
+import static io.microsphere.constants.SymbolConstants.HYPHEN;
 import static io.microsphere.constants.SymbolConstants.LESS_THAN;
 import static io.microsphere.constants.SymbolConstants.LESS_THAN_OR_EQUAL_TO;
 import static io.microsphere.constants.SymbolConstants.QUOTE_CHAR;
 import static io.microsphere.constants.SymbolConstants.SPACE_CHAR;
+import static io.microsphere.lang.ClassDataRepository.INSTANCE;
 import static io.microsphere.text.FormatUtils.format;
 import static io.microsphere.util.Assert.assertNotBlank;
 import static io.microsphere.util.Assert.assertNotNull;
+import static io.microsphere.util.Assert.assertTrue;
+import static io.microsphere.util.StringUtils.split;
 import static io.microsphere.util.Version.Operator.EQ;
 import static io.microsphere.util.Version.Operator.GE;
 import static io.microsphere.util.Version.Operator.GT;
@@ -51,7 +55,15 @@
  * <p>
  * This class provides methods to compare versions using standard comparison operators such as greater than,
  * less than, and equal to. It also supports parsing version strings in the format "major.minor.patch".
+ * The supported version patterns :
+ * <ul>
+ *     <li>major</li>
+ *     <li>major.minor</li>
+ *     <li>major.minor.patch</li>
+ *     <li>major.minor.patch-preRelease</li>
+ * </ul>
  * </p>
+ * See <a href="https://semver.org/">Semantic Versioning</a> for more details.
  *
  * <h3>Example Usage</h3>
  * <pre>{@code
@@ -76,14 +88,17 @@
 @Immutable
 public class Version implements Comparable<Version>, Serializable {
 
-    private static final long serialVersionUID = -6434504483466016691L;
+    private static final long serialVersionUID = 609463905158722630L;
 
     private final int major;
 
     private final int minor;
 
     private final int patch;
 
+    @Nullable
+    private final String preRelease;
+
     public Version(int major) {
         this(major, 0);
     }
@@ -93,9 +108,18 @@ public Version(int major, int minor) {
     }
 
     public Version(int major, int minor, int patch) {
+        this(major, minor, patch, null);
+    }
+
+    public Version(int major, int minor, int patch, String preRelease) {
+        assertTrue(major >= 0, "The 'major' version must not be a non-negative integer!");
+        assertTrue(minor >= 0, "The 'minor' version must not be a non-negative integer!");
+        assertTrue(patch >= 0, "The 'patch' version must not be a non-negative integer!");
+        assertTrue(major + minor + patch > 0, "The 'major', 'minor' and 'patch' must not be null at the same time!");
         this.major = major;
         this.minor = minor;
         this.patch = patch;
+        this.preRelease = preRelease;
     }
 
     /**
@@ -125,6 +149,16 @@ public int getPatch() {
         return patch;
     }
 
+    /**
+     * The pre-release
+     *
+     * @return pre-release
+     */
+    @Nullable
+    public String getPreRelease() {
+        return preRelease;
+    }
+
     /**
      * Current {@link Version} is greater than that
      *
@@ -251,6 +285,9 @@ public int hashCode() {
         int result = major;
         result = 31 * result + minor;
         result = 31 * result + patch;
+        if (preRelease != null) {
+            result = 31 * result + preRelease.hashCode();
+        }
         return result;
     }
 
@@ -270,17 +307,35 @@ public int compareTo(Version that) {
 
         result = compare(this.patch, that.patch);
 
+        if (result != 0) {
+            return result;
+        }
+
+        result = comparePreRelease(this.preRelease, that.preRelease);
+
         return result;
     }
 
+    /**
+     * Compare pre-release
+     *
+     * @param v1
+     * @param v2
+     * @return
+     */
+    static int comparePreRelease(String v1, String v2) {
+        if (v1 == null) {
+            return v2 == null ? 0 : 1;
+        }
+        if (v2 == null) {
+            return -1;
+        }
+        return v1.compareTo(v2);
+    }
 
     @Override
     public String toString() {
-        return "Version{" +
-                "major=" + major +
-                ", minor=" + minor +
-                ", patch=" + patch +
-                '}';
+        return major + DOT + minor + DOT + patch + (preRelease == null ? "" : "-" + preRelease);
     }
 
     public static Version of(int major) {
@@ -295,6 +350,10 @@ public static Version of(int major, int minor, int patch) {
         return ofVersion(major, minor, patch);
     }
 
+    public static Version of(int major, int minor, int patch, String preRelease) {
+        return ofVersion(major, minor, patch, preRelease);
+    }
+
     public static Version of(String version) {
         return ofVersion(version);
     }
@@ -311,19 +370,27 @@ public static Version ofVersion(int major, int minor, int patch) {
         return new Version(major, minor, patch);
     }
 
+    public static Version ofVersion(int major, int minor, int patch, String preRelease) {
+        return new Version(major, minor, patch, preRelease);
+    }
+
     public static Version ofVersion(String version) {
         assertNotNull(version, () -> "The 'version' argument must not be null!");
         assertNotBlank(version, () -> "The 'version' argument must not be blank!");
 
-        StringTokenizer st = new StringTokenizer(version.trim(), DOT);
+        String[] coreAndPreRelease = split(version.trim(), HYPHEN);
+        String core = coreAndPreRelease[0];
+        String preRelease = coreAndPreRelease.length > 1 ? coreAndPreRelease[1] : null;
 
-        int major = getValue(st);
-        int minor = getValue(st);
-        int patch = getValue(st);
+        String[] majorAndMinorAndPatch = split(core, DOT);
+        int size = majorAndMinorAndPatch.length;
 
-        return of(major, minor, patch);
-    }
+        int major = getValue(majorAndMinorAndPatch[0]);
+        int minor = size > 1 ? getValue(majorAndMinorAndPatch[1]) : 0;
+        int patch = size > 2 ? getValue(majorAndMinorAndPatch[2]) : 0;
 
+        return of(major, minor, patch, preRelease);
+    }
 
     /**
      * Class that exposes the version. Fetches the "Implementation-Version" manifest attribute from the jar file.
@@ -337,21 +404,14 @@ public static Version getVersion(Class<?> targetClass) throws IllegalArgumentExc
         Package targetPackage = targetClass.getPackage();
         String version = targetPackage.getImplementationVersion();
         if (version == null) {
-            ClassDataRepository repository = ClassDataRepository.INSTANCE;
+            ClassDataRepository repository = INSTANCE;
             URL classResource = repository.getCodeSourceLocation(targetClass);
             String errorMessage = format("The 'Implementation-Version' manifest attribute can't be fetched from the jar file[class resource : '{}'] by the target class[name :'{}']", classResource, targetClass.getName());
             throw new IllegalArgumentException(errorMessage);
         }
         return of(version);
     }
 
-    static int getValue(StringTokenizer st) {
-        if (st.hasMoreTokens()) {
-            return getValue(st.nextToken());
-        }
-        return 0;
-    }
-
     static int getValue(String part) {
         final int value;
         try {
@@ -373,10 +433,10 @@ public boolean test(Version v1, Version v2) {
                 if (v1 == v2) {
                     return true;
                 }
-                if (v2 == null) return false;
-                if (v1.major != v2.major) return false;
-                if (v1.minor != v2.minor) return false;
-                return v1.patch == v2.patch;
+                if (v1 == null || v2 == null) {
+                    return false;
+                }
+                return v1.compareTo(v2) == 0;
             }
         },
 
@@ -389,7 +449,9 @@ public boolean test(Version v1, Version v2) {
                 if (v1 == v2) {
                     return false;
                 }
-                if (v2 == null) return false;
+                if (v1 == null || v2 == null) {
+                    return false;
+                }
                 return v1.compareTo(v2) < 0;
             }
         },
@@ -403,7 +465,9 @@ public boolean test(Version v1, Version v2) {
                 if (v1 == v2) {
                     return true;
                 }
-                if (v2 == null) return false;
+                if (v1 == null || v2 == null) {
+                    return false;
+                }
                 return v1.compareTo(v2) <= 0;
             }
         },
@@ -417,7 +481,9 @@ public boolean test(Version v1, Version v2) {
                 if (v1 == v2) {
                     return false;
                 }
-                if (v2 == null) return false;
+                if (v1 == null || v2 == null) {
+                    return false;
+                }
                 return v1.compareTo(v2) > 0;
             }
         },
@@ -431,7 +497,9 @@ public boolean test(Version v1, Version v2) {
                 if (v1 == v2) {
                     return true;
                 }
-                if (v2 == null) return false;
+                if (v1 == null || v2 == null) {
+                    return false;
+                }
                 return v1.compareTo(v2) >= 0;
             }
         };
@@ -473,6 +541,5 @@ public static Operator of(String symbol) {
 
             throw new IllegalArgumentException(messageBuilder.toString());
         }
-
     }
-}
+}

microsphere-java-core/src/test/java/io/microsphere/reflect/generics/ParameterizedTypeImplTest.java

@@ -28,12 +28,12 @@ class ParameterizedTypeImplTest {
     private static Type[] actualTypeArguments = new Type[]{String.class, Integer.class};
 
     /**
-     * The top-level type : Map<String,Integer>
+     * The top-level type : Map<String,Integer>
      */
     private ParameterizedTypeImpl topLevelType;
 
     /**
-     * The nested type : Map.Entry&lt;String,Integer&gt;
+     * The nested type : Map.Entry<String,Integer>
      */
     private ParameterizedTypeImpl nestedType;