Extract private helper for finding the set of exported packages.

1 files changed, 13 insertions, 9 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
index e8e6373f2ed..0837f9a428c 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
@@ -13,7 +13,6 @@ import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -36,6 +35,16 @@ public class ExportPackages {
         if (!fileName.endsWith(PROPERTIES_FILE)) {
             throw new IllegalArgumentException("Expected '" + PROPERTIES_FILE + "', got '" + fileName + "'.");
         }
+        String exportPackages = getExportPackages(args);
+        Properties props = new Properties();
+        props.setProperty(EXPORT_PACKAGES, exportPackages);
+
+        try (FileWriter writer = new FileWriter(new File(fileName))) {
+            props.store(writer, "generated by " + ExportPackages.class.getName());
+        }
+    }
+
+    private static String getExportPackages(String[] jars) throws IOException {
         StringBuilder out = new StringBuilder();
         out.append(getSystemPackages()).append(",")
            .append("com.sun.security.auth,")
@@ -64,15 +73,10 @@ public class ExportPackages {
            .append("org.w3c.dom.traversal,")
            .append("org.w3c.dom.views");
 
-        for (int i = 1; i < args.length; ++i) {
-            out.append(",").append(getExportedPackages(args[i]));
-        }
-        Properties props = new Properties();
-        props.setProperty(EXPORT_PACKAGES, out.toString());
-
-        try (FileWriter writer = new FileWriter(new File(fileName))) {
-            props.store(writer, "generated by " + ExportPackages.class.getName());
+        for (int i = 1; i < jars.length; ++i) {
+            out.append(",").append(getExportedPackages(jars[i]));
         }
+        return out.toString();
     }
 
     public static String readExportProperty() {