chore: merge main into release [skip ci]

Author: github-actions[bot]

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

@@ -6,17 +6,21 @@
 import io.microsphere.lang.Prioritized;
 import io.microsphere.logging.Logger;
 
+import java.io.File;
 import java.net.URL;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import static io.microsphere.collection.CollectionUtils.isEmpty;
+import static io.microsphere.collection.CollectionUtils.size;
+import static io.microsphere.collection.ListUtils.newArrayList;
+import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.logging.LoggerFactory.getLogger;
+import static io.microsphere.net.URLUtils.resolveArchiveFile;
 import static io.microsphere.util.ClassLoaderUtils.findAllClassPathURLs;
 import static io.microsphere.util.ClassLoaderUtils.getClassLoader;
+import static io.microsphere.util.ClassLoaderUtils.getClassResource;
 import static io.microsphere.util.ClassPathUtils.getBootstrapClassPaths;
 import static io.microsphere.util.ServiceLoaderUtils.loadServicesList;
 import static io.microsphere.util.SystemUtils.JAVA_HOME;
@@ -108,25 +112,46 @@ public List<Artifact> detect(boolean includedJdkLibraries) {
 
     @Nonnull
     @Immutable
-    protected List<Artifact> detect(Set<URL> classPathURLs) {
-        if (isEmpty(classPathURLs)) {
+    public List<Artifact> detect(@Nullable Set<URL> resourceURLs) {
+        int size = size(resourceURLs);
+        if (size < 1) {
             return emptyList();
         }
-
-        List<Artifact> artifactList = new LinkedList<>();
-        for (URL resourceURL : classPathURLs) {
-            for (ArtifactResourceResolver artifactResourceResolver : artifactResourceResolvers) {
-                Artifact artifact = artifactResourceResolver.resolve(resourceURL);
-                if (artifact != null) {
-                    artifactList.add(artifact);
-                    break;
-                }
+        List<Artifact> artifactList = newArrayList(size);
+        for (URL resourceURL : resourceURLs) {
+            Artifact artifact = detect(resourceURL);
+            if (artifact != null) {
+                artifactList.add(artifact);
+                break;
             }
         }
-
         return unmodifiableList(artifactList);
     }
 
+    @Nullable
+    public Artifact detect(@Nonnull Class<?> classInResource) {
+        URL classResource = getClassResource(classInResource);
+        return detect(classResource);
+    }
+
+    @Nullable
+    public Artifact detect(@Nonnull URL resourceURL) {
+        File archiveFile = resolveArchiveFile(resourceURL);
+        if (archiveFile == null) {
+            return null;
+        }
+        URL classPathURL = execute(archiveFile.toURI()::toURL);
+        Artifact artifact = null;
+        for (ArtifactResourceResolver artifactResourceResolver : artifactResourceResolvers) {
+            artifact = artifactResourceResolver.resolve(classPathURL);
+            if (artifact != null) {
+                break;
+            }
+        }
+        return artifact;
+    }
+
+
     protected Set<URL> getClassPathURLs(boolean includedJdkLibraries) {
         Set<URL> urls = findAllClassPathURLs(classLoader);
         Set<URL> classPathURLs = new LinkedHashSet<>(urls);

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

@@ -19,6 +19,8 @@
 import io.microsphere.annotation.Immutable;
 import io.microsphere.annotation.Nonnull;
 import io.microsphere.annotation.Nullable;
+import io.microsphere.classloading.Artifact;
+import io.microsphere.classloading.ArtifactDetector;
 
 import java.io.Serializable;
 import java.net.URL;
@@ -108,7 +110,6 @@ public class Version implements Comparable<Version>, Serializable {
      * }</pre>
      *
      * @param major the major version number
-     * @since 1.0.0
      */
     public Version(int major) {
         this(major, 0);
@@ -125,7 +126,6 @@ public Version(int major) {
      *
      * @param major the major version number
      * @param minor the minor version number
-     * @since 1.0.0
      */
     public Version(int major, int minor) {
         this(major, minor, 0);
@@ -142,7 +142,6 @@ public Version(int major, int minor) {
      * @param major the major version number
      * @param minor the minor version number
      * @param patch the patch version number
-     * @since 1.0.0
      */
     public Version(int major, int minor, int patch) {
         this(major, minor, patch, null);
@@ -161,7 +160,6 @@ public Version(int major, int minor, int patch) {
      * @param patch      the patch version number (must be non-negative)
      * @param preRelease the optional pre-release identifier (e.g., "SNAPSHOT", "alpha")
      * @throws IllegalArgumentException if major, minor, or patch is negative, or all are zero
-     * @since 1.0.0
      */
     public Version(int major, int minor, int patch, String preRelease) {
         assertTrue(major >= 0, "The 'major' version must not be a non-negative integer!");
@@ -342,7 +340,6 @@ public boolean equals(Object o) {
      * }</pre>
      *
      * @return a hash code value for this version
-     * @since 1.0.0
      */
     @Override
     public int hashCode() {
@@ -368,8 +365,7 @@ public int hashCode() {
      *
      * @param that the version to compare against
      * @return a negative integer, zero, or a positive integer as this version
-     *         is less than, equal to, or greater than the specified version
-     * @since 1.0.0
+     * is less than, equal to, or greater than the specified version
      */
     @Override
     public int compareTo(Version that) {
@@ -424,7 +420,6 @@ static int comparePreRelease(String v1, String v2) {
      * }</pre>
      *
      * @return the version string
-     * @since 1.0.0
      */
     @Override
     public String toString() {
@@ -441,7 +436,6 @@ public String toString() {
      *
      * @param major the major version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version of(int major) {
         return ofVersion(major);
@@ -458,7 +452,6 @@ public static Version of(int major) {
      * @param major the major version number
      * @param minor the minor version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version of(int major, int minor) {
         return ofVersion(major, minor);
@@ -476,7 +469,6 @@ public static Version of(int major, int minor) {
      * @param minor the minor version number
      * @param patch the patch version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version of(int major, int minor, int patch) {
         return ofVersion(major, minor, patch);
@@ -495,7 +487,6 @@ public static Version of(int major, int minor, int patch) {
      * @param patch      the patch version number
      * @param preRelease the pre-release identifier
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version of(int major, int minor, int patch, String preRelease) {
         return ofVersion(major, minor, patch, preRelease);
@@ -514,7 +505,6 @@ public static Version of(int major, int minor, int patch, String preRelease) {
      * @param version the version string to parse
      * @return a new {@link Version} instance
      * @throws IllegalArgumentException if the version string is null, blank, or invalid
-     * @since 1.0.0
      */
     public static Version of(String version) {
         return ofVersion(version);
@@ -530,7 +520,6 @@ public static Version of(String version) {
      *
      * @param major the major version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version ofVersion(int major) {
         return new Version(major);
@@ -547,7 +536,6 @@ public static Version ofVersion(int major) {
      * @param major the major version number
      * @param minor the minor version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version ofVersion(int major, int minor) {
         return new Version(major, minor);
@@ -565,7 +553,6 @@ public static Version ofVersion(int major, int minor) {
      * @param minor the minor version number
      * @param patch the patch version number
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version ofVersion(int major, int minor, int patch) {
         return new Version(major, minor, patch);
@@ -584,7 +571,6 @@ public static Version ofVersion(int major, int minor, int patch) {
      * @param patch      the patch version number
      * @param preRelease the pre-release identifier
      * @return a new {@link Version} instance
-     * @since 1.0.0
      */
     public static Version ofVersion(int major, int minor, int patch, String preRelease) {
         return new Version(major, minor, patch, preRelease);
@@ -604,7 +590,6 @@ public static Version ofVersion(int major, int minor, int patch, String preRelea
      * @param version the version string to parse
      * @return a new {@link Version} instance
      * @throws IllegalArgumentException if the version string is null, blank, or contains non-numeric parts
-     * @since 1.0.0
      */
     public static Version ofVersion(String version) {
         assertNotNull(version, () -> "The 'version' argument must not be null!");
@@ -624,6 +609,27 @@ public static Version ofVersion(String version) {
         return of(major, minor, patch, preRelease);
     }
 
+    /**
+     * Creates a {@link Version} by detecting the version from the artifact containing the specified class.
+     * This method uses {@link ArtifactDetector} to locate the artifact and retrieve its version.
+     *
+     * <h3>Example Usage</h3>
+     * <pre>{@code
+     *   Version version = Version.ofVersion(MyClass.class); // e.g., 1.0.0
+     * }</pre>
+     *
+     * @param classInResource the class contained in the artifact whose version is to be detected
+     * @return a new {@link Version} instance
+     */
+    public static Version ofVersion(@Nonnull Class<?> classInResource) {
+        assertNotNull(classInResource, () -> "The 'classInResource' argument must not be null!");
+        ClassLoader classLoader = classInResource.getClassLoader();
+        ArtifactDetector detector = new ArtifactDetector(classLoader);
+        Artifact artifact = detector.detect(classInResource);
+        String version = artifact.getVersion();
+        return ofVersion(version);
+    }
+
     /**
      * Class that exposes the version. Fetches the "Implementation-Version" manifest attribute from the jar file.
      *

microsphere-java-core/src/test/java/io/microsphere/classloading/ArtifactDetectorTest.java

@@ -20,11 +20,19 @@
 import io.microsphere.LoggingTest;
 import org.junit.jupiter.api.Test;
 
+import javax.annotation.Nonnull;
+import java.net.URL;
 import java.util.List;
 
+import static io.microsphere.AbstractTestCase.TEST_NULL_SET;
+import static io.microsphere.collection.Sets.ofSet;
+import static io.microsphere.net.URLUtils.ofURL;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
 import static java.util.Collections.emptySet;
+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.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -43,16 +51,41 @@ void testDetect() {
         assertNotNull(artifacts);
     }
 
+    @Test
+    void testDetectOnClassInResource() {
+        ArtifactDetector instance = new ArtifactDetector();
+        assertThrows(NullPointerException.class, () -> instance.detect((Class) null));
+
+        Artifact artifact = instance.detect(ArtifactDetector.class);
+        assertNull(artifact);
+
+        artifact = instance.detect(Nonnull.class);
+        assertNotNull(artifact);
+        assertEquals("jsr305", artifact.getArtifactId());
+        assertEquals("3.0.2", artifact.getVersion());
+    }
+
+    @Test
+    void testDetectOnResourceURL() {
+        ArtifactDetector instance = new ArtifactDetector();
+        assertThrows(NullPointerException.class, () -> instance.detect((URL) null));
+
+        URL url = ofURL("file:///not-found");
+        Artifact artifact = instance.detect(url);
+        assertNull(artifact);
+    }
+
     @Test
     void testDetectOnNullSet() {
         ArtifactDetector instance = new ArtifactDetector(getDefaultClassLoader());
-        assertTrue(instance.detect(null).isEmpty());
+        assertTrue(instance.detect(TEST_NULL_SET).isEmpty());
     }
 
     @Test
     void testDetectOnEmptySet() {
         ArtifactDetector instance = new ArtifactDetector(null);
         assertTrue(instance.detect(emptySet()).isEmpty());
+        assertTrue(instance.detect(ofSet(ofURL("file:///not-found"))).isEmpty());
     }
 
     @Test

microsphere-java-core/src/test/java/io/microsphere/util/VersionTest.java

@@ -18,6 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import javax.annotation.Nullable;
+
 import static io.microsphere.constants.SymbolConstants.DOT;
 import static io.microsphere.constants.SymbolConstants.HYPHEN;
 import static io.microsphere.constants.SymbolConstants.SPACE;
@@ -117,6 +119,12 @@ void testOfWithVersion() {
         assertEquals(PATCH, version.getPatch());
     }
 
+    @Test
+    void testOfVersionOnClassInResource() {
+        Version version = ofVersion(Nullable.class);
+        assertEquals("3.0.2", version.toString());
+    }
+
     @Test
     void testOfOnNullPointException() {
         assertThrows(IllegalArgumentException.class, () -> of(null));