Merge branch 'master' into yaml-pipelines

ke4roh · Aug 29, 2019 · 71825df · 71825df
2 parents a439d1a + 8eae215
commit 71825df
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -168,6 +168,18 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/src/main/java/com/redhat/vertx/pipeline/templates/JinjaRe.java b/src/main/java/com/redhat/vertx/pipeline/templates/JinjaRe.java
@@ -1,6 +1,8 @@
 package com.redhat.vertx.pipeline.templates;
 
+import com.hubspot.jinjava.interpret.InvalidInputException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import com.hubspot.jinjava.interpret.TemplateSyntaxException;
 import com.hubspot.jinjava.lib.fn.ELFunction;
 import com.hubspot.jinjava.lib.filter.Filter;
 import org.kohsuke.MetaInfServices;
@@ -28,7 +30,13 @@ public static class MatchFilter implements Filter {
 
         @Override
         public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
-            assert args.length == 1;
+            if (var == null) {
+                return null;
+                // throw new InvalidInputException(interpreter,getName(),getName() + " pipe input cannot be null");
+            }
+            if (args.length != 1) {
+                throw new TemplateSyntaxException(interpreter, getName(), "requires 1 argument (the pattern)");
+            }
             return match((String) var, args[0]);
         }
 
@@ -43,6 +51,12 @@ public static class ReplaceFilter implements Filter {
 
         @Override
         public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
+            if (var == null) {
+                return null;
+            }
+            if (args.length != 2) {
+                throw new TemplateSyntaxException(interpreter, getName(), "requires 2 arguments (pattern, new_content)");
+            }
             assert args.length == 2;
             return substitute((String)var, args[0], args[1]);
         }