Merge branch 'master' of https://github.com/jenkinsci/cloudbees-folder-plugin into session

Author: basil

src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java

@@ -365,8 +365,8 @@ public static <K, V extends TopLevelItem> Map<K, V> loadChildren(AbstractFolder<
             V itemFromDir;
             V item;
             String name;
-            item = itemFromDir = byDirName.get(childName);
             var legacyName = subdir.getName();
+            item = itemFromDir = byDirName.get(legacyName);
             try {
                 if (item == null) {
                     XmlFile xmlFile = Items.getConfigFile(subdir);
@@ -378,6 +378,13 @@ public static <K, V extends TopLevelItem> Map<K, V> loadChildren(AbstractFolder<
                     }
                 }
                 name = childNameGenerator.writeItemName(parent, item, effectiveSubdir, childName);
+                String computedName = childNameGenerator.itemNameFromItem(parent, item);
+                if (computedName == null) {
+                    computedName = subdir.getName();
+                }
+                if (!computedName.equals(name)) {
+                    throw new IllegalStateException("Computed name '" + computedName + "' does not match name written to file '" + name + "'");
+                }
                 if (item instanceof AbstractItem) {
                     var abstractItem = (AbstractItem) item;
                     if (itemFromDir != null && !legacyName.equals(name) && abstractItem.getDisplayNameOrNull() == null) {
@@ -400,7 +407,15 @@ public static <K, V extends TopLevelItem> Map<K, V> loadChildren(AbstractFolder<
 
     @Override
     public String getItemName(File dir, I item) {
-        return childNameGenerator().readItemName(dir);
+        String name = childNameGenerator().readItemName(dir);
+        String computedName = childNameGenerator().itemNameFromItem(this, item);
+        if (computedName == null) {
+            computedName = dir.getName();
+        }
+        if (!computedName.equals(name)) {
+            throw new IllegalStateException("Computed name '" + computedName + "' does not match name read from file '" + name + "'");
+        }
+        return name;
     }
 
     protected final I itemsPut(String name, I item) {

src/test/java/com/cloudbees/hudson/plugins/folder/ChildNameGeneratorAltTest.java

@@ -68,6 +68,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 
 /**
@@ -114,8 +115,15 @@ public void createdFromScratch() throws Throwable {
                 assertThat("Item loaded from disk", i, instanceOf(ComputedFolderImpl.class));
                 instance = (ComputedFolderImpl) i;
                 checkComputedFolder(instance, 0);
+                var items = new ArrayList<>(instance.getItems());
                 instance.doReload();
                 checkComputedFolder(instance, 0);
+                var newItems = new ArrayList<>(instance.getItems());
+                // Check child items identity is preserved
+                assertThat("Items are the same", items, is(newItems));
+                for (int k = 0; k < items.size(); k++) {
+                    assertSame("Individual items must be the same", items.get(k), newItems.get(k));
+                }
         });
     }