pass in the properties file name to the constructor of the parameter …

…parser
JumpMind · Jan 2, 2013 · b20f576 · b20f576
1 parent a519148
commit b20f576
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -37,7 +37,7 @@ final public class ParameterConstants {
 
     public static final String ALL = "ALL";
 
-    private static Map<String, ParameterMetaData> parameterMetaData = new DefaultParameterParser().parse();
+    private static Map<String, ParameterMetaData> parameterMetaData = new DefaultParameterParser("/symmetric-default.properties").parse();
 
     private ParameterConstants() {
     }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java
@@ -41,13 +41,17 @@ public class DefaultParameterParser {
     private static final String DATABASE_OVERRIDABLE = "DatabaseOverridable:";
     private static final String TAGS = "Tags:";
     private static final String TYPE = "Type:";
+
+    private String propertiesFilePath;
+
     final Logger log = LoggerFactory.getLogger(getClass());
 
-    public DefaultParameterParser() {
+    public DefaultParameterParser(String propertiesFilePath) {
+        this.propertiesFilePath = propertiesFilePath;
     }
 
     public Map<String, ParameterMetaData> parse() {
-        return parse("/symmetric-default.properties");
+        return parse(propertiesFilePath);
     }
 
     public Map<String, ParameterMetaData> parse(String fileName) {

diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/util/DefaultParameterParserTest.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/util/DefaultParameterParserTest.java
@@ -32,7 +32,7 @@ public class DefaultParameterParserTest {
 
     @Test
     public void testParse() {
-        DefaultParameterParser parser = new DefaultParameterParser();
+        DefaultParameterParser parser = new DefaultParameterParser("/symmetric-default.properties");
         Map<String, ParameterMetaData> metaData = parser.parse();
 
         Assert.assertNotNull(metaData);