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

EOL JSR 305 #117

Merged
merged 1 commit into from
Jan 11, 2022
Merged

EOL JSR 305 #117

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
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/structs/SymbolLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.jenkinsci.Symbol;
import org.jvnet.hudson.annotation_indexer.Index;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.inject.Inject;
import java.io.IOException;
import java.util.Collections;
Expand Down Expand Up @@ -212,7 +212,7 @@ public static SymbolLookup get() {
* @return The {@link Symbol} annotation value(s) for the class (generally a {@link Descriptor} that object represents,
* or an empty {@link Set} if the annotation is not present.
*/
@Nonnull public static Set<String> getSymbolValue(@Nonnull Object o) {
@NonNull public static Set<String> getSymbolValue(@NonNull Object o) {
if (o instanceof Describable) {
return getSymbolValue(((Describable) o).getDescriptor().getClass());
} else {
Expand All @@ -229,7 +229,7 @@ public static SymbolLookup get() {
*/
@SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
justification = "Jenkins.getInstance() can return null in theory.")
@Nonnull public static Set<String> getSymbolValue(@Nonnull Class<?> c) {
@NonNull public static Set<String> getSymbolValue(@NonNull Class<?> c) {
Set<String> symbolValues = new LinkedHashSet<String>();
Jenkins j = Jenkins.getInstanceOrNull();
if (Describable.class.isAssignableFrom(c) && !Descriptor.class.isAssignableFrom(c) && j != null) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/jenkinsci/plugins/structs/describable/CustomDescribableModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import hudson.model.Describable;
import hudson.model.Descriptor;
import java.util.Map;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
Expand Down Expand Up @@ -62,15 +62,15 @@ public interface CustomDescribableModel /* extends Descriptor */ {
/**
* Permits customization of the behavior of {@link DescribableModel#instantiate(Map)}.
*/
default @Nonnull Map<String, Object> customInstantiate(@Nonnull Map<String, Object> arguments) {
default @NonNull Map<String, Object> customInstantiate(@NonNull Map<String, Object> arguments) {
return arguments;
}

/**
* Permits customization of the behavior of {@link DescribableModel#uninstantiate2(Object)}.
* @see UninstantiatedDescribable#withArguments
*/
default @Nonnull UninstantiatedDescribable customUninstantiate(@Nonnull UninstantiatedDescribable ud) {
default @NonNull UninstantiatedDescribable customUninstantiate(@NonNull UninstantiatedDescribable ud) {
return ud;
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/jenkinsci/plugins/structs/describable/DescribableModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.lang.Klass;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.beans.Introspector;
import java.io.IOException;
import java.io.Serializable;
Expand Down Expand Up @@ -412,7 +412,7 @@ private Object[] buildArguments(Map<String,?> bag, Type[] types, String[] names,
if (args[i]==null && callEvenIfNoArgs)
throw new UnsupportedOperationException("not yet handling @DataBoundConstructor default value of " + type + "; pass an explicit value for " + name);
} else {
// TODO this might be fine (ExecutorStep.label), or not (GenericSCMStep.scm); should inspect parameter annotations for @Nonnull and throw an UOE if found
// TODO this might be fine (ExecutorStep.label), or not (GenericSCMStep.scm); should inspect parameter annotations for @NonNull and throw an UOE if found
}
}
return hasArg ? args : null;
Expand Down Expand Up @@ -493,7 +493,7 @@ private Object coerce(String context, Type type, Object o, TaskListener listener
}
}

private Object coerceStringToNumber(@Nonnull String context, @Nonnull Class numberClass, @Nonnull String o)
private Object coerceStringToNumber(@NonNull String context, @NonNull Class numberClass, @NonNull String o)
throws ClassCastException {
try {
if (numberClass.equals(Integer.class)) {
Expand Down Expand Up @@ -588,7 +588,7 @@ private List<Object> coerceList(String context, Type type, List<?> list, TaskLis
}

/** Tries to find the {@link ParameterValue} type corresponding to a {@link ParameterDefinition} by assuming conventional naming. */
private static @CheckForNull Class<?> parameterValueClass(@Nonnull Class<?> parameterDefinitionClass) { // TODO JENKINS-26093
private static @CheckForNull Class<?> parameterValueClass(@NonNull Class<?> parameterDefinitionClass) { // TODO JENKINS-26093
String name = parameterDefinitionClass.getName();
if (name.endsWith("Definition")) {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/structs/describable/DescribableParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.NoStaplerConstructorException;

import javax.annotation.CheckForNull;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import java.io.IOException;
import java.lang.reflect.Type;
import java.net.URL;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/structs/describable/ParameterType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import hudson.model.Result;
import org.jvnet.tiger_types.Types;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.net.URL;
Expand All @@ -27,7 +27,7 @@
* @author Anderw Bayer
*/
public abstract class ParameterType {
@Nonnull
@NonNull
private final Type actualType;

public Type getActualType() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/structs/describable/UninstantiatedDescribable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import hudson.model.TaskListener;
import org.jenkinsci.Symbol;

import javax.annotation.Nullable;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import javax.annotation.CheckForNull;
import edu.umd.cs.findbugs.annotations.CheckForNull;

/**
* A reflection-like view of a particular {@link Describable} instance.
Expand Down