Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-45344] Be more specific until we have the generic impl…
…ementations of everyone and nobody
  • Loading branch information
stephenc committed Jul 10, 2017
1 parent 61a18e2 commit 2247a3c
Showing 1 changed file with 4 additions and 7 deletions.
Expand Up @@ -26,8 +26,6 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.util.ListBoxModel;
import java.io.IOException;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
Expand All @@ -37,7 +35,6 @@
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
import jenkins.scm.api.mixin.ChangeRequestSCMHead2;
import jenkins.scm.api.trait.SCMBuilder;
import jenkins.scm.api.trait.SCMHeadAuthority;
import jenkins.scm.api.trait.SCMHeadAuthorityDescriptor;
import jenkins.scm.api.trait.SCMSourceContext;
Expand Down Expand Up @@ -231,7 +228,7 @@ public List<SCMHeadAuthorityDescriptor> getTrustDescriptors() {
/**
* An {@link SCMHeadAuthority} that trusts nothing.
*/
public static class TrustNobody extends SCMHeadAuthority<SCMSourceRequest, ChangeRequestSCMHead2, SCMRevision> {
public static class TrustNobody extends SCMHeadAuthority<SCMSourceRequest, PullRequestSCMHead, PullRequestSCMRevision> {

/**
* Constructor.
Expand All @@ -244,7 +241,7 @@ public TrustNobody() {
* {@inheritDoc}
*/
@Override
public boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull ChangeRequestSCMHead2 head) {
public boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull PullRequestSCMHead head) {
return false;
}

Expand Down Expand Up @@ -321,7 +318,7 @@ public boolean isApplicableToOrigin(@NonNull Class<? extends SCMHeadOrigin> orig
/**
* An {@link SCMHeadAuthority} that trusts everyone.
*/
public static class TrustEveryone extends SCMHeadAuthority<SCMSourceRequest, ChangeRequestSCMHead2, SCMRevision> {
public static class TrustEveryone extends SCMHeadAuthority<SCMSourceRequest, PullRequestSCMHead, PullRequestSCMRevision> {
/**
* Constructor.
*/
Expand All @@ -333,7 +330,7 @@ public TrustEveryone() {
* {@inheritDoc}
*/
@Override
protected boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull ChangeRequestSCMHead2 head) {
protected boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull PullRequestSCMHead head) {
return true;
}

Expand Down

0 comments on commit 2247a3c

Please sign in to comment.