find bugs fixes

aaronwalker · aaronwalker · commit 0f6965fa4cea · 2021-09-06T09:14:11.000Z
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/GitHubEventSubscriber.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/GitHubEventSubscriber.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.pipeline.github.trigger;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.CauseAction;
 import hudson.model.Item;
@@ -193,6 +194,7 @@ private boolean triggerMatches(final IssueCommentTrigger trigger,
         return false;
     }
 
+    @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     private void handlePullRequestReview(final GHSubscriberEvent event) {
         // we only care about created or updated events
         switch (event.getType()) {
@@ -281,6 +283,7 @@ private void handlePullRequestReview(final GHSubscriberEvent event) {
         }
     }
 
+    @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     private boolean triggerMatches(final PullRequestReviewTrigger trigger,
                                    final GHPullRequestReview review,
                                    final WorkflowJob job) {
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewCause.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewCause.java
@@ -3,6 +3,8 @@
 import hudson.model.Cause;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;
 
+import java.util.Arrays;
+
 /**
  * Represents the user who reviewed the PR that triggered the build.
  *
@@ -19,7 +21,7 @@ public PullRequestReviewCause(final String userLogin, final String state, final
     this.userLogin = userLogin;
     this.state = state;
     this.comment = comment;
-    this.reviewStates = reviewStates;
+    this.reviewStates =  Arrays.copyOf(reviewStates, reviewStates.length);
   }
 
   @Whitelisted
@@ -39,7 +41,7 @@ public String getState() {
 
   @Whitelisted
   public String[] getReviewStates() {
-      return reviewStates;
+       return Arrays.copyOf(reviewStates, reviewStates.length);
   }
 
   @Override
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewTrigger.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewTrigger.java
@@ -43,12 +43,12 @@ public class PullRequestReviewTrigger  extends Trigger<WorkflowJob> {
   public PullRequestReviewTrigger() {}
 
   public String[] getReviewStates() {
-      return reviewStates;
+      return Arrays.copyOf(reviewStates, reviewStates.length);
   }
 
   @DataBoundSetter
   public void setReviewStates(@Nonnull final String [] reviewStates) {
-      this.reviewStates = reviewStates;
+      this.reviewStates = Arrays.copyOf(reviewStates, reviewStates.length);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package org.jenkinsci.plugins.pipeline.github.trigger;`
`2`	`2`
	`3`	`+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;`
`3`	`4`	`import hudson.Extension;`
`4`	`5`	`import hudson.model.CauseAction;`
`5`	`6`	`import hudson.model.Item;`
`@@ -193,6 +194,7 @@ private boolean triggerMatches(final IssueCommentTrigger trigger,`
`193`	`194`	`return false;`
`194`	`195`	`}`
`195`	`196`
	`197`	`+ @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")`
`196`	`198`	`private void handlePullRequestReview(final GHSubscriberEvent event) {`
`197`	`199`	`// we only care about created or updated events`
`198`	`200`	`switch (event.getType()) {`
`@@ -281,6 +283,7 @@ private void handlePullRequestReview(final GHSubscriberEvent event) {`
`281`	`283`	`}`
`282`	`284`	`}`
`283`	`285`
	`286`	`+ @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")`
`284`	`287`	`private boolean triggerMatches(final PullRequestReviewTrigger trigger,`
`285`	`288`	`final GHPullRequestReview review,`
`286`	`289`	`final WorkflowJob job) {`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public class PullRequestReviewTrigger extends Trigger<WorkflowJob> {`
`43`	`43`	`public PullRequestReviewTrigger() {}`
`44`	`44`
`45`	`45`	`public String[] getReviewStates() {`
`46`		`- return reviewStates;`
	`46`	`+ return Arrays.copyOf(reviewStates, reviewStates.length);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@DataBoundSetter`
`50`	`50`	`public void setReviewStates(@Nonnull final String [] reviewStates) {`
`51`		`- this.reviewStates = reviewStates;`
	`51`	`+ this.reviewStates = Arrays.copyOf(reviewStates, reviewStates.length);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`