Skip to content

Replace JSR-305 annotations with spotbugs annotations #67

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

Merged
MarkEWaite merged 1 commit into from
Feb 3, 2025
Merged

Replace JSR-305 annotations with spotbugs annotations #67

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/gitee/jenkins/environment/GiteeEnvironmentContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.gitee.jenkins.environment;

import com.gitee.jenkins.cause.GiteeWebHookCause;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.EnvVars;
import hudson.Extension;
import hudson.matrix.MatrixRun;
Expand All @@ -9,7 +10,6 @@
import hudson.model.Run;
import hudson.model.TaskListener;

import javax.annotation.Nonnull;
import java.io.IOException;

/**
Expand All @@ -18,7 +18,7 @@
@Extension
public class GiteeEnvironmentContributor extends EnvironmentContributor {
@Override
public void buildEnvironmentFor(@Nonnull Run r, @Nonnull EnvVars envs, @Nonnull TaskListener listener) throws IOException, InterruptedException {
public void buildEnvironmentFor(@NonNull Run r, @NonNull EnvVars envs, @NonNull TaskListener listener) throws IOException, InterruptedException {
GiteeWebHookCause cause = null;
if (r instanceof MatrixRun) {
MatrixBuild parent = ((MatrixRun)r).getParentBuild();
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/gitee/jenkins/gitee/api/GiteeClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.gitee.jenkins.gitee.api;


import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.ExtensionPoint;
import jenkins.model.Jenkins;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;

import javax.annotation.Nonnull;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -41,16 +40,16 @@ protected GiteeClientBuilder(String id, int ordinal) {
this.ordinal = ordinal;
}

@Nonnull
@NonNull
public final String id() {
return id;
}

@Nonnull
@NonNull
public abstract GiteeClient buildClient(String url, String token, boolean ignoreCertificateErrors, int connectionTimeout, int readTimeout);

@Override
public final int compareTo(@Nonnull GiteeClientBuilder other) {
public final int compareTo(@NonNull GiteeClientBuilder other) {
int o = ordinal - other.ordinal;
return o != 0 ? o : id().compareTo(other.id());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gitee/jenkins/gitee/api/impl/ResteasyGiteeClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.FluentIterable;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import hudson.ProxyConfiguration;
import hudson.init.InitMilestone;
import hudson.init.Initializer;
Expand All @@ -29,8 +31,6 @@
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.Priority;
import javax.ws.rs.Priorities;
import javax.ws.rs.client.ClientRequestContext;
Expand Down Expand Up @@ -75,7 +75,7 @@ public static void setRuntimeDelegate() {
this.pullRequestIdProvider = pullRequestIdProvider;
}

@Nonnull
@NonNull
@Override
public final GiteeClient buildClient(String url, String apiToken, boolean ignoreCertificateErrors, int connectionTimeout, int readTimeout) {
return buildClient(
Expand Down