From c59ceefdb60a3722a3b64df2ec15e94aac496f0d Mon Sep 17 00:00:00 2001 From: gjoranv Date: Sun, 30 Sep 2018 16:11:38 +0200 Subject: Extract private helper for finding the set of exported packages. --- .../java/com/yahoo/jdisc/core/ExportPackages.java | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'jdisc_core/src') 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() { -- cgit v1.2.3