Naming fixes

jerboaa · Dec 12, 2024 · c9643d3 · c9643d3
1 parent 73a909e
commit c9643d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -412,14 +412,14 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
 
         // Sanity check version if we use JMODs
         if (!isLinkFromRuntime) {
-            checkVersion(finder);
+            checkJavaBaseVersion(finder);
         }
 
         // Determine the roots set
         Set<String> roots = new HashSet<>();
         for (String mod : options.addMods) {
             if (mod.equals(ALL_MODULE_PATH)) {
-                ModuleFinder mf = limitFinder(finder, options.limitMods,
+                ModuleFinder mf = newLimitedFinder(finder, options.limitMods,
                                               Set.of());
                 mf.findAll()
                   .stream()
@@ -430,7 +430,7 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
                 roots.add(mod);
             }
         }
-        finder = limitFinder(finder, options.limitMods, roots);
+        finder = newLimitedFinder(finder, options.limitMods, roots);
 
         // --keep-packaged-modules doesn't make sense as we are not linking
         // from packaged modules to begin with.
@@ -497,7 +497,7 @@ public static Path getDefaultModulePath() {
      * specified in {@code limitMods} plus other modules specified in the
      * {@code roots} set.
      */
-    public static ModuleFinder limitFinder(ModuleFinder finder,
+    public static ModuleFinder newLimitedFinder(ModuleFinder finder,
                                            Set<String> limitMods,
                                            Set<String> roots) {
         // if limitMods is specified then limit the universe
@@ -548,7 +548,7 @@ public Set<ModuleReference> findAll() {
      * version or the java.base version is not the same as the current runtime's
      * version.
      */
-    private static void checkVersion(ModuleFinder finder) {
+    private static void checkJavaBaseVersion(ModuleFinder finder) {
         assert finder.find("java.base").isPresent();
 
         // use the version of java.base module, if present, as

diff --git a/test/jdk/tools/jlink/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java
@@ -157,7 +157,10 @@ private static void test() throws Exception {
         boolean linkFromRuntime = false;
         JlinkConfiguration config = new Jlink.JlinkConfiguration(output,
                 mods,
-                JlinkTask.limitFinder(JlinkTask.newModuleFinder(modulePaths), limits, mods), linkFromRuntime, false, false);
+                JlinkTask.newLimitedFinder(JlinkTask.newModuleFinder(modulePaths), limits, mods),
+                linkFromRuntime,
+                false /* ignore modified runtime */,
+                false /* generate run-time image */);
 
         List<Plugin> lst = new ArrayList<>();