added matchup dimension name to config

Author: TomBlock

post-processing-tool/src/main/java/com/bc/fiduceo/post/PostProcessingConfig.java

@@ -40,11 +40,13 @@ public class PostProcessingConfig {
     static final String TAG_NAME_NEW_FILES = "create-new-files";
     static final String TAG_NAME_OUTPUT_DIR = "output-directory";
     static final String TAG_NAME_OVERWRITE = "overwrite";
+    static final String TAG_NAME_MATCHUP_DIMENSION= "matchup-dimension-name";
 
     final transient private Document document;
     private boolean newFiles;
     private String outputDirectory;
     private boolean overwrite;
+    private String matchupDimensionName;
     private List<Element> postProcessingElements;
 
     private PostProcessingConfig(Document document) {
@@ -87,6 +89,10 @@ boolean isOverwrite() {
         return overwrite;
     }
 
+    public String getMatchupDimensionName() {
+        return matchupDimensionName;
+    }
+
     @SuppressWarnings("unchecked")
     private void init() {
         final Element rootElement = JDomUtils.getMandatoryRootElement(TAG_NAME_ROOT, document);
@@ -106,6 +112,11 @@ private void init() {
             throw new RuntimeException("Either <" + TAG_NAME_NEW_FILES + "> or <" + TAG_NAME_OVERWRITE + "> must be configured.");
         }
 
+        final Element matchupDimElem = rootElement.getChild(TAG_NAME_MATCHUP_DIMENSION);
+        if (matchupDimElem != null) {
+            matchupDimensionName = JDomUtils.getMandatoryText(matchupDimElem);
+        }
+
         final Element processingsElem = JDomUtils.getMandatoryChild(rootElement, TAG_NAME_POST_PROCESSINGS);
         postProcessingElements = processingsElem.getChildren();
         if (postProcessingElements.size() == 0) {

post-processing-tool/src/test/java/com/bc/fiduceo/post/PostProcessingConfigTest.java

@@ -42,6 +42,7 @@ public class PostProcessingConfigTest {
     private static final String NEW_FILES = PostProcessingConfig.TAG_NAME_NEW_FILES;
     private static final String OUTPUT_DIR = PostProcessingConfig.TAG_NAME_OUTPUT_DIR;
     private static final String OVERWRITE = PostProcessingConfig.TAG_NAME_OVERWRITE;
+    private static final String MATCHUP_DIM = PostProcessingConfig.TAG_NAME_MATCHUP_DIMENSION;
 
     private static final String DUMMY_NAME = DummyPostProcessingPlugin.DUMMY_POST_PROCESSING_NAME;
     private Element root;
@@ -77,7 +78,32 @@ public void testStore() throws Exception {
         pw.println("    <" + DUMMY_NAME + ">C</" + DUMMY_NAME + ">");
         pw.println("  </post-processings>");
         pw.println("</post-processing-config>");
-//        pw.println();
+        pw.flush();
+
+        assertEquals(sw.toString().replaceAll("\\s+",""), outputStream.toString().replaceAll("\\s+",""));
+    }
+
+    @Test
+    public void testStoreWithMatchup() throws Exception {
+        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        getConfigWithMatchupDimension("matching").store(outputStream);
+
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw);
+        pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        pw.println("<post-processing-config>");
+        pw.println("  <create-new-files>");
+        pw.println("    <output-directory>An_Output_Directory</output-directory>");
+        pw.println("  </create-new-files>");
+        pw.println("  <post-processings>");
+        pw.println("    <" + DUMMY_NAME + ">A</" + DUMMY_NAME + ">");
+        pw.println("    <" + DUMMY_NAME + ">B</" + DUMMY_NAME + ">");
+        pw.println("    <" + DUMMY_NAME + ">C</" + DUMMY_NAME + ">");
+        pw.println("  </post-processings>");
+        pw.println("  <matchup-dimension-name>");
+        pw.println("      matching");
+        pw.println("  </matchup-dimension-name>");
+        pw.println("</post-processing-config>");
         pw.flush();
 
         assertEquals(sw.toString().replaceAll("\\s+",""), outputStream.toString().replaceAll("\\s+",""));
@@ -117,6 +143,13 @@ public void testLoad_createNewFiles() throws Exception {
         assertEquals("An_Output_Directory", config.getOutputDirectory());
     }
 
+    @Test
+    public void testLoad_matchupDimension() throws Exception {
+        final PostProcessingConfig config = getConfigWithMatchupDimension("theDimension");
+
+        assertEquals("theDimension", config.getMatchupDimensionName());
+    }
+
     @Test
     public void testLoad_overwrite() throws Exception {
         root.removeChild(NEW_FILES);
@@ -217,4 +250,10 @@ private PostProcessingConfig getConfig() throws Exception {
 
         return PostProcessingConfig.load(new ByteArrayInputStream(bs.toByteArray()));
     }
+
+    private PostProcessingConfig getConfigWithMatchupDimension(String dimensionName) throws Exception {
+        root.addContent(new Element(MATCHUP_DIM).addContent(dimensionName));
+
+        return getConfig();
+    }
 }