1 files changed, 49 insertions, 10 deletions

diff --git a/src/main/java/org/jenkinsci/plugins/activemq/ActiveMqBuildTrigger.java b/src/main/java/org/jenkinsci/plugins/activemq/ActiveMqBuildTrigger.java
index 08a6faf..ad9d06f 100644
--- a/src/main/java/org/jenkinsci/plugins/activemq/ActiveMqBuildTrigger.java
+++ b/src/main/java/org/jenkinsci/plugins/activemq/ActiveMqBuildTrigger.java
@@ -2,8 +2,11 @@ package org.jenkinsci.plugins.activemq;
 
 import hudson.Extension;
 import hudson.model.AbstractProject;
+import hudson.model.BooleanParameterValue;
 import hudson.model.BuildableItem;
 import hudson.model.Item;
+import hudson.model.ParameterValue;
+import hudson.model.StringParameterValue;
 import hudson.triggers.Trigger;
 import hudson.triggers.TriggerDescriptor;
 import hudson.util.FormValidation;
@@ -15,11 +18,14 @@ import org.slf4j.Logger;
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 import static java.lang.Boolean.TRUE;
 import static java.util.Collections.singletonMap;
+import static org.apache.commons.lang.StringUtils.trimToEmpty;
 import static org.apache.commons.lang.StringUtils.trimToNull;
 import static org.jenkinsci.plugins.activemq.ActiveMqClient.BuildRequest;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -28,6 +34,8 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
 
     private static final Logger log = getLogger(ActiveMqBuildTrigger.class);
 
+    public static final String FUNCTION_NAME = "match";
+
     private String expression;
 
     private transient ActiveMqPlugin plugin;
@@ -72,7 +80,7 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
 
             engine.eval(expression);
 
-            if (checkEngine(engine)) {
+            if (!checkEngine(engine)) {
                 log.warn("Invalid expression: {}", expression);
             }
         } catch (Exception e) {
@@ -80,24 +88,55 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
         }
     }
 
-    public boolean matches(BuildRequest req) {
+    public DoBuildResponse matches(BuildRequest req) {
         if (engine == null) {
-            return false;
+            return new DoBuildResponse.NoBuild();
         }
 
         Map<String, String> parameters = new TreeMap<String, String>(req.parameters);
         Map<String, Map<String, String>> context = singletonMap("parameters", parameters);
         try {
-            Object o = ((Invocable) engine).invokeFunction("match", parameters);
+            Object o = ((Invocable) engine).invokeFunction(FUNCTION_NAME, parameters);
 
             log.info("o = " + o);
+            if (o != null) {
+                log.info("o.getClass() = " + o.getClass());
+            }
 
-            Boolean b = null;
             if (o instanceof Boolean) {
-                b = (Boolean) o;
+                Boolean b = (Boolean) o;
+                if (b) {
+                    return new DoBuildResponse.Build();
+                }
+            } else if (o instanceof Map) {
+                Map<?, ?> map = (Map) o;
+                List<ParameterValue> buildParameters = new ArrayList<ParameterValue>();
+                for (Map.Entry e : map.entrySet()) {
+                    Object key = e.getKey();
+                    if (key == null || !(key instanceof String)) {
+                        continue;
+                    }
+
+                    String k = trimToNull(key.toString());
+                    if (k == null) {
+                        continue;
+                    }
+
+                    Object value = e.getValue();
+                    if (value instanceof Boolean) {
+                        Boolean b = (Boolean) value;
+                        buildParameters.add(new BooleanParameterValue(k, b));
+                    } else if (value instanceof String) {
+                        String v = trimToEmpty(value.toString());
+
+                        buildParameters.add(new StringParameterValue(k, v));
+                    }
+                }
+
+                return new DoBuildResponse.BuildWithParameters(buildParameters);
             }
 
-            return b != null && b;
+            return new DoBuildResponse.NoBuild();
         } catch (Exception e) {
             log.warn("Could not evaluate expression:");
             log.warn(expression);
@@ -106,7 +145,7 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
                 log.warn("{} = {}", entry.getKey(), entry.getValue());
             }
             log.warn("Exception", e);
-            return false;
+            return new DoBuildResponse.NoBuild();
         }
     }
 
@@ -140,7 +179,7 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
                     return FormValidation.ok();
                 }
 
-                return FormValidation.warning("The expression must define a function named 'match'");
+                return FormValidation.warning("The expression must define a function named '" + FUNCTION_NAME + "'");
             } catch (ScriptException e) {
                 return FormValidation.error("Could not evaluate expression: " + e.getMessage());
             } catch (Exception e) {
@@ -150,7 +189,7 @@ public class ActiveMqBuildTrigger extends Trigger<AbstractProject> {
     }
 
     private static boolean checkEngine(ScriptEngine engine) throws ScriptException {
-        Object o = engine.eval("typeof match === 'function'");
+        Object o = engine.eval("typeof " + FUNCTION_NAME + " === 'function'");
 
         return TRUE.equals(o);
     }