Introduce new dedicated SCMM branch discovery trait

src/main/java/com/cloudogu/scmmanager/scm/BranchDiscoveryTrait.java

@@ -10,6 +10,14 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * @deprecated This class has been replaced with the {@link ScmManagerBranchDiscoveryTrait}. The
+ * name of this class has not been unique and this led to issues in the automated generation of
+ * build jobs.
+ *
+ * @see ScmManagerBranchDiscoveryTrait
+ */
+@Deprecated
 public class BranchDiscoveryTrait extends SCMSourceTrait {
 
   @DataBoundConstructor
@@ -34,7 +42,7 @@ public static class DescriptorImpl extends ScmManagerSourceTraitDescriptor {
     @Nonnull
     @Override
     public String getDisplayName() {
-      return "Branch Discovery";
+      return "Deprecated SCM-Manager Branch Discovery";
     }
   }
 }

src/main/java/com/cloudogu/scmmanager/scm/ConnectionConfiguration.java

@@ -76,7 +76,7 @@ static FormValidation validateCredentialsId(ScmManagerApiFactory apiFactory, SCM
   }
 
   static FormValidation checkServerUrl(ScmManagerApiFactory apiFactory, String value) throws InterruptedException, ExecutionException {
-    String trimmedValue = value.trim();
+    String trimmedValue = value == null? null: value.trim();
     if (Strings.isNullOrEmpty(trimmedValue)) {
       return FormValidation.error("server url is required");
     }

src/main/java/com/cloudogu/scmmanager/scm/ScmManagerBranchDiscoveryTrait.java

@@ -0,0 +1,40 @@
+package com.cloudogu.scmmanager.scm;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import jenkins.scm.api.SCMHeadCategory;
+import jenkins.scm.api.trait.SCMSourceContext;
+import jenkins.scm.api.trait.SCMSourceTrait;
+import jenkins.scm.impl.trait.Discovery;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+import javax.annotation.Nonnull;
+
+public class ScmManagerBranchDiscoveryTrait extends SCMSourceTrait {
+
+  @DataBoundConstructor
+  public ScmManagerBranchDiscoveryTrait() {
+  }
+
+  @Override
+  protected void decorateContext(SCMSourceContext<?, ?> context) {
+    ScmManagerSourceContext scmContext = (ScmManagerSourceContext) context;
+    scmContext.wantBranches(true);
+  }
+
+  @Override
+  protected boolean includeCategory(@NonNull SCMHeadCategory category) {
+    return category.isUncategorized();
+  }
+
+  @Extension
+  @Discovery
+  public static class DescriptorImpl extends ScmManagerSourceTraitDescriptor {
+
+    @Nonnull
+    @Override
+    public String getDisplayName() {
+      return "SCM-Manager Branch Discovery";
+    }
+  }
+}

src/main/java/com/cloudogu/scmmanager/scm/ScmManagerSource.java

@@ -308,7 +308,7 @@ private List<SCMSourceTraitDescriptor> findAllAvailableTraits() {
     @NonNull
     public List<SCMSourceTrait> getTraitsDefaults() {
       return Arrays.asList(
-        new BranchDiscoveryTrait(),
+        new ScmManagerBranchDiscoveryTrait(),
         new PullRequestDiscoveryTrait(false)
       );
     }

src/main/java/com/cloudogu/scmmanager/scm/ServerIdentification.java

@@ -39,10 +39,7 @@ private static Collection<Identification> readIdentifications(JSONObject form) {
   }
 
   boolean matches(String serverUrl) {
-    if (serverUrl != null) {
-      return serverUrl.startsWith(this.serverUrl) || identifications.stream().anyMatch(i -> i.matches(serverUrl));
-    }
-    return false;
+    return serverUrl != null && (serverUrl.startsWith(this.serverUrl) || identifications.stream().anyMatch(i -> i.matches(serverUrl)));
   }
 
   String getServerUrl() {

src/main/java/com/cloudogu/scmmanager/scm/jobdsl/ScmManagerBranchSourceContext.java

@@ -1,7 +1,7 @@
 package com.cloudogu.scmmanager.scm.jobdsl;
 
-import com.cloudogu.scmmanager.scm.BranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.PullRequestDiscoveryTrait;
+import com.cloudogu.scmmanager.scm.ScmManagerBranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.TagDiscoveryTrait;
 import jenkins.scm.api.trait.SCMSourceTrait;
 
@@ -29,7 +29,7 @@ public void discoverTags(boolean discoverTags) {
   public List<SCMSourceTrait> getTraits() {
     List<SCMSourceTrait> traits = new ArrayList<>();
     if (discoverBranches) {
-      traits.add(new BranchDiscoveryTrait());
+      traits.add(new ScmManagerBranchDiscoveryTrait());
     }
     if (discoverPullRequest) {
       traits.add(new PullRequestDiscoveryTrait());

src/main/java/com/cloudogu/scmmanager/scm/jobdsl/ScmManagerNavigatorContext.java

@@ -1,7 +1,7 @@
 package com.cloudogu.scmmanager.scm.jobdsl;
 
-import com.cloudogu.scmmanager.scm.BranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.PullRequestDiscoveryTrait;
+import com.cloudogu.scmmanager.scm.ScmManagerBranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.ScmManagerSvnNavigatorTrait;
 import com.cloudogu.scmmanager.scm.Subversion;
 import com.cloudogu.scmmanager.scm.TagDiscoveryTrait;
@@ -63,7 +63,7 @@ public void discoverSvn(@DslContext(SubversionContext.class) Runnable closure) {
   public List<SCMTrait<? extends SCMTrait<?>>> getTraits() {
     List<SCMTrait<? extends SCMTrait<?>>> traits = new ArrayList<>();
     if (discoverBranches) {
-      traits.add(new BranchDiscoveryTrait());
+      traits.add(new ScmManagerBranchDiscoveryTrait());
     }
     if (discoverPullRequest) {
       traits.add(new PullRequestDiscoveryTrait());

src/test/java/com/cloudogu/scmmanager/scm/jobdsl/BranchSourcesExtensionTest.java

@@ -1,7 +1,7 @@
 package com.cloudogu.scmmanager.scm.jobdsl;
 
-import com.cloudogu.scmmanager.scm.BranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.PullRequestDiscoveryTrait;
+import com.cloudogu.scmmanager.scm.ScmManagerBranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.ScmManagerSource;
 import com.cloudogu.scmmanager.scm.ScmManagerSvnSource;
 import com.cloudogu.scmmanager.scm.Subversion;
@@ -23,7 +23,9 @@
 
 import static com.cloudogu.scmmanager.scm.jobdsl.Asserts.assertContainsOnlyInstancesOf;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BranchSourcesExtensionTest {
@@ -50,7 +52,7 @@ public void shouldCreateSourceWithoutRepositoryFetch() throws ExecutionException
     assertThat(source.getRepository()).isEqualTo("hitchhiker/hog/git");
     assertThat(source.getId()).isEqualTo("42");
     assertContainsOnlyInstancesOf(source.getTraits(),
-      BranchDiscoveryTrait.class, PullRequestDiscoveryTrait.class, TagDiscoveryTrait.class
+      ScmManagerBranchDiscoveryTrait.class, PullRequestDiscoveryTrait.class, TagDiscoveryTrait.class
     );
     verifyNoMoreInteractions(apiFactory);
   }

src/test/java/com/cloudogu/scmmanager/scm/jobdsl/NavigatorExtensionTest.java

@@ -1,7 +1,7 @@
 package com.cloudogu.scmmanager.scm.jobdsl;
 
-import com.cloudogu.scmmanager.scm.BranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.PullRequestDiscoveryTrait;
+import com.cloudogu.scmmanager.scm.ScmManagerBranchDiscoveryTrait;
 import com.cloudogu.scmmanager.scm.ScmManagerNavigator;
 import com.cloudogu.scmmanager.scm.ScmManagerSvnNavigatorTrait;
 import com.cloudogu.scmmanager.scm.TagDiscoveryTrait;
@@ -33,7 +33,7 @@ public void shouldCreateNavigator() {
     assertThat(scmNavigator.getCredentialsId()).isEqualTo("secret");
     assertThat(scmNavigator.getNamespace()).isEqualTo("spaceships");
     assertContainsOnlyInstancesOf(scmNavigator.getTraits(),
-      BranchDiscoveryTrait.class, PullRequestDiscoveryTrait.class
+      ScmManagerBranchDiscoveryTrait.class, PullRequestDiscoveryTrait.class
     );
   }