Use common template in analyzer modules, set as option (#300)

See https://gitlab.com/oersi/oersi-etl/-/issues/238

Author: fsteeg

metafix/src/main/java/org/metafacture/metafix/MetafixListPaths.java

@@ -30,14 +30,15 @@
  */
 @Description("Lists all paths found in the input records. These paths can be used in a Fix to address fields. Options: " +
         "count (output occurence frequency of each path, sorted by highest frequency first; default: true), " +
+        "template (for formatting the internal triple structure; default: ${s}\t|\t${o} if count is true, else ${s})" +
         "index (output individual repeated subfields and array elements with index numbers instead of '*'; default: false)")
 @In(StreamReceiver.class)
 @Out(String.class)
 @FluxCommand("fix-list-paths")
 public class MetafixListPaths extends MetafixStreamAnalyzer {
 
     public MetafixListPaths() {
-        super("nothing()", Compare.PREDICATE, "${s}\t|\t${o}");
+        super("nothing()", Compare.PREDICATE);
         setIndex(false);
     }
 

metafix/src/main/java/org/metafacture/metafix/MetafixListValues.java

@@ -29,14 +29,15 @@
  * @author Fabian Steeg
  */
 @Description("Lists all values found for the given path. The paths can be found using fix-list-paths. Options: " +
-        "count (output occurence frequency of each value, sorted by highest frequency first; default: true)")
+        "count (output occurence frequency of each value, sorted by highest frequency first; default: true)" +
+        "template (for formatting the internal triple structure; default: ${s}\t|\t${o} if count is true, else ${s})")
 @In(StreamReceiver.class)
 @Out(String.class)
 @FluxCommand("fix-list-values")
 public class MetafixListValues extends MetafixStreamAnalyzer {
 
     public MetafixListValues(final String path) {
-        super(fix(path), Compare.OBJECT, "${o}\t|\t${s}");
+        super(fix(path), Compare.OBJECT);
     }
 
     private static String fix(final String path) {

metafix/src/main/java/org/metafacture/metafix/MetafixStreamAnalyzer.java

@@ -36,14 +36,15 @@
  */
 /* package-private */ class MetafixStreamAnalyzer extends DefaultStreamPipe<ObjectReceiver<String>> {
 
+    private static final String DEFAULT_COUNTED_TEMPLATE = "${s}\t|\t${o}";
+    private static final String DEFAULT_UNCOUNTED_TEMPLATE = "${s}";
+
     private Metafix fix;
     private boolean count = true;
     private Compare countBy;
-    private String countedTemplate;
-    private String uncountedTemplate = "${s}";
+    private String template;
 
-    /* package-private */ MetafixStreamAnalyzer(final String fix, final Compare countBy,
-            final String countedTemplate) {
+    /* package-private */ MetafixStreamAnalyzer(final String fix, final Compare countBy) {
         try {
             this.fix = new Metafix(fix);
             this.fix.setRepeatedFieldsToEntities(true);
@@ -52,17 +53,17 @@
             throw new MetafactureException(e);
         }
         this.countBy = countBy;
-        this.countedTemplate = countedTemplate;
     }
 
     @Override
     protected void onSetReceiver() {
+        template = template != null ? template : count ? DEFAULT_COUNTED_TEMPLATE : DEFAULT_UNCOUNTED_TEMPLATE;
         fix
             .setReceiver(new StreamFlattener())
             .setReceiver(new StreamToTriples())
             .setReceiver(tripleCount())
             .setReceiver(tripleSort())
-            .setReceiver(new ObjectTemplate<>(count ? countedTemplate : uncountedTemplate))
+            .setReceiver(new ObjectTemplate<>(template))
             .setReceiver(getReceiver());
     }
 
@@ -123,6 +124,14 @@ public boolean getCount() {
         return this.count;
     }
 
+    public void setTemplate(final String template) {
+        this.template = template;
+    }
+
+    public String getTemplate() {
+        return this.template;
+    }
+
     /* package-private */ Metafix getFix() {
         return this.fix;
     }

metafix/src/test/java/org/metafacture/metafix/MetafixListValuesTest.java

@@ -120,6 +120,7 @@ private void processRecord() {
     }
 
     private void verify(final String... result) throws MockitoAssertionError {
+        lister.setTemplate(lister.getCount() ? "${o}\t|\t${s}" : "${s}");
         processRecord();
         try {
             final InOrder ordered = Mockito.inOrder(receiver);