Reuse package name utility function

Author: dmlloyd

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);
                         }
                     }
                 }