[FIXED JENKINS-45344] Be more specific until we have the generic impl…

…ementations of everyone and nobody
jenkinsci · Jul 6, 2017 · e5619d6 · e5619d6
1 parent c8da81f
commit e5619d6
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/src/main/java/org/jenkinsci/plugin/gitea/ForkPullRequestDiscoveryTrait.java b/src/main/java/org/jenkinsci/plugin/gitea/ForkPullRequestDiscoveryTrait.java
@@ -227,7 +227,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.
@@ -240,7 +240,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;
         }
 
@@ -254,17 +254,17 @@ public static class DescriptorImpl extends SCMHeadAuthorityDescriptor {
              * {@inheritDoc}
              */
             @Override
-            public boolean isApplicableToOrigin(@NonNull Class<? extends SCMHeadOrigin> originClass) {
-                return SCMHeadOrigin.Fork.class.isAssignableFrom(originClass);
-            }            /**
-             * {@inheritDoc}
-             */
-            @Override
             public String getDisplayName() {
                 return Messages.ForkPullRequestDiscoveryTrait_nobodyDisplayName();
             }
 
-
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            public boolean isApplicableToOrigin(@NonNull Class<? extends SCMHeadOrigin> originClass) {
+                return SCMHeadOrigin.Fork.class.isAssignableFrom(originClass);
+            }
         }
     }
 
@@ -280,6 +280,15 @@ public static class TrustContributors
         public TrustContributors() {
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        protected boolean checkTrusted(@NonNull GiteaSCMSourceRequest request, @NonNull PullRequestSCMHead head) {
+            return !head.getOrigin().equals(SCMHeadOrigin.DEFAULT)
+                    && request.getCollaboratorNames().contains(head.getOriginOwner());
+        }
+
         /**
          * Our descriptor.
          */
@@ -302,29 +311,28 @@ public boolean isApplicableToOrigin(@NonNull Class<? extends SCMHeadOrigin> orig
                 return SCMHeadOrigin.Fork.class.isAssignableFrom(originClass);
             }
 
-        }        /**
-         * {@inheritDoc}
-         */
-        @Override
-        protected boolean checkTrusted(@NonNull GiteaSCMSourceRequest request, @NonNull PullRequestSCMHead head) {
-            return !head.getOrigin().equals(SCMHeadOrigin.DEFAULT)
-                    && request.getCollaboratorNames().contains(head.getOriginOwner());
         }
-
-
     }
 
     /**
      * 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.
          */
         @DataBoundConstructor
         public TrustEveryone() {
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        protected boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull PullRequestSCMHead head) {
+            return true;
+        }
+
         /**
          * Our descriptor.
          */
@@ -346,14 +354,6 @@ public String getDisplayName() {
             public boolean isApplicableToOrigin(@NonNull Class<? extends SCMHeadOrigin> originClass) {
                 return SCMHeadOrigin.Fork.class.isAssignableFrom(originClass);
             }
-        }        /**
-         * {@inheritDoc}
-         */
-        @Override
-        protected boolean checkTrusted(@NonNull SCMSourceRequest request, @NonNull ChangeRequestSCMHead2 head) {
-            return true;
         }
-
-
     }
 }