move commentFilePath to an extension point

Author: bjoernhaeuser

src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java

@@ -35,7 +35,6 @@
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildLog;
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage;
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus;
-import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbCommentFile;
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbPublishJenkinsUrl;
 import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
 import org.kohsuke.github.GHCommitState;
@@ -212,11 +211,6 @@ public GhprbTrigger(String adminlist,
         this.permitAll = permitAll;
         this.autoCloseFailedPullRequests = autoCloseFailedPullRequests;
         this.displayBuildErrorsOnDownstreamBuilds = displayBuildErrorsOnDownstreamBuilds;
-
-        if (commentFilePath != null) {
-            extensions.add(new GhprbCommentFile(commentFilePath));
-        }
-
         this.skipBuildPhrase = skipBuildPhrase;
         this.blackListCommitAuthor = blackListCommitAuthor;
         this.whiteListTargetBranches = whiteListTargetBranches;

src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbCommentFilePathContext.java

@@ -0,0 +1,18 @@
+package org.jenkinsci.plugins.ghprb.jobdsl;
+
+import javaposse.jobdsl.dsl.Context;
+
+class GhprbCommentFilePathContext implements Context {
+    private String commentFilePath;
+
+    public String getCommentFilePath() {
+        return commentFilePath;
+    }
+
+    /**
+     * sets the path to the comment file
+     */
+    public void commentFilePath(String commentFilePath) {
+        this.commentFilePath = commentFilePath;
+    }
+}

src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbContextExtensionPoint.java

@@ -30,7 +30,7 @@ public Object githubPullRequest(Runnable closure) throws ANTLRException {
                 context.permitAll,
                 context.autoCloseFailedPullRequests,
                 context.displayBuildErrorsOnDownstreamBuilds,
-                context.commentFilePath,
+                null,
                 context.skipBuildPhrase,
                 context.blackListCommitAuthor,
                 context.whiteListTargetBranches,

src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbExtensionContext.java

@@ -4,6 +4,7 @@
 import javaposse.jobdsl.plugin.ContextExtensionPoint;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
 import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus;
+import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbCommentFile;
 import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
 
 import java.util.ArrayList;
@@ -40,6 +41,16 @@ void buildStatus(Runnable closure) {
         extensions.add(new GhprbBuildStatus(context.getCompletedStatus()));
     }
 
+    /**
+     * Adds comment file path handling
+     */
+    void commentFilePath(Runnable closure) {
+        GhprbCommentFilePathContext context = new GhprbCommentFilePathContext();
+        ContextExtensionPoint.executeInContext(closure, context);
+
+        extensions.add(new GhprbCommentFile(context.getCommentFilePath()));
+    }
+
     public List<GhprbExtension> getExtensions() {
         return extensions;
     }

src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbTriggerContext.java

@@ -42,8 +42,6 @@ class GhprbTriggerContext implements Context {
 
     boolean displayBuildErrorsOnDownstreamBuilds;
 
-    String commentFilePath;
-
     String buildDescriptionTemplate;
 
     String includedRegions;
@@ -279,20 +277,6 @@ public void displayBuildErrorsOnDownstreamBuilds() {
         displayBuildErrorsOnDownstreamBuilds(true);
     }
 
-    /**
-     * Pubilsh this comment file to the github PR
-     */
-    public void commentFilePath(String commentFilePath) {
-        this.commentFilePath = commentFilePath;
-    }
-
-    /**
-     * Pubilsh this comment file to the github PR
-     */
-    public void commentFilePath() {
-        commentFilePath("");
-    }
-
     /**
      * When filled, changes the default build description template
      */