Cleanup migrations (move comments, formatting, spotbugs...)

strangelookingnerd · strangelookingnerd · commit d6ae31d38921 · 2026-01-06T09:43:35.000+01:00
diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
@@ -174,6 +174,9 @@ public static int _main(String[] _args) throws Exception {
                     printUsage("-remoting mode is no longer supported");
                     return -1;
                 }
+                default -> {
+                    // continue
+                }
             }
             if (head.equals("-s") && args.size() >= 2) {
                 url = args.get(1);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
@@ -583,7 +583,7 @@ public void run(Reactor session) throws Exception {
 
                     // schedule execution of loading plugins
                     for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) {
-                        g.followedBy().notFatal().attains(PLUGINS_PREPARED).add(String.format("Loading plugin %s v%s (%s)", p.getLongName(), p.getVersion(), p.getShortName()), session3 -> {
+                        g.followedBy().notFatal().attains(PLUGINS_PREPARED).add(String.format("Loading plugin %s v%s (%s)", p.getLongName(), p.getVersion(), p.getShortName()), reactor -> {
                             try {
                                 p.resolvePluginDependencies();
                                 strategy.load(p);
@@ -605,7 +605,7 @@ public void run(Reactor session) throws Exception {
 
                     // schedule execution of initializing plugins
                     for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) {
-                        g.followedBy().notFatal().attains(PLUGINS_STARTED).add("Initializing plugin " + p.getShortName(), session2 -> {
+                        g.followedBy().notFatal().attains(PLUGINS_STARTED).add("Initializing plugin " + p.getShortName(), reactor -> {
                             if (!activePlugins.contains(p)) {
                                 return;
                             }
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
@@ -881,12 +881,12 @@ private Set<String> dependentsToCheck(PluginDisableStrategy strategy) {
         Set<String> dependentsToCheck = switch (strategy) {
             case ALL ->
                 // getDependents returns all the dependent plugins, mandatory or optional.
-                    this.getDependents();
+                this.getDependents();
             default ->
                 // It includes MANDATORY, NONE:
                 // with NONE, the process only fail if mandatory dependent plugins exists
                 // As of getDependents has all the dependents, we get the difference between them and only the optionals
-                    Sets.difference(this.getDependents(), this.getOptionalDependents());
+                Sets.difference(this.getDependents(), this.getOptionalDependents());
         };
         return dependentsToCheck;
     }
diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java
@@ -229,10 +229,10 @@ public void shutdown() {
 
     private final class ConnectionHandler extends Thread {
         private static final String DEFAULT_RESPONSE_404 = """
-                HTTP/1.0 404 Not Found\r
-                Content-Type: text/plain;charset=UTF-8\r
-                \r
-                Not Found\r
+                HTTP/1.0 404 Not Found
+                Content-Type: text/plain;charset=UTF-8
+
+                Not Found
                 """;
         private final Socket s;
         /**
diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java
@@ -223,18 +223,18 @@ protected int run() throws Exception {
     protected void printUsageSummary(PrintStream stderr) {
         stderr.println(
                 """
-                        Starts a build, and optionally waits for a completion.
-                        Aside from general scripting use, this command can be
-                        used to invoke another job from within a build of one job.
-                        With the -s option, this command changes the exit code based on
-                        the outcome of the build (exit code 0 indicates a success)
-                        and interrupting the command will interrupt the job.
-                        With the -f option, this command changes the exit code based on
-                        the outcome of the build (exit code 0 indicates a success)
-                        however, unlike -s, interrupting the command will not interrupt
-                        the job (exit code 125 indicates the command was interrupted).
-                        With the -c option, a build will only run if there has been
-                        an SCM change."""
+                Starts a build, and optionally waits for a completion.
+                Aside from general scripting use, this command can be
+                used to invoke another job from within a build of one job.
+                With the -s option, this command changes the exit code based on
+                the outcome of the build (exit code 0 indicates a success)
+                and interrupting the command will interrupt the job.
+                With the -f option, this command changes the exit code based on
+                the outcome of the build (exit code 0 indicates a success)
+                however, unlike -s, interrupting the command will not interrupt
+                the job (exit code 125 indicates the command was interrupted).
+                With the -c option, a build will only run if there has been
+                an SCM change."""
         );
     }
 
diff --git a/core/src/main/java/hudson/cli/DisablePluginCommand.java b/core/src/main/java/hudson/cli/DisablePluginCommand.java
@@ -47,7 +47,7 @@ public class DisablePluginCommand extends CLICommand {
     private boolean restart;
 
     @Option(name = "-strategy", aliases = "-s", metaVar = "strategy", usage = """
-            How to process the dependent plugins.\s
+            How to process the dependent plugins.
             - none: if a mandatory dependent plugin exists and it is enabled, the plugin cannot be disabled (default value).
             - mandatory: all mandatory dependent plugins are also disabled, optional dependent plugins remain enabled.
             - all: all dependent plugins are also disabled, no matter if its dependency is optional or mandatory.""")
diff --git a/core/src/main/java/hudson/console/ConsoleAnnotator.java b/core/src/main/java/hudson/console/ConsoleAnnotator.java
@@ -113,8 +113,8 @@ public ConsoleAnnotator annotate(T context, MarkupText text) {
             }
 
             return switch (list.size()) {
-                case 0 -> null;    // no more annotator left
-                case 1 -> list.getFirst(); // no point in aggregating
+                case 0 -> null;             // no more annotator left
+                case 1 -> list.getFirst();  // no point in aggregating
                 default -> this;
             };
         }
@@ -130,8 +130,8 @@ public String toString() {
      */
     public static <T> ConsoleAnnotator<T> combine(Collection<? extends ConsoleAnnotator<? super T>> all) {
         return switch (all.size()) {
-            case 0 -> null;    // none
-            case 1 -> cast(all.iterator().next()); // just one
+            case 0 -> null;                         // none
+            case 1 -> cast(all.iterator().next());  // just one
             default -> new ConsoleAnnotatorAggregator<>(all);
         };
     }
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
@@ -438,7 +438,7 @@ public static <T> boolean hasDuplicates(List<T> genericList, String comparator)
             try {
                 field = genericList.getFirst().getClass().getDeclaredField(comparator);
             } catch (NoSuchFieldException e) {
-                LOGGER.warning("comparator: " + comparator + "does not exist for " + genericList.getFirst().getClass() + ", " + e);
+                LOGGER.warning("comparator: " + comparator + " does not exist for " + genericList.getFirst().getClass() + ", " + e);
                 return false;
             }
             for (int i = 0; i < genericList.size(); i++) {
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -276,11 +276,11 @@ public static class RestrictedApi extends Api {
             String text;
             CrumbIssuer ci = (CrumbIssuer) bean;
             switch (xpath) {
-                case "/*/crumbRequestField/text()" ->  // old FullDuplexHttpStream
+                case "/*/crumbRequestField/text()" ->                   // old FullDuplexHttpStream
                         text = ci.getCrumbRequestField();
-                case "/*/crumb/text()" ->  // ditto
+                case "/*/crumb/text()" ->                               // ditto
                         text = ci.getCrumb();
-                case "concat(//crumbRequestField,\":\",//crumb)" ->  // new FullDuplexHttpStream; Main
+                case "concat(//crumbRequestField,\":\",//crumb)" ->     // new FullDuplexHttpStream; Main
                         text = ci.getCrumbRequestField() + ':' + ci.getCrumb();
                 case "concat(//crumbRequestField,'=',//crumb)" -> {
                     if (ci.getCrumbRequestField().startsWith(".") || ci.getCrumbRequestField().contains("-")) {
diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java
@@ -247,7 +247,6 @@ public ArgumentListBuilder addKeyValuePairsFromPropertyString(String prefix, Str
      * @see <a href="https://issues.jenkins.io/browse/JENKINS-10539">JENKINS-10539</a>
      */
     private static VariableResolver<String> propertiesGeneratingResolver(final VariableResolver<String> original) {
-
         return name -> {
             final String value = original.resolve(name);
             if (value == null) return null;
diff --git a/core/src/main/java/hudson/util/ChartUtil.java b/core/src/main/java/hudson/util/ChartUtil.java
@@ -85,7 +85,7 @@ public int compareTo(NumberOnlyBuildLabel that) {
 
         @Override
         public boolean equals(Object o) {
-            if (!(o instanceof NumberOnlyBuildLabel that))    return false;
+            if (!(o instanceof NumberOnlyBuildLabel that)) return false;
             return run == that.run;
         }
 
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
@@ -478,13 +478,15 @@ public static ProcessTree get() {
                 case "FreeBSD" -> {
                     return new FreeBSD(vetoes);
                 }
+                default -> {
+                    return DEFAULT;
+                }
             }
         } catch (LinkageError e) {
             LOGGER.log(Level.FINE, "Failed to load OS-specific implementation; reverting to the default", e);
             enabled = false;
+            return DEFAULT;
         }
-
-        return DEFAULT;
     }
 
     private static class DoVetoersExist extends SlaveToMasterCallable<Boolean, IOException> {
diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java
@@ -200,6 +200,7 @@ private void stopVisiting() {
         }
     }
 
+    @SuppressWarnings("deprecation")
     protected void doMarshal(final Object source, final HierarchicalStreamWriter writer, final MarshallingContext context) {
         final Set seenFields = new HashSet();
         final Set seenAsAttributes = new HashSet();
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -5123,7 +5123,6 @@ public Future<DependencyGraph> rebuildDependencyGraphAsync() {
         synchronized (dependencyGraphLock) {
             // Collect calls to this method to avoid unnecessary calculation of the dependency graph
             return Objects.requireNonNullElseGet(scheduledFutureDependencyGraph, () -> scheduledFutureDependencyGraph = scheduleCalculationOfFutureDependencyGraph(500, TimeUnit.MILLISECONDS));
-            // Schedule new calculation
         }
     }
 
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -369,10 +369,9 @@ private Map<String, JSONObject> convertToTokenMap(Object tokenStoreData) {
                 return result;
             }
             default -> {
+                throw HttpResponses.error(400, "Unexpected class received for the token store information");
             }
         }
-
-        throw HttpResponses.error(400, "Unexpected class received for the token store information");
     }
 
     private void addJSONTokenIntoMap(Map<String, JSONObject> tokenMap, JSONObject tokenData) {
diff --git a/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java b/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java
@@ -93,7 +93,7 @@ public synchronized Future<V> submit() {
      * but {@link #inprogress} is null (meaning none is executing right now),
      * get one going.
      */
-    @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification = "method signature does not permit plumbing through the return value")
+    @SuppressFBWarnings(value = {"RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", "IS2_INCONSISTENT_SYNC"}, justification = "method signature does not permit plumbing through the return value")
     private synchronized void maybeRun() {
         if (inprogress == null && pending != null) {
             base.submit((Callable<Void>) () -> {
diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java
@@ -318,8 +318,8 @@ public static void main(String[] args) throws IllegalAccessException {
             try {
                 Field f = cl.loadClass("winstone.WinstoneSession").getField("SESSION_COOKIE_NAME");
                 f.setAccessible(true);
-                // Use the user-defined cookie name
-                // Randomize session names by default to prevent collisions when running multiple Jenkins instances on the same host.
+                // Use the user-defined cookie name or
+                // randomized session names as default to prevent collisions when running multiple Jenkins instances on the same host.
                 f.set(null, Objects.requireNonNullElseGet(JSESSIONID_COOKIE_NAME, () -> "JSESSIONID." + UUID.randomUUID().toString().replace("-", "").substring(0, 8)));
             } catch (ClassNotFoundException | NoSuchFieldException e) {
                 throw new AssertionError(e);

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,9 @@ public static int _main(String[] _args) throws Exception {`
`174`	`174`	`printUsage("-remoting mode is no longer supported");`
`175`	`175`	`return -1;`
`176`	`176`	`}`
	`177`	`+ default -> {`
	`178`	`+ // continue`
	`179`	`+ }`
`177`	`180`	`}`
`178`	`181`	`if (head.equals("-s") && args.size() >= 2) {`
`179`	`182`	`url = args.get(1);`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ public static <T> boolean hasDuplicates(List<T> genericList, String comparator)`
`438`	`438`	`try {`
`439`	`439`	`field = genericList.getFirst().getClass().getDeclaredField(comparator);`
`440`	`440`	`} catch (NoSuchFieldException e) {`
`441`		`- LOGGER.warning("comparator: " + comparator + "does not exist for " + genericList.getFirst().getClass() + ", " + e);`
	`441`	`+ LOGGER.warning("comparator: " + comparator + " does not exist for " + genericList.getFirst().getClass() + ", " + e);`
`442`	`442`	`return false;`
`443`	`443`	`}`
`444`	`444`	`for (int i = 0; i < genericList.size(); i++) {`