Merge pull request #9 from dmlloyd/improvements

Small improvements

Author: dmlloyd

src/main/java/io/smallrye/modules/ModuleClassLoader.java

@@ -206,15 +206,15 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
         if (name.startsWith("[")) {
             return loadClassFromDescriptor(name, 0);
         }
-        String dotName = name.replace('/', '.');
-        String packageName = Util.packageName(dotName);
+        String binaryName = name.replace('/', '.');
+        String packageName = Util.packageName(binaryName);
         if (packageName.isEmpty() || linkNew().packages().containsKey(packageName)) {
             // force full linkage
             linkPackages();
             return loadClassDirect(name);
         }
         if (bootModuleIndex.containsKey(packageName)) {
-            if (dotName.equals("java.util.ServiceLoader")) {
+            if (binaryName.equals("java.util.ServiceLoader")) {
                 // loading services! extra linking required
                 linkUses();
             }
@@ -224,7 +224,7 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
                 throw new ClassNotFoundException("Cannot load " + name + ": package " + packageName + " not exported from "
                         + module + " to " + module());
             }
-            Class<?> result = Class.forName(module, dotName);
+            Class<?> result = Class.forName(module, binaryName);
             if (result != null) {
                 return result;
             }
@@ -238,14 +238,14 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
         Class<?> loaded;
         ClassLoader cl = lm.classLoader();
         if (cl == this) {
-            loaded = loadClassDirect(dotName);
+            loaded = loadClassDirect(binaryName);
         } else {
             Module module = module();
             if (lm.module().isExported(packageName, module)) {
                 if (cl instanceof ModuleClassLoader mcl) {
-                    loaded = mcl.loadClassDirect(dotName);
+                    loaded = mcl.loadClassDirect(binaryName);
                 } else {
-                    loaded = Class.forName(dotName, false, cl);
+                    loaded = Class.forName(binaryName, false, cl);
                 }
             } else {
                 throw new ClassNotFoundException(lm.name().map(n -> "Module " + n).orElse("Unnamed module")

src/main/java/io/smallrye/modules/desc/ModuleDescriptor.java

@@ -212,21 +212,18 @@ private Map<String, PackageInfo> searchPackages(final Resource dir,
                 } else {
                     String pathName = child.pathName();
                     if (pathName.endsWith(".class")) {
-                        int idx = pathName.lastIndexOf('/');
-                        if (idx != -1) {
-                            String pn = pathName.substring(0, idx).replace('/', '.');
-                            if (found.add(pn)) {
-                                PackageInfo existing = map.get(pn);
-                                PackageInfo update = packageFunction.apply(pn, existing);
-                                if (update == null || update.equals(existing)) {
-                                    // skip it
-                                    continue;
-                                }
-                                if (map == packages) {
-                                    map = new HashMap<>(packages);
-                                }
-                                map.put(pn, update);
+                        String pn = Util.resourcePackageName(pathName);
+                        if (!pn.isEmpty() && found.add(pn)) {
+                            PackageInfo existing = map.get(pn);
+                            PackageInfo update = packageFunction.apply(pn, existing);
+                            if (update == null || update.equals(existing)) {
+                                // skip it
+                                continue;
+                            }
+                            if (map == packages) {
+                                map = new HashMap<>(packages);
                             }
+                            map.put(pn.intern(), update);
                         }
                     }
                 }