From cd91b39f569ff2fc17e77c740fdc0a7eeafd54bd Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 4 Dec 2021 21:36:09 -0800 Subject: [PATCH] Fix `SIC_INNER_SHOULD_BE_STATIC` SpotBugs violations --- core/src/main/java/hudson/FilePath.java | 4 ++-- core/src/main/java/hudson/PluginManager.java | 4 ++-- .../java/hudson/diagnosis/MemoryUsageMonitor.java | 2 +- core/src/main/java/hudson/model/Queue.java | 2 +- core/src/main/java/hudson/tasks/LogRotator.java | 2 +- .../hudson/triggers/SlowTriggerAdminMonitor.java | 2 +- src/spotbugs/spotbugs-excludes.xml | 13 ------------- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index e4850c6361..1e0693c456 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -1035,7 +1035,7 @@ public final class FilePath implements SerializableOnlyOverRemoting { } // this reads from arbitrary URL - private final class Unpack extends MasterToSlaveFileCallable { + private static final class Unpack extends MasterToSlaveFileCallable { private final URL archive; Unpack(URL archive) { this.archive = archive; @@ -2938,7 +2938,7 @@ public final class FilePath implements SerializableOnlyOverRemoting { public @CheckForNull String validateAntFileMask(final String fileMasks, final int bound, final boolean caseSensitive) throws IOException, InterruptedException { return act(new ValidateAntFileMask(fileMasks, caseSensitive, bound)); } - private class ValidateAntFileMask extends MasterToSlaveFileCallable { + private static class ValidateAntFileMask extends MasterToSlaveFileCallable { private final String fileMasks; private final boolean caseSensitive; private final int bound; diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 0485275a16..4d2e1e63f3 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -1738,7 +1738,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas void cleanup(); } - class FileUploadPluginCopier implements PluginCopier { + static class FileUploadPluginCopier implements PluginCopier { private FileItem fileItem; FileUploadPluginCopier(FileItem fileItem) { @@ -1756,7 +1756,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas } } - class UrlPluginCopier implements PluginCopier { + static class UrlPluginCopier implements PluginCopier { private String url; UrlPluginCopier(String url) { diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java index f29bb4b4e2..06ed43cb1a 100644 --- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java @@ -51,7 +51,7 @@ public final class MemoryUsageMonitor extends PeriodicWork { /** * A memory group is conceptually a set of memory pools. */ - public final class MemoryGroup { + public static final class MemoryGroup { private final List pools = new ArrayList<>(); /** diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 64af981be6..b03627d6b8 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2453,7 +2453,7 @@ public class Queue extends ResourceController implements Saveable { @Restricted(NoExternalUse.class) @ExportedBean(defaultVisibility = 999) @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "it is exported, so it might be used") - public class StubItem { + public static class StubItem { @Exported public StubTask task; diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 6ac8037706..89ba0cf3a9 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -62,7 +62,7 @@ public class LogRotator extends BuildDiscarder { /** @deprecated Replaced by more generic {@link CompositeIOException}. */ @Deprecated - public class CollatedLogRotatorException extends IOException { + public static class CollatedLogRotatorException extends IOException { private static final long serialVersionUID = 5944233808072651101L; public final Collection collated; diff --git a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java index bfba8a072b..67f7da9315 100644 --- a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java +++ b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java @@ -94,7 +94,7 @@ public class SlowTriggerAdminMonitor extends AdministrativeMonitor { return HttpResponses.redirectViaContextPath("/manage"); } - public class Value { + public static class Value { private final LocalDateTime time; private Class trigger; diff --git a/src/spotbugs/spotbugs-excludes.xml b/src/spotbugs/spotbugs-excludes.xml index e042142993..fbc7bb55fe 100644 --- a/src/spotbugs/spotbugs-excludes.xml +++ b/src/spotbugs/spotbugs-excludes.xml @@ -603,19 +603,6 @@ - - - - - - - - - - - - -