Merge pull request #236 from metafacture/164-implementMultipleElsifStatements

Implement multiple `elsif` statements in `if` conditional.

Author: blackwinter

metafix/src/main/java/org/metafacture/metafix/Fix.xtext

@@ -24,7 +24,7 @@ Unless:
 If:
   'if' name = QualifiedName '(' ( params += (QualifiedName|STRING) ( ',' params += (QualifiedName|STRING) )* ','? )? ( options = Options )? ')'
     elements += Expression*
-  elseIf = ElsIf?
+  elseIf += ElsIf*
   else = Else?
   'end'
 ;

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

@@ -45,6 +45,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * Transform a record using a {@link Fix}.
@@ -112,33 +113,20 @@ private void processDo(final Do expression, final Params params, final Options o
     }
 
     private void processIf(final If ifExpression, final Params ifParams, final Options ifOptions) {
-        final ElsIf elseIfExpression = ifExpression.getElseIf();
+        final List<ElsIf> elseIfExpressions = ifExpression.getElseIf();
         final Else elseExpression = ifExpression.getElse();
 
-        final Supplier<String> elseIfMessageSupplier = () -> executionExceptionMessage(elseIfExpression, elseIfExpression.eResource());
+        final List<Supplier<String>> elseIfMessageSuppliers = mapList(elseIfExpressions, e -> () -> executionExceptionMessage(e, e.eResource()));
         final Supplier<String> elseMessageSupplier = () -> executionExceptionMessage(elseExpression, elseExpression.eResource());
 
         processFix(() -> executionExceptionMessage(ifExpression, ifExpression.eResource()), () -> {
             final FixPredicate ifPredicate = getInstance(ifExpression.getName(), FixPredicate.class, FixConditional::valueOf);
             final RecordTransformer ifTransformer = new RecordTransformer(metafix, ifExpression.getElements());
 
-            final FixPredicate elseIfPredicate;
-            final Params elseIfParams;
-            final Options elseIfOptions;
-            final RecordTransformer elseIfTransformer;
-
-            if (elseIfExpression != null) {
-                elseIfPredicate = getInstance(elseIfExpression.getName(), FixPredicate.class, FixConditional::valueOf);
-                elseIfParams = new Params(elseIfExpression.getParams(), vars);
-                elseIfOptions = new Options(elseIfExpression.getOptions(), vars);
-                elseIfTransformer = new RecordTransformer(metafix, elseIfExpression.getElements());
-            }
-            else {
-                elseIfPredicate = null;
-                elseIfParams = null;
-                elseIfOptions = null;
-                elseIfTransformer = null;
-            }
+            final List<FixPredicate> elseIfPredicates = mapList(elseIfExpressions, e -> getInstance(e.getName(), FixPredicate.class, FixConditional::valueOf));
+            final List<Params> elseIfParamsList = mapList(elseIfExpressions, e -> new Params(e.getParams(), vars));
+            final List<Options> elseIfOptionsList = mapList(elseIfExpressions, e -> new Options(e.getOptions(), vars));
+            final List<RecordTransformer> elseIfTransformers = mapList(elseIfExpressions, e -> new RecordTransformer(metafix, e.getElements()));
 
             final RecordTransformer elseTransformer = elseExpression != null ? new RecordTransformer(metafix, elseExpression.getElements()) : null;
 
@@ -147,8 +135,15 @@ private void processIf(final If ifExpression, final Params ifParams, final Optio
                     ifTransformer.transform(record);
                 }
                 else {
-                    if (elseIfExpression != null) {
-                        currentMessageSupplier = elseIfMessageSupplier;
+                    for (int i = 0; i < elseIfExpressions.size(); ++i) {
+                        currentMessageSupplier = elseIfMessageSuppliers.get(i);
+
+                        final ElsIf elseIfExpression = elseIfExpressions.get(i);
+
+                        final FixPredicate elseIfPredicate = elseIfPredicates.get(i);
+                        final Params elseIfParams = elseIfParamsList.get(i);
+                        final Options elseIfOptions = elseIfOptionsList.get(i);
+                        final RecordTransformer elseIfTransformer = elseIfTransformers.get(i);
 
                         if (elseIfPredicate.test(metafix, record, elseIfParams.resolve(), elseIfOptions.resolve())) {
                             elseIfTransformer.transform(record);
@@ -189,6 +184,10 @@ private <T> T getInstance(final String name, final Class<T> baseType, final Func
         return name.contains(".") ? ReflectionUtil.loadClass(name, baseType).newInstance() : enumFunction.apply(name);
     }
 
+    private <T, R> List<R> mapList(final List<T> list, final Function<T, R> function) {
+        return list.stream().map(function).collect(Collectors.toList());
+    }
+
     private void processFix(final Supplier<String> messageSupplier, final Supplier<Consumer<Record>> consumerSupplier) {
         currentMessageSupplier = messageSupplier;
 

metafix/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java

@@ -14,6 +14,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 public class FixInterpreter extends XbaseInterpreter {
 
     private static final Logger LOG = LoggerFactory.getLogger(FixInterpreter.class);
@@ -50,8 +52,8 @@ private void process(final Expression expression) { // checkstyle-disable-line C
                 process(element);
             }
 
-            final ElsIf elseIfExpression = ifExpression.getElseIf();
-            if (elseIfExpression != null) {
+            final List<ElsIf> elseIfExpressions = ifExpression.getElseIf();
+            for (final ElsIf elseIfExpression : elseIfExpressions) {
                 LOG.debug("else if: " + elseIfExpression);
 
                 for (final Expression element : elseIfExpression.getElements()) {

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

@@ -538,6 +538,72 @@ public void ifAnyMatchElsif() {
             });
     }
 
+    @Test
+    public void ifAnyMatchMultipleElsif() {
+        MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                "if any_match('name', '.*University.*')",
+                "  add_field('type', 'Organization')",
+                "elsif any_match('name', 'Mary')",
+                "  add_field('type', 'Person1')",
+                "elsif any_match('name', 'Max')",
+                "  add_field('type', 'Person2')",
+                "elsif any_match('name', '[^ ]* [^ ]*')",
+                "  add_field('type', 'Person')",
+                "else",
+                "  add_field('type', 'Unknown')",
+                "end"),
+            i -> {
+                i.startRecord("1");
+                i.literal("name", "Mary Power");
+                i.literal("name", "Max Power");
+                i.endRecord();
+
+                i.startRecord("2");
+                i.literal("name", "Some University");
+                i.endRecord();
+
+                i.startRecord("3");
+                i.literal("name", "Filibandrina");
+                i.endRecord();
+
+                i.startRecord("4");
+                i.literal("name", "Mary");
+                i.literal("name", "Max Power");
+                i.endRecord();
+
+                i.startRecord("5");
+                i.literal("name", "Max");
+                i.endRecord();
+            }, o -> {
+                o.get().startRecord("1");
+                o.get().literal("name", "Mary Power");
+                o.get().literal("name", "Max Power");
+                o.get().literal("type", "Person");
+                o.get().endRecord();
+
+                o.get().startRecord("2");
+                o.get().literal("name", "Some University");
+                o.get().literal("type", "Organization");
+                o.get().endRecord();
+
+                o.get().startRecord("3");
+                o.get().literal("name", "Filibandrina");
+                o.get().literal("type", "Unknown");
+                o.get().endRecord();
+
+                o.get().startRecord("4");
+                o.get().literal("name", "Mary");
+                o.get().literal("name", "Max Power");
+                o.get().literal("type", "Person1");
+                o.get().endRecord();
+
+                o.get().startRecord("5");
+                o.get().literal("name", "Max");
+                o.get().literal("type", "Person2");
+                o.get().endRecord();
+            });
+    }
+
     private void shouldEqualAny(final String path) {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "if any_equal('" + path + "', 'University')",