[JENKINS-75762] The Bitbucket global configuration page does not list any available endpoints type (#1069)

Backport from master the fix for the Describable of BitbucketEndpoint configuration

Author: nfalco79

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java

@@ -29,8 +29,8 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryProtocol;
 import com.cloudbees.jenkins.plugins.bitbucket.api.PullRequestBranchType;
+import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpoint;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointProvider;
-import com.cloudbees.jenkins.plugins.bitbucket.endpoints.AbstractBitbucketEndpoint;
 import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketServerEndpoint;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.extension.FallbackToOtherRepositoryGitSCMExtension;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
@@ -112,11 +112,11 @@ public BitbucketGitSCMBuilder(@NonNull BitbucketSCMSource scmSource, @NonNull SC
         this.scmSource = scmSource;
 
         String serverURL = scmSource.getServerUrl();
-        AbstractBitbucketEndpoint endpoint = (AbstractBitbucketEndpoint) BitbucketEndpointProvider
+        BitbucketEndpoint endpoint = BitbucketEndpointProvider
                 .lookupEndpoint(serverURL)
                 .orElse(new BitbucketServerEndpoint(null, serverURL, false, null, false, null));
 
-        String repositoryURL = endpoint.getRepositoryUrl(scmSource.getRepoOwner(), scmSource.getRepository());
+        String repositoryURL = endpoint.getRepositoryURL(scmSource.getRepoOwner(), scmSource.getRepository());
         if (BitbucketApiUtils.isCloud(endpoint.getServerURL())) {
             withBrowser(new BitbucketWeb(repositoryURL));
         } else {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/AbstractBitbucketEndpoint.java

@@ -25,6 +25,7 @@
 
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketAuthenticator;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpoint;
+import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointDescriptor;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointProvider;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketCredentials;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.URLUtils;
@@ -286,7 +287,7 @@ public BitbucketAuthenticator authenticator() {
      * {@inheritDoc}
      */
     @Override
-    public AbstractBitbucketEndpointDescriptor getDescriptor() {
-        return (AbstractBitbucketEndpointDescriptor) Jenkins.get().getDescriptorOrDie(getClass());
+    public BitbucketEndpointDescriptor getDescriptor() {
+        return (BitbucketEndpointDescriptor) Jenkins.get().getDescriptorOrDie(getClass());
     }
 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketCloudEndpoint.java

@@ -23,6 +23,7 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.endpoints;
 
+import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointDescriptor;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.EndpointType;
 import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketCloudApiClient;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
@@ -158,6 +159,11 @@ public EndpointType getType() {
         return EndpointType.CLOUD;
     }
 
+    @Override
+    public BitbucketEndpointDescriptor getDescriptor() {
+        return new DescriptorImpl();
+    }
+
     /**
      * Our descriptor.
      */

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfiguration.java

@@ -156,9 +156,9 @@ public boolean configure(StaplerRequest2 req, JSONObject json) throws FormExcept
      * @return the list of endpoints
      */
     @NonNull
-    public List<AbstractBitbucketEndpoint /*BitbucketEndpoint*/> getEndpoints() {
+    public List<BitbucketEndpoint> getEndpoints() {
         // make a local copy so if changes in meanwhile you do not get NPE
-        List/*<BitbucketEndpoint>*/ localEndpoints = this.endpoints;
+        List<BitbucketEndpoint> localEndpoints = this.endpoints;
         return CollectionUtils.isEmpty(localEndpoints)
                 ? List.of(new BitbucketCloudEndpoint())
                 : Collections.unmodifiableList(localEndpoints);

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketServerEndpoint.java

@@ -23,6 +23,7 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.endpoints;
 
+import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointDescriptor;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.BitbucketEndpointProvider;
 import com.cloudbees.jenkins.plugins.bitbucket.api.endpoint.EndpointType;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.URLUtils;
@@ -262,6 +263,11 @@ public void setWebhookImplementation(@NonNull BitbucketServerWebhookImplementati
         this.webhookImplementation = requireNonNull(webhookImplementation);
     }
 
+    @Override
+    public BitbucketEndpointDescriptor getDescriptor() {
+        return new DescriptorImpl();
+    }
+
     /**
      * Our descriptor.
      */