chore: merge main into release [skip ci]

Author: github-actions[bot]

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

@@ -6,7 +6,6 @@
 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;
@@ -15,9 +14,7 @@
 
 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;
@@ -52,9 +49,9 @@
  *
  * <pre>{@code
  * public class CustomArtifactResolver implements ArtifactResourceResolver {
- *     public Artifact resolve(URL resourceURL) {
- *         if (resourceURL.getProtocol().equals("file")) {
- *             return new FileArtifact(resourceURL); // hypothetical custom artifact
+ *     public Artifact resolve(URL classPathURL) {
+ *         if (classPathURL.getProtocol().equals("file")) {
+ *             return new FileArtifact(classPathURL); // hypothetical custom artifact
  *         }
  *         return null;
  *     }
@@ -112,14 +109,14 @@ public List<Artifact> detect(boolean includedJdkLibraries) {
 
     @Nonnull
     @Immutable
-    public List<Artifact> detect(@Nullable Set<URL> resourceURLs) {
-        int size = size(resourceURLs);
+    public List<Artifact> detect(@Nullable Set<URL> classPathURLs) {
+        int size = size(classPathURLs);
         if (size < 1) {
             return emptyList();
         }
         List<Artifact> artifactList = newArrayList(size);
-        for (URL resourceURL : resourceURLs) {
-            Artifact artifact = detect(resourceURL);
+        for (URL classPathURL : classPathURLs) {
+            Artifact artifact = detect(classPathURL);
             if (artifact != null) {
                 artifactList.add(artifact);
                 break;
@@ -135,15 +132,7 @@ public Artifact detect(@Nonnull Class<?> classInResource) {
     }
 
     @Nullable
-    public Artifact detect(@Nonnull URL resourceURL) {
-        File archiveFile = resolveArchiveFile(resourceURL);
-        if (archiveFile == null) {
-            if (logger.isTraceEnabled()) {
-                logger.trace("The URL[{}] is not an archive file, no artifact was found!", resourceURL);
-            }
-            return null;
-        }
-        URL classPathURL = execute(archiveFile.toURI()::toURL);
+    public Artifact detect(@Nonnull URL classPathURL) {
         Artifact artifact = null;
         for (ArtifactResourceResolver artifactResourceResolver : artifactResourceResolvers) {
             artifact = artifactResourceResolver.resolve(classPathURL);

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

@@ -48,6 +48,7 @@
 import static io.microsphere.util.Version.Operator.GT;
 import static io.microsphere.util.Version.Operator.LE;
 import static io.microsphere.util.Version.Operator.LT;
+import static io.microsphere.util.VersionUtils.CURRENT_JAVA_VERSION;
 import static java.lang.Integer.compare;
 import static java.lang.Integer.parseInt;
 
@@ -620,12 +621,20 @@ public static Version ofVersion(String version) {
      *
      * @param classInResource the class contained in the artifact whose version is to be detected
      * @return a new {@link Version} instance
+     * @throws IllegalArgumentException if the version can't be resolved
      */
     public static Version ofVersion(@Nonnull Class<?> classInResource) {
         assertNotNull(classInResource, () -> "The 'classInResource' argument must not be null!");
         ClassLoader classLoader = classInResource.getClassLoader();
+        if (classLoader == null) { // Bootstrap ClassLoader
+            return CURRENT_JAVA_VERSION;
+        }
         ArtifactDetector detector = new ArtifactDetector(classLoader);
         Artifact artifact = detector.detect(classInResource);
+        if (artifact == null) {
+            String errorMessage = format("The version can't be resolved by the {}", classInResource);
+            throw new IllegalArgumentException(errorMessage);
+        }
         String version = artifact.getVersion();
         return ofVersion(version);
     }

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

@@ -68,8 +68,7 @@ void testDetectOnClassInResource() {
     @Test
     void testDetectOnResourceURL() {
         ArtifactDetector instance = new ArtifactDetector();
-        assertThrows(NullPointerException.class, () -> instance.detect((URL) null));
-
+        assertNull(instance.detect((URL) null));
         URL url = ofURL("file:///not-found");
         Artifact artifact = instance.detect(url);
         assertNull(artifact);

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

@@ -32,9 +32,11 @@
 import static io.microsphere.util.Version.getVersion;
 import static io.microsphere.util.Version.of;
 import static io.microsphere.util.Version.ofVersion;
+import static io.microsphere.util.VersionUtils.CURRENT_JAVA_VERSION;
 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.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -123,6 +125,15 @@ void testOfWithVersion() {
     void testOfVersionOnClassInResource() {
         Version version = ofVersion(Nullable.class);
         assertEquals("3.0.2", version.toString());
+
+        // The Class loaded by Bootstrap ClassLoader
+        version = ofVersion(String.class);
+        assertSame(CURRENT_JAVA_VERSION, version);
+    }
+
+    @Test
+    void testOfVersionOnIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class, () -> ofVersion(Version.class));
     }
 
     @Test