*.java

- Serialization fixes for the reported issue jenkinsci#55

Author: aaronjwhiteside

src/main/java/org/jenkinsci/plugins/pipeline/github/CommitFileGroovyObject.java

@@ -19,9 +19,7 @@ public class CommitFileGroovyObject extends GroovyObjectSupport implements Seria
     private final CommitFile file;
 
     CommitFileGroovyObject(final CommitFile file) {
-        Objects.requireNonNull(file, "file cannot be null");
-
-        this.file = file;
+        this.file = Objects.requireNonNull(file, "file cannot be null");
     }
 
     @Whitelisted

src/main/java/org/jenkinsci/plugins/pipeline/github/CommitGroovyObject.java

@@ -43,20 +43,27 @@
 public class CommitGroovyObject extends GroovyObjectSupport implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private final String jobId;
     private final RepositoryCommit commit;
-    private final ExtendedCommitService commitService;
     private final RepositoryId base;
 
-    CommitGroovyObject(final RepositoryCommit commit,
+    private transient ExtendedCommitService commitService;
+
+    CommitGroovyObject(final String jobId,
+                       final RepositoryCommit commit,
                        final ExtendedCommitService commitService,
                        final RepositoryId base) {
-        Objects.requireNonNull(commit, "commit cannot be null");
-        Objects.requireNonNull(commitService, "commitService cannot be null");
-        Objects.requireNonNull(base, "base cannot be null");
+        this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
+        this.commit = Objects.requireNonNull(commit, "commit cannot be null");
+        this.commitService = Objects.requireNonNull(commitService, "commitService cannot be null");
+        this.base = Objects.requireNonNull(base, "base cannot be null");
+    }
 
-        this.commit = commit;
-        this.commitService = commitService;
-        this.base = base;
+    private ExtendedCommitService getCommitService() {
+        if (commitService == null) {
+            commitService = new ExtendedCommitService(GitHubHelper.getGitHubClient(GitHubHelper.getJob(jobId)));
+        }
+        return commitService;
     }
 
     @Whitelisted
@@ -111,16 +118,16 @@ public int getTotalChanges() {
     @Whitelisted
     public Iterable<ReviewCommentGroovyObject> getComments() {
         Stream<ReviewCommentGroovyObject> stream = StreamSupport.stream(
-                commitService.pageComments2(base, commit.getSha()).spliterator(), false)
+                getCommitService().pageComments2(base, commit.getSha()).spliterator(), false)
                 .flatMap(Collection::stream)
-                .map(c -> new ReviewCommentGroovyObject(c, base, commitService));
+                .map(c -> new ReviewCommentGroovyObject(jobId, base, c, commitService));
         return stream::iterator;
     }
 
     @Whitelisted
     public Iterable<CommitStatusGroovyObject> getStatuses() {
         try {
-            return commitService.getStatuses(base, commit.getSha())
+            return getCommitService().getStatuses(base, commit.getSha())
                     .stream()
                     .map(CommitStatusGroovyObject::new)
                     .collect(toList());
@@ -167,9 +174,10 @@ public ReviewCommentGroovyObject comment(final String body,
         comment.setPosition(position);
         try {
             return new ReviewCommentGroovyObject(
-                    commitService.addComment(base, commit.getSha(), comment),
+                    jobId,
                     base,
-                    commitService);
+                    getCommitService().addComment(base, commit.getSha(), comment),
+                    getCommitService());
         } catch (final IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -199,7 +207,7 @@ public CommitStatusGroovyObject createStatus(final String status,
         commitStatus.setTargetUrl(targetUrl);
         try {
             return new CommitStatusGroovyObject(
-                    commitService.createStatus(base, commit.getSha(), commitStatus));
+                    getCommitService().createStatus(base, commit.getSha(), commitStatus));
         } catch (final IOException e) {
             throw new UncheckedIOException(e);
         }

src/main/java/org/jenkinsci/plugins/pipeline/github/CommitStatusGroovyObject.java

@@ -20,9 +20,7 @@ public class CommitStatusGroovyObject extends GroovyObjectSupport implements Ser
     private final CommitStatus commitStatus;
 
     CommitStatusGroovyObject(final CommitStatus commitStatus) {
-        Objects.requireNonNull(commitStatus, "commitStatus cannot be null");
-
-        this.commitStatus = commitStatus;
+        this.commitStatus = Objects.requireNonNull(commitStatus, "commitStatus cannot be null");
     }
 
     @Whitelisted

src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java

@@ -3,6 +3,7 @@
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
 import hudson.model.Job;
+import jenkins.model.Jenkins;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMSource;
 import org.eclipse.egit.github.core.RepositoryId;
@@ -31,7 +32,7 @@ public class GitHubHelper {
 
     private final static Logger LOG = LoggerFactory.getLogger(GitHubHelper.class);
 
-    private GitHubHelper(){
+    private GitHubHelper() {
         // go away
     }
 
@@ -105,4 +106,12 @@ public static String userToLogin(final User user) {
         return user == null ? null : user.getLogin();
     }
 
+    public static Job getJob(final String jobId) {
+        final Job job = Jenkins.get().getItemByFullName(jobId, Job.class);
+        if (job == null) {
+            throw new IllegalStateException("Unable to find Job: " + jobId);
+        }
+        return job;
+    }
+
 }

src/main/java/org/jenkinsci/plugins/pipeline/github/IssueCommentGroovyObject.java

@@ -25,18 +25,27 @@
 public class IssueCommentGroovyObject extends GroovyObjectSupport implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private final String jobId;
     private final RepositoryId base;
-    private final IssueService issueService;
     private Comment comment;
 
-    IssueCommentGroovyObject(final Comment comment, final RepositoryId base, final IssueService issueService) {
-        Objects.requireNonNull(comment, "comment cannot be null");
-        Objects.requireNonNull(base, "base cannot be null");
-        Objects.requireNonNull(issueService, "issueService cannot be null");
+    private transient IssueService issueService;
 
-        this.comment = comment;
-        this.base = base;
-        this.issueService = issueService;
+    IssueCommentGroovyObject(final String jobId,
+                             final Comment comment,
+                             final RepositoryId base,
+                             final IssueService issueService) {
+        this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
+        this.comment = Objects.requireNonNull(comment, "comment cannot be null");
+        this.base = Objects.requireNonNull(base, "base cannot be null");
+        this.issueService = Objects.requireNonNull(issueService, "issueService cannot be null");
+    }
+
+    private IssueService getIssueService() {
+        if (issueService == null) {
+            issueService = new IssueService(GitHubHelper.getGitHubClient(GitHubHelper.getJob(jobId)));
+        }
+        return issueService;
     }
 
     @Whitelisted
@@ -85,7 +94,7 @@ public void setBody(final String body) {
         edit.setId(comment.getId());
         edit.setBody(body);
         try {
-            comment = issueService.editComment(base, edit);
+            comment = getIssueService().editComment(base, edit);
         } catch (final IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -94,7 +103,7 @@ public void setBody(final String body) {
     @Whitelisted
     public void delete() {
         try {
-            issueService.deleteComment(base, comment.getId());
+            getIssueService().deleteComment(base, comment.getId());
         } catch (final IOException e) {
             throw new UncheckedIOException(e);
         }

src/main/java/org/jenkinsci/plugins/pipeline/github/MilestoneGroovyObject.java

@@ -7,6 +7,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * Groovy wrapper over {@link Milestone}
@@ -17,10 +18,12 @@
 public class MilestoneGroovyObject extends GroovyObjectSupport implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private final String jobId;
     private final ExtendedMilestone milestone;
 
-    MilestoneGroovyObject(final ExtendedMilestone milestone) {
-        this.milestone = milestone;
+    MilestoneGroovyObject(final String jobId, final ExtendedMilestone milestone) {
+        this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
+        this.milestone = Objects.requireNonNull(milestone, "milestone cannot be null");
     }
 
     @Whitelisted

src/main/java/org/jenkinsci/plugins/pipeline/github/PullRequestGlobalVariable.java

@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.pipeline.github;
 
+import hudson.model.Run;
 import org.jenkinsci.plugins.workflow.cps.CpsScript;
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable;
 
@@ -22,7 +23,11 @@ public String getName() {
     @Nonnull
     @Override
     public Object getValue(@Nonnull final CpsScript script) throws Exception {
-        return new PullRequestGroovyObject(script);
+        final Run<?, ?> build = script.$build();
+        if (build == null) {
+            throw new IllegalStateException("No associated build");
+        }
+        return new PullRequestGroovyObject(build.getParent());
     }
 
 }