Always count and sort, only change formatting if count=false (#300)

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

Author: fsteeg

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

@@ -37,7 +37,7 @@
 public class MetafixListPaths extends MetafixStreamAnalyzer {
 
     public MetafixListPaths() {
-        super("nothing()", Compare.PREDICATE, "${s}\t|\t${o}", "${p}");
+        super("nothing()", Compare.PREDICATE, "${s}\t|\t${o}");
         setIndex(false);
     }
 

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

@@ -36,7 +36,7 @@
 public class MetafixListValues extends MetafixStreamAnalyzer {
 
     public MetafixListValues(final String path) {
-        super(fix(path), Compare.OBJECT, "${o}\t|\t${s}", "${o}");
+        super(fix(path), Compare.OBJECT, "${o}\t|\t${s}");
     }
 
     private static String fix(final String path) {

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

@@ -19,9 +19,7 @@
 import org.metafacture.formatting.ObjectTemplate;
 import org.metafacture.framework.MetafactureException;
 import org.metafacture.framework.ObjectReceiver;
-import org.metafacture.framework.Sender;
 import org.metafacture.framework.helpers.DefaultStreamPipe;
-import org.metafacture.mangling.DuplicateObjectFilter;
 import org.metafacture.mangling.StreamFlattener;
 import org.metafacture.triples.AbstractTripleSort.Compare;
 import org.metafacture.triples.AbstractTripleSort.Order;
@@ -36,16 +34,16 @@
  *
  * @author Fabian Steeg
  */
-/* package-private */ class MetafixStreamAnalyzer extends DefaultStreamPipe<ObjectReceiver<String>> { // checkstyle-disable-line ClassDataAbstractionCoupling
+/* package-private */ class MetafixStreamAnalyzer extends DefaultStreamPipe<ObjectReceiver<String>> {
 
     private Metafix fix;
     private boolean count = true;
     private Compare countBy;
     private String countedTemplate;
-    private String uncountedTemplate;
+    private String uncountedTemplate = "${s}";
 
     /* package-private */ MetafixStreamAnalyzer(final String fix, final Compare countBy,
-            final String countedTemplate, final String uncountedTemplate) {
+            final String countedTemplate) {
         try {
             this.fix = new Metafix(fix);
             this.fix.setRepeatedFieldsToEntities(true);
@@ -55,29 +53,17 @@
         }
         this.countBy = countBy;
         this.countedTemplate = countedTemplate;
-        this.uncountedTemplate = uncountedTemplate;
     }
 
     @Override
     protected void onSetReceiver() {
-        final StreamToTriples triples = fix
-                .setReceiver(new StreamFlattener())
-                .setReceiver(new StreamToTriples());
-        (count ? counted(triples) : unique(triples))
-                .setReceiver(getReceiver());
-    }
-
-    private Sender<ObjectReceiver<String>> counted(final StreamToTriples triples) {
-        return triples
-                .setReceiver(tripleCount())
-                .setReceiver(tripleSort())
-                .setReceiver(new ObjectTemplate<>(countedTemplate));
-    }
-
-    private Sender<ObjectReceiver<String>> unique(final StreamToTriples triples) {
-        return triples
-                .setReceiver(new ObjectTemplate<>(uncountedTemplate))
-                .setReceiver(new DuplicateObjectFilter<>());
+        fix
+            .setReceiver(new StreamFlattener())
+            .setReceiver(new StreamToTriples())
+            .setReceiver(tripleCount())
+            .setReceiver(tripleSort())
+            .setReceiver(new ObjectTemplate<>(count ? countedTemplate : uncountedTemplate))
+            .setReceiver(getReceiver());
     }
 
     private TripleCount tripleCount() {

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

@@ -55,9 +55,9 @@ public void testShouldListPaths() {
     public void testShouldListPathsNoCount() {
         lister.setCount(false);
         verify(
-            "a",
+            "c.*",
             "b.*",
-            "c.*");
+            "a");
     }
 
     @Test

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

@@ -98,8 +98,8 @@ public void testShouldListPathsDontCount() {
         lister.setCount(false);
         verify(
             "cC",
-            "cB",
-            "cA");
+            "cA",
+            "cB");
     }
 
     private void processRecord() {
@@ -111,10 +111,10 @@ private void processRecord() {
         lister.literal("b", "bB");
         lister.literal("b", "bA");
         lister.literal("c", "cC");
-        lister.literal("c", "cC");
-        lister.literal("c", "cC");
         lister.literal("c", "cB");
+        lister.literal("c", "cC");
         lister.literal("c", "cA");
+        lister.literal("c", "cC");
         lister.endRecord();
         lister.closeStream();
     }
@@ -126,6 +126,9 @@ private void verify(final String... result) throws MockitoAssertionError {
             for (final String r : result) {
                 ordered.verify(receiver).process(r);
             }
+            ordered.verify(receiver, Mockito.times(2)).closeStream();
+            ordered.verifyNoMoreInteractions();
+            Mockito.verifyNoMoreInteractions(receiver);
         }
         catch (final MockitoAssertionError e) {
             System.out.println(Mockito.mockingDetails(receiver).printInvocations());