Rearrange error collector

Author: abayer

pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/model/DeclarativeDirective.java

@@ -26,12 +26,15 @@
 
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import hudson.model.Run;
 import jenkins.model.Jenkins;
 import org.codehaus.groovy.ast.expr.Expression;
 import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTElement;
 import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTPipelineDef;
+import org.jenkinsci.plugins.pipeline.modeldefinition.validator.ErrorCollector;
 import org.jenkinsci.plugins.pipeline.modeldefinition.validator.ModelValidator;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 public abstract class DeclarativeDirective<D extends DeclarativeDirective<D>> extends ModelASTElement implements Describable<D> {
@@ -68,7 +71,9 @@ public Preprocessor(Object sourceLocation) {
             super(sourceLocation);
         }
 
-        public abstract ModelASTPipelineDef process(@Nonnull ModelASTPipelineDef pipelineDef);
+        public abstract ModelASTPipelineDef process(@Nonnull ModelASTPipelineDef pipelineDef,
+                                                    @Nonnull ErrorCollector errorCollector,
+                                                    @CheckForNull Run<?,?> build);
     }
 
 }

pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ErrorCollector.java

@@ -0,0 +1,24 @@
+package org.jenkinsci.plugins.pipeline.modeldefinition.validator;
+
+import net.sf.json.JSONArray;
+import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTElement;
+import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTMarkerInterface;
+
+import java.util.List;
+
+/**
+ * Abstract class for collecting parse-time errors.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class ErrorCollector {
+    public abstract void error(ModelASTElement src, String message);
+
+    public abstract void error(ModelASTMarkerInterface src, String message);
+
+    public abstract int getErrorCount();
+
+    public abstract List<String> errorsAsStrings();
+
+    public abstract JSONArray asJson();
+}

pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy

@@ -209,7 +209,7 @@ class ModelParser implements Parser {
 
             additionalDirectives.each { d ->
                 if (d instanceof DeclarativeDirective.Preprocessor) {
-                    pipelineDef = d.process(pipelineDef)
+                    pipelineDef = d.process(pipelineDef, errorCollector, build)
                 }
             }