From 070fc9371e0c8b84ec965ad36ef6216b20d1b7c7 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Wed, 15 May 2024 14:25:19 +0100
Subject: [PATCH] simplify name of UberClassloader and update since TODOs

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 core/src/main/java/hudson/ClassicPluginStrategy.java | 8 ++++----
 core/src/main/java/hudson/PluginManager.java         | 2 +-
 core/src/main/java/jenkins/util/URLClassLoader2.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index f58184a2c0fa..d9b37f0fac29 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -271,7 +271,7 @@ public static List<PluginWrapper.Dependency> getImpliedDependencies(String plugi
     /**
      * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
      */
-    @Deprecated(since = "//TODO")
+    @Deprecated(since = "TODO")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent) throws IOException {
         return createClassLoader(paths, parent, null);
     }
@@ -279,15 +279,15 @@ protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent) th
     /**
      * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
      */
-    @Deprecated(since="@TODO")
+    @Deprecated(since="TODO")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         // generate a legacy id so at least we can track to something
-        return createClassLoader("legacy"+UUID.randomUUID(), paths, parent, atts);
+        return createClassLoader("unidentified-" + UUID.randomUUID(), paths, parent, atts);
     }
 
     /**
      * Creates a  classloader that can load all the specified jar files and delegate to the given parent.
-     * @since //TODO
+     * @since TODO
      */
     protected ClassLoader createClassLoader(String name, List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         boolean usePluginFirstClassLoader =
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 34c80912bd09..0cb02b65b9c1 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -2337,7 +2337,7 @@ public static final class UberClassLoader extends ClassLoader {
         }
 
         public UberClassLoader(List<PluginWrapper> activePlugins) {
-            super(activePlugins.stream().map(PluginWrapper::getShortName).collect(Collectors.joining(", ", "UberClassLoader for ", "")), PluginManager.class.getClassLoader());
+            super("UberClassLoader", PluginManager.class.getClassLoader());
             this.activePlugins = activePlugins;
         }
 
diff --git a/core/src/main/java/jenkins/util/URLClassLoader2.java b/core/src/main/java/jenkins/util/URLClassLoader2.java
index e25f6ea653f8..3fdedcbeada0 100644
--- a/core/src/main/java/jenkins/util/URLClassLoader2.java
+++ b/core/src/main/java/jenkins/util/URLClassLoader2.java
@@ -20,7 +20,7 @@ public class URLClassLoader2 extends URLClassLoader implements JenkinsClassLoade
     /**
      * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[])}
      */
-    @Deprecated(since = "//TODO")
+    @Deprecated(since = "TODO")
     public URLClassLoader2(URL[] urls) {
         super(urls);
     }
@@ -28,7 +28,7 @@ public URLClassLoader2(URL[] urls) {
     /**
      * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[], ClassLoader)}
      */
-    @Deprecated(since = "//TODO")
+    @Deprecated(since = "TODO")
     public URLClassLoader2(URL[] urls, ClassLoader parent) {
         super(urls, parent);
     }
@@ -37,7 +37,7 @@ public URLClassLoader2(URL[] urls, ClassLoader parent) {
      * Create a new {@link URLClassLoader2} with the given name and URLS and the {@link #getSystemClassLoader()} as its parent.
      * @param name name of this classloader.
      * @param urls the list of URLS to find classes in.
-     * @since //TODO
+     * @since TODO
      */
     public URLClassLoader2(String name, URL[] urls) {
         super(name, urls, getSystemClassLoader());
@@ -48,7 +48,7 @@ public URLClassLoader2(String name, URL[] urls) {
      * @param name name of this classloader.
      * @param urls the list of URLS to find classes in.
      * @param parent the parent to search for classes before we look in the {@code urls}
-     * @since //TODO
+     * @since TODO
      */
     public URLClassLoader2(String name, URL[] urls, ClassLoader parent) {
         super(name, urls, parent);