Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing nullability annotations and remove JSR 305 usage #85

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Add missing nullability annotations and remove JSR 305 usage #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/test/java/org/jenkinsci/plugins/displayurlapi/DisplayURLProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,21 @@ private DisplayURLProvider getRootProvider()
ClassicDisplayURLProvider.class.getName() );
}

@NonNull
@Override
public String getRunURL( Run<?, ?> run )
{
return getRootProvider().getRunURL( run ) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getArtifactsURL( Run<?, ?> run )
{
return getRootProvider().getArtifactsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getChangesURL( Run<?, ?> run )
{
Expand All @@ -90,6 +93,7 @@ public String getTestsURL( Run<?, ?> run )
return getRootProvider().getTestsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getJobURL( Job<?, ?> project )
{
Expand Down Expand Up @@ -141,18 +145,21 @@ private DisplayURLProvider getRootProvider()
ClassicDisplayURLProvider.class.getName() );
}

@NonNull
@Override
public String getRunURL( Run<?, ?> run )
{
return getRootProvider().getRunURL( run ) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getArtifactsURL( Run<?, ?> run )
{
return getRootProvider().getArtifactsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getChangesURL( Run<?, ?> run )
{
Expand All @@ -165,6 +172,7 @@ public String getTestsURL( Run<?, ?> run )
return getRootProvider().getTestsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getJobURL( Job<?, ?> project )
{
Expand Down
12 changes: 7 additions & 5 deletions src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectEligibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.jenkinsci.plugins.displayurlapi.actions;

import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.Action;
import hudson.model.Job;
import hudson.model.Run;
Expand All @@ -16,7 +15,6 @@
import org.junit.Test;
import org.jvnet.hudson.test.TestExtension;

import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletResponse;
import java.util.Collection;

Expand Down Expand Up @@ -112,11 +110,13 @@ public static class EligibleDisplayURLProvider extends DisplayURLProvider {

public static final String ELIGIBLE_IN_URL = "http://eligible.com";

@NonNull
@Override
public String getRunURL(Run<?, ?> run) {
return ELIGIBLE_IN_URL;
}

@NonNull
@Override
public String getChangesURL(Run<?, ?> run) {
return ELIGIBLE_IN_URL;
Expand All @@ -127,11 +127,13 @@ public String getTestsURL(Run<?, ?> run) {
return ELIGIBLE_IN_URL;
}

@NonNull
@Override
public String getArtifactsURL(Run<?, ?> run) {
return ELIGIBLE_IN_URL;
}

@NonNull
@Override
public String getJobURL(Job<?, ?> project) {
return ELIGIBLE_IN_URL;
Expand All @@ -145,9 +147,9 @@ public Class type() {
return Run.class;
}

@Nonnull
@NonNull
@Override
public Collection<? extends Action> createFor(@Nonnull Object target) {
public Collection<? extends Action> createFor(@NonNull Object target) {
return ImmutableList.of(new MockRunDisplayAction((Run) target));
}
}
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectExtendedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.Job;
import hudson.model.Run;
import org.hamcrest.Matchers;
Expand Down Expand Up @@ -104,16 +105,19 @@ public static class AnotherDisplayURLProvider extends DisplayURLProvider {

public static final String EXTRA_CONTENT_IN_URL = "another";

@NonNull
@Override
public String getRunURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getRunURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getArtifactsURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getArtifactsURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getChangesURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getChangesURL(run) + EXTRA_CONTENT_IN_URL;
Expand All @@ -124,6 +128,7 @@ public String getTestsURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getTestsURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getJobURL(Job<?, ?> project) {
return DisplayURLProvider.getDefault().getJobURL(project) + EXTRA_CONTENT_IN_URL;
Expand All @@ -135,16 +140,19 @@ public static class YetAnotherDisplayURLProvider extends DisplayURLProvider {

public static final String EXTRA_CONTENT_IN_URL = "yetanother";

@NonNull
@Override
public String getRunURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getRunURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getArtifactsURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getArtifactsURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getChangesURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getChangesURL(run) + EXTRA_CONTENT_IN_URL;
Expand All @@ -155,6 +163,7 @@ public String getTestsURL(Run<?, ?> run) {
return DisplayURLProvider.getDefault().getTestsURL(run) + EXTRA_CONTENT_IN_URL;
}

@NonNull
@Override
public String getJobURL(Job<?, ?> project) {
return DisplayURLProvider.getDefault().getJobURL(project) + EXTRA_CONTENT_IN_URL;
Expand Down