Fix destination option for lookup() Fix function. (#269)

Also add `prefix` option.

Author: blackwinter

README.md

@@ -575,6 +575,7 @@ Additional options when printing unknown values:
 - `footer`: Footer which is written at the end of the output. (Default: `\n`)
 - `header`: Header which is written at the beginning of the output. (Default: Empty string)
 - `id`: Field name which contains the record ID; if found, will be available for inclusion in `destination`. (Default: `_id`)
+- `prefix`: Prefix to print before the unknown value; may include [format directives](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html#syntax) for counter and record ID (in that order). (Default: Empty string)
 - `separator`: Separator which is written after the unknown value. (Default: `\n`)
 
 ```perl

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

@@ -16,8 +16,6 @@
 
 package org.metafacture.metafix;
 
-import org.metafacture.framework.StandardEventNames;
-import org.metafacture.io.ObjectWriter;
 import org.metafacture.metafix.api.FixFunction;
 import org.metafacture.metamorph.api.Maps;
 import org.metafacture.metamorph.functions.ISBN;
@@ -242,31 +240,25 @@ private boolean literalString(final String s) {
 
         @Override
         public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
-            final Value idValue = record.get(options.getOrDefault("id", StandardEventNames.ID));
-
             final boolean internal = getBoolean(options, "internal");
             final boolean pretty = getBoolean(options, "pretty");
 
-            final LongAdder counter = scopedCounter.computeIfAbsent(metafix, k -> new LongAdder());
-            counter.increment();
-
-            final UnaryOperator<String> formatter = s -> String.format(s,
-                    counter.sum(), Value.isNull(idValue) ? "" : idValue.toString());
-
-            final String prefix = params.isEmpty() ? "" : formatter.apply(params.get(0));
+            if (!params.isEmpty()) {
+                options.put("prefix", params.get(0));
+            }
 
-            withWriter(options, formatter, w -> {
+            withWriter(metafix, record, options, scopedCounter, c -> {
                 if (internal) {
                     if (pretty) {
-                        record.forEach((f, v) -> w.process(prefix + f + "=" + v));
+                        record.forEach((f, v) -> c.accept(f + "=" + v));
                     }
                     else {
-                        w.process(prefix + record);
+                        c.accept(record.toString());
                     }
                 }
                 else {
                     try {
-                        w.process(prefix + record.toJson(pretty));
+                        c.accept(record.toJson(pretty));
                     }
                     catch (final IOException e) {
                         // Log a warning? Print string representation instead?
@@ -474,6 +466,8 @@ public void apply(final Metafix metafix, final Record record, final List<String>
         }
     },
     lookup {
+        private final Map<Metafix, LongAdder> scopedCounter = new HashMap<>();
+
         @Override
         public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
             final Map<String, String> map;
@@ -500,14 +494,14 @@ public void apply(final Metafix metafix, final Record record, final List<String>
             final boolean delete = getBoolean(options, "delete");
             final boolean printUnknown = getBoolean(options, "print_unknown");
 
-            final Consumer<ObjectWriter<String>> consumer = w -> record.transform(params.get(0), oldValue -> {
+            final Consumer<Consumer<String>> consumer = c -> record.transform(params.get(0), oldValue -> {
                 final String newValue = map.get(oldValue);
                 if (newValue != null) {
                     return newValue;
                 }
                 else {
-                    if (w != null) {
-                        w.process(oldValue);
+                    if (c != null) {
+                        c.accept(oldValue);
                     }
 
                     return defaultValue != null ? defaultValue : delete ? null : oldValue;
@@ -516,7 +510,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
 
             if (printUnknown) {
                 options.putIfAbsent("append", "true");
-                withWriter(options, null, consumer);
+                withWriter(metafix, record, options, scopedCounter, consumer);
             }
             else {
                 consumer.accept(null);

metafix/src/main/java/org/metafacture/metafix/api/FixFunction.java

@@ -16,6 +16,7 @@
 
 package org.metafacture.metafix.api;
 
+import org.metafacture.framework.StandardEventNames;
 import org.metafacture.io.ObjectWriter;
 import org.metafacture.metafix.Metafix;
 import org.metafacture.metafix.Record;
@@ -25,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
@@ -64,6 +66,19 @@ default void withWriter(final Map<String, String> options, final UnaryOperator<S
         }
     }
 
+    default void withWriter(final Metafix metafix, final Record record, final Map<String, String> options, final Map<Metafix, LongAdder> scopedCounter, final Consumer<Consumer<String>> consumer) {
+        final Value idValue = record.get(options.getOrDefault("id", StandardEventNames.ID));
+
+        final LongAdder counter = scopedCounter.computeIfAbsent(metafix, k -> new LongAdder());
+        counter.increment();
+
+        final UnaryOperator<String> formatter = s -> String.format(s,
+                counter.sum(), Value.isNull(idValue) ? "" : idValue.toString());
+
+        final String prefix = formatter.apply(options.getOrDefault("prefix", ""));
+        withWriter(options, formatter, w -> consumer.accept(s -> w.process(prefix + s)));
+    }
+
     default boolean getBoolean(final Map<String, String> options, final String key) {
         return Boolean.parseBoolean(options.get(key));
     }

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

@@ -854,6 +854,7 @@ private void shouldPrintUnknown(final String args, final String defaultValue, fi
                 ),
                 i -> {
                     i.startRecord("rec1");
+                    i.literal("name", "moe");
                     i.literal("title", "Aloha");
                     i.literal("title", "Moin");
                     i.literal("title", "Hey");
@@ -862,6 +863,7 @@ private void shouldPrintUnknown(final String args, final String defaultValue, fi
                     i.endRecord();
 
                     i.startRecord("rec2");
+                    i.literal("name", "joe");
                     i.literal("title", "Aloha");
                     i.literal("title", "you");
                     i.literal("title", "too");
@@ -871,6 +873,7 @@ private void shouldPrintUnknown(final String args, final String defaultValue, fi
                     final boolean delete = "__delete".equals(defaultValue);
 
                     o.get().startRecord("rec1");
+                    o.get().literal("name", "moe");
                     o.get().literal("title", "Alohaeha");
                     o.get().literal("title", "Moin zäme");
 
@@ -886,6 +889,7 @@ else if (!delete) {
                     o.get().endRecord();
 
                     o.get().startRecord("rec2");
+                    o.get().literal("name", "joe");
                     o.get().literal("title", "Alohaeha");
 
                     if (defaultValue == null) {
@@ -917,6 +921,16 @@ public void shouldPrintUnknownWithDelete() {
         shouldPrintUnknown(", delete: 'true'", "__delete", "Hey\nyou\nthere\nyou\ntoo\n");
     }
 
+    @Test
+    public void shouldPrintUnknownWithPrefix() {
+        shouldPrintUnknown(", prefix: '<%d:%s>'", null, "<1:rec1>Hey\n<1:rec1>you\n<1:rec1>there\n<2:rec2>you\n<2:rec2>too\n");
+    }
+
+    @Test
+    public void shouldPrintUnknownWithPrefixAndIdField() {
+        shouldPrintUnknown(", prefix: '<%d:%s>', id: 'name'", null, "<1:moe>Hey\n<1:moe>you\n<1:moe>there\n<2:joe>you\n<2:joe>too\n");
+    }
+
     @Test
     public void shouldPrintUnknownWithHeader() {
         shouldPrintUnknown(", header: '<%d:%s>'", null, "<%d:%s>Hey\nyou\nthere\n<%d:%s>you\ntoo\n");