Resolve variables in options. (#200)

Author: blackwinter

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

@@ -71,12 +71,12 @@ public class Metafix implements StreamPipe<StreamReceiver>, Maps { // checkstyle
     private final List<Closeable> resources = new ArrayList<>();
     private final List<Expression> expressions = new ArrayList<>();
     private final Map<String, Map<String, String>> maps = new HashMap<>();
+    private final Map<String, String> vars = new HashMap<>();
     private final RecordTransformer recordTransformer = new RecordTransformer(this);
     private final StreamFlattener flattener = new StreamFlattener();
 
     private Fix fix;
     private List<Value> entities = new ArrayList<>();
-    private Map<String, String> vars = new HashMap<>();
     private Record currentRecord = new Record();
     private StreamReceiver outputStreamReceiver;
     private String fixFile;

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

@@ -57,12 +57,14 @@ public class RecordTransformer { // checkstyle-disable-line ClassFanOutComplexit
 
     private static final Logger LOG = LoggerFactory.getLogger(RecordTransformer.class);
 
+    private final Map<String, String> vars;
     private final Metafix metafix;
 
     private Record record;
 
     /*package-private*/ RecordTransformer(final Metafix metafix) {
         this.metafix = metafix;
+        vars = metafix.getVars();
     }
 
     /*package-private*/ Record transform(final Fix fix) {
@@ -194,10 +196,11 @@ private String executionExceptionMessage(final EObject object, final Resource re
     }
 
     private List<String> resolveParams(final List<String> params) {
-        final Map<String, String> vars = metafix.getVars();
+        return params.stream().map(this::resolveVars).collect(Collectors.toList());
+    }
 
-        return params.stream().map(s -> s == null ? null :
-                StringUtil.format(s, Metafix.VAR_START, Metafix.VAR_END, false, vars)).collect(Collectors.toList());
+    private String resolveVars(final String value) {
+        return value == null ? null : StringUtil.format(value, Metafix.VAR_START, Metafix.VAR_END, false, vars);
     }
 
     private Map<String, String> options(final Options options) {
@@ -208,7 +211,7 @@ private Map<String, String> options(final Options options) {
             final List<String> values = options.getValues();
 
             for (int i = 0; i < keys.size(); i += 1) {
-                map.put(keys.get(i), values.get(i));
+                map.put(resolveVars(keys.get(i)), resolveVars(values.get(i)));
             }
         }
 

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

@@ -85,10 +85,41 @@ public void shouldResolveVariablesInMultipleVariables() {
     }
 
     @Test
-    public void shouldNotResolveVariablesInMultipleVariablesFromMap() {
-        assertVar("put_vars(varName: 'value$[var]', '$[varName]Var': 'value2')",
+    public void shouldResolveVariablesInOptionsKeys() {
+        assertVar("put_vars('varName$[var]': 'value')",
                 ImmutableMap.of("var", "1"),
-                ImmutableMap.of("varName", "value$[var]", "$[varName]Var", "value2"));
+                ImmutableMap.of("varName1", "value"));
+    }
+
+    @Test
+    public void shouldResolveVariablesInOptionsValues() {
+        assertVar("put_vars('varName': 'value$[var]')",
+                ImmutableMap.of("var", "1"),
+                ImmutableMap.of("varName", "value1"));
+    }
+
+    @Test
+    public void shouldResolveVariablesInOptionsFromPreviousMap() {
+        assertVar("put_vars('varName': 'value$[var]')\nput_vars('$[varName]Var': 'value2')",
+                ImmutableMap.of("var", "1"),
+                ImmutableMap.of("varName", "value1", "value1Var", "value2"));
+    }
+
+    @Test
+    public void shouldNotResolveVariablesInOptionsFromCurrentMap() {
+        MetafixTestHelpers.assertThrowsCause(IllegalArgumentException.class, "Variable 'varName' was not assigned!\nAssigned variables:\n{var=1}", () ->
+            MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                    "put_vars(varName: 'value$[var]', '$[varName]Var': 'value2')"
+                ),
+                ImmutableMap.of("var", "1"),
+                i -> {
+                    i.startRecord("");
+                    i.endRecord();
+                },
+                o -> {
+                }
+            )
+        );
     }
 
     @Test