[JENKINS-46064] Adapt to the new parser engine

jenkinsci · Aug 17, 2017 · e2d67cc · e2d67cc
1 parent cdf2d8f
commit e2d67cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/...n/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangelogConditional.java b/...n/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangelogConditional.java
@@ -26,11 +26,15 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition.when.impl;
 
 import hudson.Extension;
+import org.codehaus.groovy.ast.expr.Expression;
 import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTWhenContent;
+import org.jenkinsci.plugins.pipeline.modeldefinition.parser.ASTParserUtils;
 import org.jenkinsci.plugins.pipeline.modeldefinition.when.DeclarativeStageConditional;
 import org.jenkinsci.plugins.pipeline.modeldefinition.when.DeclarativeStageConditionalDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import javax.annotation.CheckForNull;
 import java.util.regex.Pattern;
 
 /**
@@ -62,6 +66,9 @@ public Pattern getMultiLinePattern() {
     @Extension
     @Symbol("changelog")
     public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangelogConditional> {
-
+        @Override
+        public Expression transformToRuntimeAST(@CheckForNull ModelASTWhenContent original) {
+            return ASTParserUtils.transformWhenContentToRuntimeAST(original);
+        }
     }
 }
diff --git a/...n/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangesetConditional.java b/...n/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangesetConditional.java
@@ -26,12 +26,17 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition.when.impl;
 
 import hudson.Extension;
+import org.codehaus.groovy.ast.expr.Expression;
 import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTWhenContent;
+import org.jenkinsci.plugins.pipeline.modeldefinition.parser.ASTParserUtils;
 import org.jenkinsci.plugins.pipeline.modeldefinition.when.DeclarativeStageConditional;
 import org.jenkinsci.plugins.pipeline.modeldefinition.when.DeclarativeStageConditionalDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
+import javax.annotation.CheckForNull;
+
 /**
  * Conditional that checks the affected file paths recorded in the changelog.
  *
@@ -64,6 +69,9 @@ public void setCaseSensitive(boolean caseSensitive) {
     @Extension
     @Symbol("changeset")
     public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangesetConditional> {
-
+        @Override
+        public Expression transformToRuntimeAST(@CheckForNull ModelASTWhenContent original) {
+            return ASTParserUtils.transformWhenContentToRuntimeAST(original);
+        }
     }
 }
diff --git a/...rg/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangesetConditionalScript.groovy b/...rg/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangesetConditionalScript.groovy
@@ -39,8 +39,7 @@ class ChangesetConditionalScript extends AbstractChangelogConditionalScript<Chan
 
     @Override
     void initializeEval() {
-        glob = (String)script.evaluate(Utils.prepareForEvalToString(describable.glob)) //TODO change when #174 lands
-        glob = glob.replace('\\', '/')
+        glob = describable.glob.replace('\\', '/')
     }
 
     @Override