Check to see if idealNames workaround can be removed

Author: basil

pom.xml

@@ -85,6 +85,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- TODO until in BOM -->
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>cloudbees-folder</artifactId>
+        <!-- TODO https://github.com/jenkinsci/cloudbees-folder-plugin/pull/479 -->
+        <version>6.1004.v4c36007200f4</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>

src/main/java/jenkins/branch/MultiBranchProject.java

@@ -2092,21 +2092,16 @@ private void observeExisting(@NonNull SCMHead head, @NonNull SCMRevision revisio
         }
 
         private void observeNew(@NonNull SCMHead head, @NonNull SCMRevision revision, @NonNull Branch branch, String rawName, String encodedName, Action[] revisionActions) {
-            P project;
             if (!observer.mayCreate(encodedName)) {
                 listener.getLogger().println("Ignoring duplicate branch project " + rawName);
                 return;
             }
-            try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
-                MultiBranchProject.this, encodedName, branch.getName()
-            )) {
-                if (getItem(encodedName) != null) {
-                    throw new IllegalStateException(
-                        "JENKINS-42511: attempted to redundantly create " + encodedName + " in "
-                            + MultiBranchProject.this);
-                }
-                project = _factory.newInstance(branch);
+            if (getItem(encodedName) != null) {
+                throw new IllegalStateException(
+                    "JENKINS-42511: attempted to redundantly create " + encodedName + " in "
+                        + MultiBranchProject.this);
             }
+            P project = _factory.newInstance(branch);
             if (!project.getName().equals(encodedName)) {
                 throw new IllegalStateException(
                     "Name of created project " + project + " did not match expected " + encodedName);

src/main/java/jenkins/branch/MultiBranchProjectDescriptor.java

@@ -231,9 +231,9 @@ public String itemNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull
             if (factory.isProject(item)) {
                 return NameEncoder.encode(factory.getBranch(item).getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameEncoder.encode(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameEncoder.encode(name);
             }
             return null;
         }
@@ -245,9 +245,9 @@ public String dirNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull
             if (factory.isProject(item)) {
                 return NameMangler.apply(factory.getBranch(item).getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameMangler.apply(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameMangler.apply(name);
             }
             return null;
         }

src/main/java/jenkins/branch/OrganizationFolder.java

@@ -852,9 +852,9 @@ public String itemNameFromItem(@NonNull OrganizationFolder parent, @NonNull Mult
             if (property != null) {
                 return NameEncoder.encode(property.getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameEncoder.encode(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameEncoder.encode(name);
             }
             return null;
         }
@@ -866,9 +866,9 @@ public String dirNameFromItem(@NonNull OrganizationFolder parent, @NonNull Multi
             if (property != null) {
                 return NameMangler.apply(property.getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameMangler.apply(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameMangler.apply(name);
             }
             return null;
         }
@@ -1436,19 +1436,14 @@ private void completeNew(MultiBranchProjectFactory factory, Map<String, Object>
                                 .println("Ignoring duplicate child " + projectName + " named " + folderName);
                         return;
                     }
-                    MultiBranchProject<?, ?> project;
-                    try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
-                            OrganizationFolder.this, folderName, projectName
-                    )) {
-                        if (getItem(folderName) != null) {
-                            throw new IllegalStateException(
-                                    "JENKINS-42511: attempted to redundantly create " + folderName + " in "
-                                            + OrganizationFolder.this);
-                        }
-                        project = factory.createNewProject(
-                                OrganizationFolder.this, folderName, sources, attributes, listener
-                        );
+                    if (getItem(folderName) != null) {
+                        throw new IllegalStateException(
+                                "JENKINS-42511: attempted to redundantly create " + folderName + " in "
+                                        + OrganizationFolder.this);
                     }
+                    MultiBranchProject<?, ?> project = factory.createNewProject(
+                            OrganizationFolder.this, folderName, sources, attributes, listener
+                    );
                     BulkChange bc = new BulkChange(project);
                     try {
                         if (!projectName.equals(folderName)) {