From fc8471c5a08d3db004329cadfa66635b743b9ef6 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 24 Apr 2023 00:43:45 -0700 Subject: [PATCH] EOL JSR 305 --- .../build_timeout/global/GlobalTimeOutRunListener.java | 4 ++-- .../plugins/build_timeout/global/TimeOutTaskTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java b/src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java index faa6bea..feece1b 100644 --- a/src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java +++ b/src/main/java/hudson/plugins/build_timeout/global/GlobalTimeOutRunListener.java @@ -5,7 +5,7 @@ import hudson.model.*; import hudson.model.listeners.RunListener; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; import javax.inject.Singleton; import java.io.IOException; @@ -47,7 +47,7 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil } @Override - public void onCompleted(Run run, @Nonnull TaskListener listener) { + public void onCompleted(Run run, @NonNull TaskListener listener) { store.cancel(run.getExternalizableId()); } } diff --git a/src/test/java/hudson/plugins/build_timeout/global/TimeOutTaskTest.java b/src/test/java/hudson/plugins/build_timeout/global/TimeOutTaskTest.java index 6d65287..6468559 100644 --- a/src/test/java/hudson/plugins/build_timeout/global/TimeOutTaskTest.java +++ b/src/test/java/hudson/plugins/build_timeout/global/TimeOutTaskTest.java @@ -13,7 +13,7 @@ import org.mockito.junit.MockitoRule; import org.mockito.quality.Strictness; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import static org.junit.Assert.assertFalse; @@ -80,7 +80,7 @@ private static class TestOp extends BuildTimeOutOperation { boolean performed = false; @Override - public boolean perform(@Nonnull AbstractBuild build, @Nonnull BuildListener listener, long effectiveTimeout) { + public boolean perform(@NonNull AbstractBuild build, @NonNull BuildListener listener, long effectiveTimeout) { performed = true; return true; } @@ -90,7 +90,7 @@ private static class FailsOp extends BuildTimeOutOperation { boolean performed = false; @Override - public boolean perform(@Nonnull AbstractBuild build, @Nonnull BuildListener listener, long effectiveTimeout) { + public boolean perform(@NonNull AbstractBuild build, @NonNull BuildListener listener, long effectiveTimeout) { performed = true; return false; } @@ -100,7 +100,7 @@ private static class ThrowsOp extends BuildTimeOutOperation { boolean performed = false; @Override - public boolean perform(@Nonnull AbstractBuild build, @Nonnull BuildListener listener, long effectiveTimeout) { + public boolean perform(@NonNull AbstractBuild build, @NonNull BuildListener listener, long effectiveTimeout) { performed = true; throw new RuntimeException("bad"); }