Skip to content

Commit fee303e

Browse files
authored
Nonnull on events (#216)
* Nonnull on events * Update GitHubBranchTrigger.java
1 parent b44b1b5 commit fee303e

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchTrigger.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import javax.annotation.Nullable;
3131
import java.io.IOException;
3232
import java.util.ArrayList;
33-
import java.util.Collections;
3433
import java.util.Date;
3534
import java.util.LinkedHashSet;
3635
import java.util.List;
@@ -45,6 +44,7 @@
4544
import static com.google.common.base.Charsets.UTF_8;
4645
import static com.google.common.base.Predicates.not;
4746
import static java.text.DateFormat.getDateTimeInstance;
47+
import static java.util.Collections.emptyList;
4848
import static org.jenkinsci.plugins.github.pullrequest.GitHubPRTriggerMode.LIGHT_HOOKS;
4949
import static org.jenkinsci.plugins.github.pullrequest.utils.ObjectsUtil.isNull;
5050
import static org.jenkinsci.plugins.github.pullrequest.utils.ObjectsUtil.nonNull;
@@ -99,9 +99,9 @@ public boolean isPreStatus() {
9999
return preStatus;
100100
}
101101

102-
@CheckForNull
102+
@Nonnull
103103
public List<GitHubBranchEvent> getEvents() {
104-
return events;
104+
return nonNull(events) ? events : emptyList();
105105
}
106106

107107
@CheckForNull
@@ -241,7 +241,7 @@ private List<GitHubBranchCause> readyToBuildCauses(GitHubBranchRepository localR
241241
return causes;
242242
} catch (IOException e) {
243243
listener.error("Can't get build causes: '{}'", e);
244-
return Collections.emptyList();
244+
return emptyList();
245245
}
246246
}
247247

github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRTrigger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ public boolean isPreStatus() {
138138
return preStatus;
139139
}
140140

141+
@Nonnull
141142
public List<GitHubPREvent> getEvents() {
142-
return events;
143+
return nonNull(events) ? events : emptyList();
143144
}
144145

145146
public GitHubPRUserRestriction getUserRestriction() {

0 commit comments

Comments
 (0)