Renamed Config to SystemPropertiesConfig

luontola · Dec 15, 2015 · 665fe6a · 665fe6a
1 parent 689240e
commit 665fe6a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 41 deletions.
diff --git a/...lambda-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessClassesMojo.java b/...lambda-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessClassesMojo.java
@@ -126,12 +126,12 @@ private void processClassesInCurrentProcess() throws MojoExecutionException {
         getLog().info("Processing classes with Retrolambda");
         try {
             Properties p = new Properties();
-            p.setProperty(Config.BYTECODE_VERSION, "" + targetBytecodeVersions.get(target));
-            p.setProperty(Config.DEFAULT_METHODS, "" + defaultMethods);
-            p.setProperty(Config.INPUT_DIR, getInputDir().getAbsolutePath());
-            p.setProperty(Config.OUTPUT_DIR, getOutputDir().getAbsolutePath());
-            p.setProperty(Config.CLASSPATH, getClasspath());
-            Retrolambda.run(new Config(p));
+            p.setProperty(SystemPropertiesConfig.BYTECODE_VERSION, "" + targetBytecodeVersions.get(target));
+            p.setProperty(SystemPropertiesConfig.DEFAULT_METHODS, "" + defaultMethods);
+            p.setProperty(SystemPropertiesConfig.INPUT_DIR, getInputDir().getAbsolutePath());
+            p.setProperty(SystemPropertiesConfig.OUTPUT_DIR, getOutputDir().getAbsolutePath());
+            p.setProperty(SystemPropertiesConfig.CLASSPATH, getClasspath());
+            Retrolambda.run(new SystemPropertiesConfig(p));
         } catch (Throwable t) {
             throw new MojoExecutionException("Failed to run Retrolambda", t);
         }

diff --git a/retrolambda/pom.xml b/retrolambda/pom.xml
@@ -64,7 +64,7 @@
                                     <arg value="-Dretrolambda.bytecodeVersion=50"/>
                                     <arg value="-Dretrolambda.inputDir=${project.build.outputDirectory}"/>
                                     <arg value="-Dretrolambda.classpath=${compile_classpath}"/>
-                                    <arg value="-Dretrolambda.includedFiles=${project.build.outputDirectory}/net/orfjackal/retrolambda/Main.class${path.separator}${project.build.outputDirectory}/net/orfjackal/retrolambda/Config.class${path.separator}${project.build.outputDirectory}/net/orfjackal/retrolambda/Retrolambda.class"/>
+                                    <arg value="-Dretrolambda.includedFiles=${project.build.outputDirectory}/net/orfjackal/retrolambda/Main.class${path.separator}${project.build.outputDirectory}/net/orfjackal/retrolambda/SystemPropertiesConfig.class${path.separator}${project.build.outputDirectory}/net/orfjackal/retrolambda/Retrolambda.class"/>
                                     <arg value="-cp"/>
                                     <arg value="${project.build.outputDirectory}"/>
                                     <arg value="-cp"/>

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java
@@ -1,4 +1,4 @@
-// Copyright © 2013-2014 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2015 Esko Luontola <www.orfjackal.net>
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -17,7 +17,7 @@ public static void main(String[] args) {
             System.exit(1);
         }
 
-        Config config = new Config(System.getProperties());
+        SystemPropertiesConfig config = new SystemPropertiesConfig(System.getProperties());
         if (!config.isFullyConfigured()) {
             System.out.print(config.getHelp());
             return;

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Retrolambda.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Retrolambda.java
@@ -15,7 +15,7 @@
 
 public class Retrolambda {
 
-    public static void run(Config config) throws Throwable {
+    public static void run(SystemPropertiesConfig config) throws Throwable {
         int bytecodeVersion = config.getBytecodeVersion();
         boolean defaultMethodsEnabled = config.isDefaultMethodsEnabled();
         Path inputDir = config.getInputDir();

diff --git a/...ava/net/orfjackal/retrolambda/Config.java → ...l/retrolambda/SystemPropertiesConfig.java b/...ava/net/orfjackal/retrolambda/Config.java → ...l/retrolambda/SystemPropertiesConfig.java
@@ -11,7 +11,7 @@
 import java.util.*;
 import java.util.stream.*;
 
-public class Config {
+public class SystemPropertiesConfig {
 
     private static final String PREFIX = "retrolambda.";
     public static final String BYTECODE_VERSION = PREFIX + "bytecodeVersion";
@@ -41,7 +41,7 @@ public class Config {
 
     private final Properties p;
 
-    public Config(Properties p) {
+    public SystemPropertiesConfig(Properties p) {
         this.p = p;
     }
 

diff --git a/retrolambda/src/test/java/net/orfjackal/retrolambda/DocumentationTest.java b/retrolambda/src/test/java/net/orfjackal/retrolambda/DocumentationTest.java
@@ -1,4 +1,4 @@
-// Copyright © 2013 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2015 Esko Luontola <www.orfjackal.net>
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -18,7 +18,7 @@ public class DocumentationTest {
     @Test
     public void README_contains_the_usage_instructions() throws IOException {
         String readme = toString(findInClosestParentDir("README.md"));
-        String help = new Config(new Properties()).getHelp();
+        String help = new SystemPropertiesConfig(new Properties()).getHelp();
 
         assertTrue("Expected README to contain the following text:\n\n" + help, readme.contains(help));
     }

diff --git a/retrolambda/src/test/java/net/orfjackal/retrolambda/RetrolambdaTest.java b/retrolambda/src/test/java/net/orfjackal/retrolambda/RetrolambdaTest.java
@@ -77,11 +77,11 @@ public void ignores_included_files_that_are_outside_the_input_directory() throws
     @Test
     public void copies_resources_to_output_directory() throws Throwable {
         Properties p = new Properties();
-        p.setProperty(Config.INPUT_DIR, inputDir.toString());
-        p.setProperty(Config.OUTPUT_DIR, outputDir.toString());
-        p.setProperty(Config.CLASSPATH, "");
+        p.setProperty(SystemPropertiesConfig.INPUT_DIR, inputDir.toString());
+        p.setProperty(SystemPropertiesConfig.OUTPUT_DIR, outputDir.toString());
+        p.setProperty(SystemPropertiesConfig.CLASSPATH, "");
 
-        Retrolambda.run(new Config(p));
+        Retrolambda.run(new SystemPropertiesConfig(p));
 
         assertIsFile(outputDir.resolve("file1.txt"));
         assertIsFile(outputDir.resolve("subdir/file.txt"));

diff --git a/...net/orfjackal/retrolambda/ConfigTest.java → ...trolambda/SystemPropertiesConfigTest.java b/...net/orfjackal/retrolambda/ConfigTest.java → ...trolambda/SystemPropertiesConfigTest.java
@@ -14,7 +14,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
-public class ConfigTest {
+public class SystemPropertiesConfigTest {
 
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
@@ -24,24 +24,24 @@ public class ConfigTest {
 
     private final Properties systemProperties = new Properties();
 
-    private Config config() {
-        return new Config(systemProperties);
+    private SystemPropertiesConfig config() {
+        return new SystemPropertiesConfig(systemProperties);
     }
 
     @Test
     public void is_fully_configured_when_required_properties_are_set() {
         assertThat("before", config().isFullyConfigured(), is(false));
 
-        systemProperties.setProperty(Config.INPUT_DIR, "");
-        systemProperties.setProperty(Config.CLASSPATH, "");
+        systemProperties.setProperty(SystemPropertiesConfig.INPUT_DIR, "");
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH, "");
 
         assertThat("after", config().isFullyConfigured(), is(true));
     }
 
     @Test
     public void can_use_alternative_parameter_instead_of_required_parameter() {
-        systemProperties.setProperty(Config.INPUT_DIR, "");
-        systemProperties.setProperty(Config.CLASSPATH_FILE, "");
+        systemProperties.setProperty(SystemPropertiesConfig.INPUT_DIR, "");
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH_FILE, "");
 
         assertThat("is fully configured?", config().isFullyConfigured(), is(true));
     }
@@ -51,7 +51,7 @@ public void bytecode_version() {
         assertThat("defaults to Java 7", config().getBytecodeVersion(), is(51));
         assertThat("human printable format", config().getJavaVersion(), is("Java 7"));
 
-        systemProperties.setProperty(Config.BYTECODE_VERSION, "50");
+        systemProperties.setProperty(SystemPropertiesConfig.BYTECODE_VERSION, "50");
         assertThat("can override the default", config().getBytecodeVersion(), is(50));
         assertThat("human printable format", config().getJavaVersion(), is("Java 6"));
     }
@@ -60,7 +60,7 @@ public void bytecode_version() {
     public void default_methods() {
         assertThat("defaults to disabled", config().isDefaultMethodsEnabled(), is(false));
 
-        systemProperties.setProperty(Config.DEFAULT_METHODS, "true");
+        systemProperties.setProperty(SystemPropertiesConfig.DEFAULT_METHODS, "true");
         assertThat("can override the default", config().isDefaultMethodsEnabled(), is(true));
     }
 
@@ -73,22 +73,22 @@ public void input_directory_is_required() {
 
     @Test
     public void output_directory() {
-        systemProperties.setProperty(Config.INPUT_DIR, "input dir");
+        systemProperties.setProperty(SystemPropertiesConfig.INPUT_DIR, "input dir");
         assertThat("defaults to input dir", config().getOutputDir(), is(Paths.get("input dir")));
 
-        systemProperties.setProperty(Config.OUTPUT_DIR, "output dir");
+        systemProperties.setProperty(SystemPropertiesConfig.OUTPUT_DIR, "output dir");
         assertThat("can override the default", config().getOutputDir(), is(Paths.get("output dir")));
     }
 
     @Test
     public void classpath() {
-        systemProperties.setProperty(Config.CLASSPATH, "");
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH, "");
         assertThat("zero values", config().getClasspath(), is(empty()));
 
-        systemProperties.setProperty(Config.CLASSPATH, "one.jar");
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH, "one.jar");
         assertThat("one value", config().getClasspath(), is(Arrays.asList(Paths.get("one.jar"))));
 
-        systemProperties.setProperty(Config.CLASSPATH, "one.jar" + File.pathSeparator + "two.jar");
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH, "one.jar" + File.pathSeparator + "two.jar");
         assertThat("multiple values", config().getClasspath(), is(Arrays.asList(Paths.get("one.jar"), Paths.get("two.jar"))));
     }
 
@@ -97,15 +97,15 @@ public void classpath_file() throws IOException {
         Path file = tempDir.newFile("classpath.txt").toPath();
 
         Files.write(file, Arrays.asList("", "", "")); // empty lines are ignored
-        systemProperties.setProperty(Config.CLASSPATH_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH_FILE, file.toString());
         assertThat("zero values", config().getClasspath(), is(empty()));
 
         Files.write(file, Arrays.asList("one.jar"));
-        systemProperties.setProperty(Config.CLASSPATH_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH_FILE, file.toString());
         assertThat("one value", config().getClasspath(), is(Arrays.asList(Paths.get("one.jar"))));
 
         Files.write(file, Arrays.asList("one.jar", "two.jar"));
-        systemProperties.setProperty(Config.CLASSPATH_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.CLASSPATH_FILE, file.toString());
         assertThat("multiple values", config().getClasspath(), is(Arrays.asList(Paths.get("one.jar"), Paths.get("two.jar"))));
     }
 
@@ -120,13 +120,13 @@ public void classpath_is_required() {
     public void included_files() {
         assertThat("not set", config().getIncludedFiles(), is(nullValue()));
 
-        systemProperties.setProperty(Config.INCLUDED_FILES, "");
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES, "");
         assertThat("zero values", config().getIncludedFiles(), is(empty()));
 
-        systemProperties.setProperty(Config.INCLUDED_FILES, "/foo/one.class");
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES, "/foo/one.class");
         assertThat("one value", config().getIncludedFiles(), is(Arrays.asList(Paths.get("/foo/one.class"))));
 
-        systemProperties.setProperty(Config.INCLUDED_FILES, "/foo/one.class" + File.pathSeparator + "/foo/two.class");
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES, "/foo/one.class" + File.pathSeparator + "/foo/two.class");
         assertThat("multiple values", config().getIncludedFiles(), is(Arrays.asList(Paths.get("/foo/one.class"), Paths.get("/foo/two.class"))));
     }
 
@@ -136,15 +136,15 @@ public void included_files_file() throws IOException {
         assertThat("not set", config().getIncludedFiles(), is(nullValue()));
 
         Files.write(file, Arrays.asList("", "", "")); // empty lines are ignored
-        systemProperties.setProperty(Config.INCLUDED_FILES_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES_FILE, file.toString());
         assertThat("zero values", config().getIncludedFiles(), is(empty()));
 
         Files.write(file, Arrays.asList("one.class"));
-        systemProperties.setProperty(Config.INCLUDED_FILES_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES_FILE, file.toString());
         assertThat("one value", config().getIncludedFiles(), is(Arrays.asList(Paths.get("one.class"))));
 
         Files.write(file, Arrays.asList("one.class", "two.class"));
-        systemProperties.setProperty(Config.INCLUDED_FILES_FILE, file.toString());
+        systemProperties.setProperty(SystemPropertiesConfig.INCLUDED_FILES_FILE, file.toString());
         assertThat("multiple values", config().getIncludedFiles(), is(Arrays.asList(Paths.get("one.class"), Paths.get("two.class"))));
     }
 }