Skip to content

Commit

Permalink
[JENKINS-38048] Relax nullability on Item/ItemGroup context parameters.
Browse files Browse the repository at this point in the history 
The underlying checks already handle null values.
Makes it easier to provide credentials dropdowns in global configuration.
  • Loading branch information
@jglick
jglick committed Sep 8, 2016
1 parent e0d05e2 commit 65e143c
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions ...main/java/com/cloudbees/plugins/credentials/common/AbstractIdCredentialsListBoxModel.java
View file
Expand Up @@ -29,6 +29,7 @@
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import hudson.model.Descriptor;
import hudson.model.Item;
import hudson.model.ItemGroup;
Expand Down Expand Up @@ -292,7 +293,7 @@ public AbstractIdCredentialsListBoxModel<T, C> withMatching(@NonNull Credentials
* @see CredentialsProvider#listCredentials(Class, Item, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull Item context, @NonNull Class<? extends C> type) {
public AbstractIdCredentialsListBoxModel<T, C> include(@Nullable Item context, @NonNull Class<? extends C> type) {
return include(context, type, Collections.<DomainRequirement>emptyList());
}

Expand All @@ -306,7 +307,7 @@ public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull Item context, @N
* @see CredentialsProvider#listCredentials(Class, ItemGroup, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull ItemGroup context,
public AbstractIdCredentialsListBoxModel<T, C> include(@Nullable ItemGroup context,
@NonNull Class<? extends C> type) {
return include(context, type, Collections.<DomainRequirement>emptyList());
}
Expand All @@ -323,7 +324,7 @@ public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull ItemGroup contex
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication authentication,
@NonNull Item context,
@Nullable Item context,
@NonNull Class<? extends C> type) {
return includeAs(authentication, context, type, Collections.<DomainRequirement>emptyList());
}
Expand All @@ -340,7 +341,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication authentication,
@NonNull ItemGroup context,
@Nullable ItemGroup context,
@NonNull Class<? extends C> type) {
return includeAs(authentication, context, type, Collections.<DomainRequirement>emptyList());
}
Expand All @@ -356,7 +357,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication
* @see CredentialsProvider#listCredentials(Class, Item, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull Item context, @NonNull Class<? extends C> type,
public AbstractIdCredentialsListBoxModel<T, C> include(@Nullable Item context, @NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements) {
return includeMatching(context, type, domainRequirements, CredentialsMatchers.always());
}
Expand All @@ -372,7 +373,7 @@ public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull Item context, @N
* @see CredentialsProvider#listCredentials(Class, ItemGroup, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull ItemGroup context, @NonNull Class<? extends C> type,
public AbstractIdCredentialsListBoxModel<T, C> include(@Nullable ItemGroup context, @NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements) {
return includeMatching(context, type, domainRequirements, CredentialsMatchers.always());
}
Expand All @@ -390,7 +391,7 @@ public AbstractIdCredentialsListBoxModel<T, C> include(@NonNull ItemGroup contex
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication authentication,
@NonNull Item context,
@Nullable Item context,
@NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements) {
return includeMatchingAs(authentication, context, type, domainRequirements, CredentialsMatchers.always());
Expand All @@ -409,7 +410,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication authentication,
@NonNull ItemGroup context,
@Nullable ItemGroup context,
@NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements) {
return includeMatchingAs(authentication, context, type, domainRequirements, CredentialsMatchers.always());
Expand All @@ -427,7 +428,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeAs(@NonNull Authentication
* @see CredentialsProvider#listCredentials(Class, Item, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@NonNull Item context,
public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@Nullable Item context,
@NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements,
@NonNull CredentialsMatcher matcher) {
Expand All @@ -446,7 +447,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@NonNull Item con
* @see CredentialsProvider#listCredentials(Class, ItemGroup, Authentication, List, CredentialsMatcher)
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@NonNull ItemGroup context,
public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@Nullable ItemGroup context,
@NonNull Class<? extends C> type,
@NonNull List<DomainRequirement> domainRequirements,
@NonNull CredentialsMatcher matcher) {
Expand All @@ -467,7 +468,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeMatching(@NonNull ItemGrou
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeMatchingAs(@NonNull Authentication authentication,
@NonNull Item context,
@Nullable Item context,
@NonNull Class<? extends C> type,
@NonNull
List<DomainRequirement> domainRequirements,
Expand All @@ -490,7 +491,7 @@ public AbstractIdCredentialsListBoxModel<T, C> includeMatchingAs(@NonNull Authen
* @since 2.1.0
*/
public AbstractIdCredentialsListBoxModel<T, C> includeMatchingAs(@NonNull Authentication authentication,
@NonNull ItemGroup context,
@Nullable ItemGroup context,
@NonNull Class<? extends C> type,
@NonNull
List<DomainRequirement> domainRequirements,
Expand Down

0 comments on commit 65e143c

Please sign in to comment.