Merge pull request #86 from dice-group/develop

Developed version 0.1.5

Author: MichaelRoeder

palmetto/pom.xml

@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.aksw</groupId>
     <artifactId>palmetto</artifactId>
-    <version>0.1.4</version>
+    <version>0.1.5</version>
     <name>Palmetto</name>
     <description>Palmetto is a quality measure tool for topics.</description>
     <packaging>jar</packaging>

webApp/Makefile

@@ -5,7 +5,7 @@ build:
 
 Major=0
 Minor=1
-Patch=4
+Patch=5
 
 dockerize:
 	docker build -t dicegroup/palmetto-service:latest .

webApp/pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.aksw</groupId>
     <artifactId>palmetto-webapp</artifactId>
-    <version>0.1.4</version>
+    <version>0.1.5</version>
     <name>Palmetto Web Application</name>
     <description>Palmetto is a quality measure tool for topics.</description>
     <packaging>war</packaging>

webApp/src/main/java/org/aksw/palmetto/webapp/config/PalmettoConfiguration.java

@@ -20,6 +20,7 @@
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,18 +41,18 @@ public class PalmettoConfiguration {
 
     public static synchronized Configuration getInstance() {
         if (instance == null) {
-            instance = new CompositeConfiguration();
-            loadAdditionalProperties(DEFAULT_PALMETTO_PROPERTIES_FILE_NAME);
+            CompositeConfiguration tempConfig = new CompositeConfiguration();
+            // Add environmental variables first
+            tempConfig.addConfiguration(new EnvironmentConfiguration());
+            // Add default values for parameters to ensure that all parameters are set
+            try {
+                tempConfig.addConfiguration(new PropertiesConfiguration(DEFAULT_PALMETTO_PROPERTIES_FILE_NAME));
+            } catch (ConfigurationException e) {
+                LOGGER.error("Couldnt load Properties from the properties file (\"" + DEFAULT_PALMETTO_PROPERTIES_FILE_NAME
+                        + "\"). This GERBIL instance won't work as expected.", e);
+            }
+            instance = tempConfig;
         }
         return instance;
     }
-
-    public static synchronized void loadAdditionalProperties(String fileName) {
-        try {
-            ((CompositeConfiguration) getInstance()).addConfiguration(new PropertiesConfiguration(fileName));
-        } catch (ConfigurationException e) {
-            LOGGER.error("Couldnt load Properties from the properties file (\"" + fileName
-                    + "\"). This GERBIL instance won't work as expected.", e);
-        }
-    }
 }

webApp/src/main/java/org/aksw/palmetto/webapp/config/RootConfig.java

@@ -83,7 +83,7 @@ public class RootConfig {
 
     static @Bean public WindowSupportingAdapter createLuceneAdapter() throws Exception {
         Configuration config = PalmettoConfiguration.getInstance();
-        String indexPath = PalmettoConfiguration.getInstance().getString(INDEX_PATH_PROPERTY_KEY);
+        String indexPath = config.getString(INDEX_PATH_PROPERTY_KEY);
         if (indexPath == null) {
             String errormsg = "Couldn't load \"" + INDEX_PATH_PROPERTY_KEY + "\" from properties. Aborting.";
             LOGGER.error(errormsg);