8371429: [lworld] Fix package name inference for ResourcePoolManager for preview mode

Reviewed-by: rriggs

Author: david-beaumont

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java

@@ -572,62 +572,4 @@ private static ResourcePoolManager createPoolManager(ResourcePool resultResource
         resultResources.entries().forEach(resources::add);
         return resources;
     }
-
-    /**
-     * Helper method that splits a Resource path onto 3 items: module, parent
-     * and resource name.
-     *
-     * @param path
-     * @return An array containing module, parent and name.
-     */
-    public static String[] splitPath(String path) {
-        Objects.requireNonNull(path);
-        String noRoot = path.substring(1);
-        int pkgStart = noRoot.indexOf("/");
-        String module = noRoot.substring(0, pkgStart);
-        List<String> result = new ArrayList<>();
-        result.add(module);
-        String pkg = noRoot.substring(pkgStart + 1);
-        String resName;
-        int pkgEnd = pkg.lastIndexOf("/");
-        if (pkgEnd == -1) { // No package.
-            resName = pkg;
-        } else {
-            resName = pkg.substring(pkgEnd + 1);
-        }
-
-        pkg = toPackage(pkg, false);
-        result.add(pkg);
-        result.add(resName);
-
-        String[] array = new String[result.size()];
-        return result.toArray(array);
-    }
-
-    /**
-     * Returns the path of the resource.
-     */
-    public static String resourceName(String path) {
-        Objects.requireNonNull(path);
-        String s = path.substring(1);
-        int index = s.indexOf("/");
-        return s.substring(index + 1);
-    }
-
-    public static String toPackage(String name) {
-        return toPackage(name, false);
-    }
-
-    private static String toPackage(String name, boolean log) {
-        int index = name.lastIndexOf('/');
-        if (index > 0) {
-            return name.substring(0, index).replace('/', '.');
-        } else {
-            // ## unnamed package
-            if (log) {
-                System.err.format("Warning: %s in unnamed package%n", name);
-            }
-            return "";
-        }
-    }
 }

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java

@@ -66,20 +66,8 @@ static Attributes readModuleAttributes(ResourcePoolModule mod) {
         }
     }
 
-    /**
-     * Returns true if a resource is located in a named package.
-     */
-    public static boolean isNamedPackageResource(String name) {
-        int index = name.lastIndexOf("/");
-        if (index == -1) {
-            return false;
-        } else {
-            String pn = name.substring(0, index).replace('/', '.');
-            return Checks.isPackageName(pn);
-        }
-    }
-
     static class ResourcePoolModuleImpl implements ResourcePoolModule {
+        private static final String PREVIEW_PREFIX = "META-INF/preview/";
 
         final Map<String, ResourcePoolEntry> moduleContent = new LinkedHashMap<>();
         // lazily initialized
@@ -132,16 +120,8 @@ private void initModuleAttributes() {
         public Set<String> packages() {
             Set<String> pkgs = new HashSet<>();
             moduleContent.values().stream()
-                .filter(m -> m.type() == ResourcePoolEntry.Type.CLASS_OR_RESOURCE)
-                .forEach(res -> {
-                    String name = ImageFileCreator.resourceName(res.path());
-                    if (isNamedPackageResource(name)) {
-                        String pkg = ImageFileCreator.toPackage(name);
-                        if (!pkg.isEmpty()) {
-                            pkgs.add(pkg);
-                        }
-                    }
-                });
+                    .filter(m -> m.type() == ResourcePoolEntry.Type.CLASS_OR_RESOURCE)
+                    .forEach(res -> inferPackageName(res).ifPresent(pkgs::add));
             return pkgs;
         }
 
@@ -159,6 +139,39 @@ public Stream<ResourcePoolEntry> entries() {
         public int entryCount() {
             return moduleContent.values().size();
         }
+
+        /**
+         * Returns a valid non-empty package name, inferred from a resource pool
+         * entry's path.
+         *
+         * <p>If the resource pool entry is for a preview resource (i.e. with
+         * path {@code "/mod-name/META-INF/preview/pkg-path/resource-name"})
+         * the package name is the non-preview name based on {@code "pkg-path"}.
+         *
+         * @return the inferred package name, or {@link Optional#empty() empty}
+         *     if no name could be inferred.
+         */
+        private static Optional<String> inferPackageName(ResourcePoolEntry res) {
+            // Expect entry paths to be "/mod-name/pkg-path/resource-name", but
+            // may also get "/mod-name/META-INF/preview/pkg-path/resource-name"
+            String name = res.path();
+            if (name.charAt(0) == '/') {
+                int pkgStart = name.indexOf('/', 1) + 1;
+                int pkgEnd = name.lastIndexOf('/');
+                if (pkgStart > 0 && pkgEnd > pkgStart) {
+                    String pkgPath = name.substring(pkgStart, pkgEnd);
+                    // Handle preview paths by removing the prefix.
+                    if (pkgPath.startsWith(PREVIEW_PREFIX)) {
+                        pkgPath = pkgPath.substring(PREVIEW_PREFIX.length());
+                    }
+                    String pkgName = pkgPath.replace('/', '.');
+                    if (Checks.isPackageName(pkgName)) {
+                        return Optional.of(pkgName);
+                    }
+                }
+            }
+            return Optional.empty();
+        }
     }
 
     public class ResourcePoolImpl implements ResourcePool {