Skip to content

Commit d502b84

Browse files
authored
Merge pull request #116 from basil/jsr305
EOL JSR 305
2 parents 7727fac + fc8471c commit d502b84

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import hudson.model.*;
66
import hudson.model.listeners.RunListener;
77

8-
import javax.annotation.Nonnull;
8+
import edu.umd.cs.findbugs.annotations.NonNull;
99
import javax.inject.Inject;
1010
import javax.inject.Singleton;
1111
import java.io.IOException;
@@ -47,7 +47,7 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil
4747
}
4848

4949
@Override
50-
public void onCompleted(Run<?, ?> run, @Nonnull TaskListener listener) {
50+
public void onCompleted(Run<?, ?> run, @NonNull TaskListener listener) {
5151
store.cancel(run.getExternalizableId());
5252
}
5353
}

src/test/java/hudson/plugins/build_timeout/global/TimeOutTaskTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.mockito.junit.MockitoRule;
1414
import org.mockito.quality.Strictness;
1515

16-
import javax.annotation.Nonnull;
16+
import edu.umd.cs.findbugs.annotations.NonNull;
1717
import java.time.Duration;
1818

1919
import static org.junit.Assert.assertFalse;
@@ -80,7 +80,7 @@ private static class TestOp extends BuildTimeOutOperation {
8080
boolean performed = false;
8181

8282
@Override
83-
public boolean perform(@Nonnull AbstractBuild<?, ?> build, @Nonnull BuildListener listener, long effectiveTimeout) {
83+
public boolean perform(@NonNull AbstractBuild<?, ?> build, @NonNull BuildListener listener, long effectiveTimeout) {
8484
performed = true;
8585
return true;
8686
}
@@ -90,7 +90,7 @@ private static class FailsOp extends BuildTimeOutOperation {
9090
boolean performed = false;
9191

9292
@Override
93-
public boolean perform(@Nonnull AbstractBuild<?, ?> build, @Nonnull BuildListener listener, long effectiveTimeout) {
93+
public boolean perform(@NonNull AbstractBuild<?, ?> build, @NonNull BuildListener listener, long effectiveTimeout) {
9494
performed = true;
9595
return false;
9696
}
@@ -100,7 +100,7 @@ private static class ThrowsOp extends BuildTimeOutOperation {
100100
boolean performed = false;
101101

102102
@Override
103-
public boolean perform(@Nonnull AbstractBuild<?, ?> build, @Nonnull BuildListener listener, long effectiveTimeout) {
103+
public boolean perform(@NonNull AbstractBuild<?, ?> build, @NonNull BuildListener listener, long effectiveTimeout) {
104104
performed = true;
105105
throw new RuntimeException("bad");
106106
}

0 commit comments

Comments
 (0)