Improved Maven POM and ConfigurationBuilder

Some errors have been fixed in the Maven POM: Minimization has been turned off for the shaded full jar, as it leads to missing classes. The main class now is specified correctly, too. ConfigurationBuilder has been modified such that command line arguments override config file arguments. I think this makes more sense than the other way around.
optimizationBenchmarking · May 27, 2015 · fb72bcf · fb72bcf
1 parent 2afc340
commit fb72bcf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -260,7 +260,7 @@
 						<manifest>
 							<addDefaultImplementationEntries />
 							<addDefaultSpecificationEntries />
-							<mainClass>org.optimizationBenchmarking.experimentation.evaluation.system.Main</mainClass>
+							<mainClass>org.optimizationBenchmarking.experimentation.evaluation.Main</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
@@ -280,11 +280,8 @@
 
 							<createSourcesJar>true</createSourcesJar>
 							<shadeTestJar>true</shadeTestJar>
-
-							<minimizeJar>true</minimizeJar>
-
+							<minimizeJar>false</minimizeJar>
 							<shadedArtifactAttached>true</shadedArtifactAttached>
-
 							<createDependencyReducedPom>false</createDependencyReducedPom>
 
 							<shadedClassifierName>full</shadedClassifierName>
@@ -304,7 +301,7 @@
 							<transformers>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.optimizationBenchmarking.experimentation.evaluation.system.Main</mainClass>
+									<mainClass>org.optimizationBenchmarking.experimentation.evaluation.Main</mainClass>
 								</transformer>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />

diff --git a/src/main/java/org/optimizationBenchmarking/utils/config/ConfigurationBuilder.java b/src/main/java/org/optimizationBenchmarking/utils/config/ConfigurationBuilder.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -235,22 +236,31 @@ public synchronized final void putProperties(final Properties prop) {
    */
   synchronized final void _configure(final String[] args)
       throws IOException {
+    final _ConfigMap map;
     Path configFile;
     ConfigurationPropertiesInput propertiesInput;
     ConfigurationXMLInput xmlInput;
+    HashMap<String, Object> copy;
+    String param;
 
     this.fsmFlagsAssertAndUpdate(FSM.FLAG_NOTHING,
         ConfigurationBuilder.FLAG_HAS_BEEN_CONFIGURED,
         ConfigurationBuilder.FLAG_HAS_BEEN_CONFIGURED, FSM.FLAG_NOTHING);
 
     this.putCommandLine(args);
 
+    map = this.m_data.m_data;
+    copy = null;
+
     // load a potential properties file
     configFile = this.m_data._get(Configuration.PARAM_PROPERTY_FILE,
         PathParser.INSTANCE, null, false);
     if (configFile != null) {
       propertiesInput = ConfigurationPropertiesInput.getInstance();
       if (propertiesInput.canUse()) {
+        copy = new HashMap<>(map.size());
+        copy.putAll(map);
+
         propertiesInput.use().addPath(configFile).setDestination(this)
         .create().call();
       }
@@ -262,10 +272,28 @@ synchronized final void _configure(final String[] args)
     if (configFile != null) {
       xmlInput = ConfigurationXMLInput.getInstance();
       if (xmlInput.canUse()) {
+
+        if (copy == null) {
+          copy = new HashMap<>(map.size());
+          copy.putAll(map);
+        }
+
         xmlInput.use().addPath(configFile).setDestination(this).create()
         .call();
       }
     }
+
+    // restore command line arguments: overwrite config file
+    if (copy != null) {
+      for (final Map.Entry<String, Object> entry : copy.entrySet()) {
+        param = entry.getKey();
+        if (Configuration.PARAM_XML_FILE.equalsIgnoreCase(param) || //
+            Configuration.PARAM_PROPERTY_FILE.equalsIgnoreCase(param)) {
+          continue;
+        }
+        map.getEntry(param, false).setValue(entry.getValue());
+      }
+    }
   }
 
   /** {@inheritDoc} */