From f8f5b25a68f0999c45de865f30dabcbea5781295 Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 19 Feb 2020 15:43:26 +0800 Subject: [PATCH 1/2] Static nested classes --- core/src/main/java/hudson/FilePath.java | 2 +- core/src/main/java/hudson/TcpSlaveAgentListener.java | 2 +- core/src/main/java/hudson/cli/CLIAction.java | 2 +- core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java | 2 +- core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java | 2 +- core/src/main/java/hudson/model/Queue.java | 2 +- core/src/main/java/hudson/tasks/BuildWrapper.java | 2 +- core/src/main/java/hudson/tasks/LogRotator.java | 2 +- .../main/java/hudson/tools/DownloadFromUrlInstaller.java | 2 +- .../main/java/hudson/triggers/SlowTriggerAdminMonitor.java | 2 +- core/src/main/java/hudson/util/XStream2.java | 2 +- core/src/main/java/jenkins/FilePathFilterAggregator.java | 2 +- core/src/test/java/hudson/BulkChangeTest.java | 2 +- core/src/test/java/hudson/model/AbstractItemTest.java | 4 ++-- .../hudson/model/EnvironmentContributingActionTest.java | 6 +++--- .../java/hudson/model/FingerprintCleanupThreadTest.java | 5 ++--- core/src/test/java/hudson/model/LoadStatisticsTest.java | 2 +- core/src/test/java/hudson/util/CyclicGraphDetectorTest.java | 4 ++-- core/src/test/java/hudson/util/IsOverriddenTest.java | 2 +- core/src/test/java/hudson/util/io/TarArchiverTest.java | 2 +- .../test/java/jenkins/util/MarkFindingOutputStreamTest.java | 2 +- test/src/test/java/hudson/ExtensionListListenerTest.java | 2 +- test/src/test/java/hudson/model/ApiSEC1704Test.java | 2 +- .../java/hudson/model/UpdateCenterConnectionStatusTest.java | 2 +- test/src/test/java/hudson/security/SecurityRealmTest.java | 2 +- test/src/test/java/hudson/security/WhoAmITest.java | 2 +- .../test/java/hudson/tools/ZipExtractionInstallerTest.java | 2 +- .../java/jenkins/security/stapler/DoActionFilterTest.java | 2 +- 28 files changed, 33 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 01a8d3cc0e..60d68e6306 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -3275,7 +3275,7 @@ public final class FilePath implements SerializableOnlyOverRemoting { return act(new IsDescendant(potentialChildRelativePath)); } - private class IsDescendant extends SecureFileCallable { + private static class IsDescendant extends SecureFileCallable { private static final long serialVersionUID = 1L; private String potentialChildRelativePath; diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java index 39ba388d2d..dfe9f4ce20 100644 --- a/core/src/main/java/hudson/TcpSlaveAgentListener.java +++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java @@ -360,7 +360,7 @@ public final class TcpSlaveAgentListener extends Thread { } // This is essentially just to be able to pass the parent thread into the callback, as it can't access it otherwise - private abstract class ConnectionHandlerFailureCallback { + private static abstract class ConnectionHandlerFailureCallback { private Thread parentThread; public ConnectionHandlerFailureCallback(Thread parentThread) { diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java index 102dbbc00b..efca422c44 100644 --- a/core/src/main/java/hudson/cli/CLIAction.java +++ b/core/src/main/java/hudson/cli/CLIAction.java @@ -190,7 +190,7 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy { } } - class ServerSideImpl extends PlainCLIProtocol.ServerSide { + static class ServerSideImpl extends PlainCLIProtocol.ServerSide { private Thread runningThread; private boolean ready; private final List args = new ArrayList<>(); diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java index eb0c10584a..b46eb9ec28 100644 --- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java @@ -53,7 +53,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/fsp/WorkspaceSnapshotSCM.java b/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java index e8c19e62a8..426ad5b7e1 100644 --- a/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java +++ b/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java @@ -69,7 +69,7 @@ public class WorkspaceSnapshotSCM extends SCM { /** * {@link Exception} indicating that the resolution of the job/permalink failed. */ - private final class ResolvedFailedException extends Exception { + private static final class ResolvedFailedException extends Exception { private ResolvedFailedException(String message) { super(message); } diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 0ceb35fbce..cbbb41a80b 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2419,7 +2419,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/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index bce32eae14..4c9ea301c3 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -76,7 +76,7 @@ public abstract class BuildWrapper extends AbstractDescribableImpl * It is expected that the subclasses of {@link BuildWrapper} extends this * class and implements its own semantics. */ - public abstract class Environment extends hudson.model.Environment { + public static abstract class Environment extends hudson.model.Environment { /** * Runs after the {@link Builder} completes, and performs a tear down. * diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index b73aea0912..8c44d1ca5a 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -64,7 +64,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/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java index 6fa7dd8371..adbc0ea500 100644 --- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java +++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java @@ -248,7 +248,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { * Convenient abstract class to implement a NodeSpecificInstallable based on an existing Installable * @since 1.626 */ - public abstract class NodeSpecificInstallable extends Installable implements NodeSpecific { + public static abstract class NodeSpecificInstallable extends Installable implements NodeSpecific { public NodeSpecificInstallable(Installable inst) { this.id = inst.id; diff --git a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java index 131181c0be..15bcdc9fe2 100644 --- a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java +++ b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java @@ -92,7 +92,7 @@ public class SlowTriggerAdminMonitor extends AdministrativeMonitor { return HttpResponses.redirectViaContextPath("/manage"); } - public class Value { + public static class Value { private final LocalDateTime time; private final String msg; diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 43f0dfd08c..fb3e4a8431 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -327,7 +327,7 @@ public class XStream2 extends XStream { mapperInjectionPoint.setDelegate(m); } - final class MapperInjectionPoint extends MapperDelegate { + final static class MapperInjectionPoint extends MapperDelegate { public MapperInjectionPoint(Mapper wrapped) { super(wrapped); } diff --git a/core/src/main/java/jenkins/FilePathFilterAggregator.java b/core/src/main/java/jenkins/FilePathFilterAggregator.java index 407d8da2cb..f338d25888 100644 --- a/core/src/main/java/jenkins/FilePathFilterAggregator.java +++ b/core/src/main/java/jenkins/FilePathFilterAggregator.java @@ -20,7 +20,7 @@ import java.util.concurrent.CopyOnWriteArrayList; class FilePathFilterAggregator extends FilePathFilter { private final CopyOnWriteArrayList all = new CopyOnWriteArrayList<>(); - private class Entry implements Comparable { + private static class Entry implements Comparable { final FilePathFilter filter; final double ordinal; diff --git a/core/src/test/java/hudson/BulkChangeTest.java b/core/src/test/java/hudson/BulkChangeTest.java index 7e93dc4e09..e738e9259f 100644 --- a/core/src/test/java/hudson/BulkChangeTest.java +++ b/core/src/test/java/hudson/BulkChangeTest.java @@ -37,7 +37,7 @@ import java.io.IOException; */ public class BulkChangeTest { - private class Point implements Saveable { + private static class Point implements Saveable { /** * Don't actually do any save, but just remember how many the actual I/O would have happened. */ diff --git a/core/src/test/java/hudson/model/AbstractItemTest.java b/core/src/test/java/hudson/model/AbstractItemTest.java index b5dcdf41d2..4ee09dfad0 100644 --- a/core/src/test/java/hudson/model/AbstractItemTest.java +++ b/core/src/test/java/hudson/model/AbstractItemTest.java @@ -16,7 +16,7 @@ import org.jvnet.hudson.test.Issue; @SuppressWarnings("unchecked") public class AbstractItemTest { - private class StubAbstractItem extends AbstractItem { + private static class StubAbstractItem extends AbstractItem { protected StubAbstractItem() { // sending in null as parent as I don't care for my current tests @@ -91,7 +91,7 @@ public class AbstractItemTest { assertEquals(displayName, i.getDisplayName()); } - private class NameNotEditableItem extends AbstractItem { + private static class NameNotEditableItem extends AbstractItem { protected NameNotEditableItem(ItemGroup parent, String name){ super(parent, name); diff --git a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java index 8bf6c69b30..aee451908a 100644 --- a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java +++ b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.when; public class EnvironmentContributingActionTest { - class OverrideRun extends InvisibleAction implements EnvironmentContributingAction { + static class OverrideRun extends InvisibleAction implements EnvironmentContributingAction { private boolean wasCalled = false; @Override @@ -24,7 +24,7 @@ public class EnvironmentContributingActionTest { } } - class OverrideAbstractBuild extends InvisibleAction implements EnvironmentContributingAction { + static class OverrideAbstractBuild extends InvisibleAction implements EnvironmentContributingAction { private boolean wasCalled = false; @Override @@ -38,7 +38,7 @@ public class EnvironmentContributingActionTest { } } - class OverrideBoth extends InvisibleAction implements EnvironmentContributingAction { + static class OverrideBoth extends InvisibleAction implements EnvironmentContributingAction { private boolean wasCalledAbstractBuild = false; private boolean wasCalledRun = false; diff --git a/core/src/test/java/hudson/model/FingerprintCleanupThreadTest.java b/core/src/test/java/hudson/model/FingerprintCleanupThreadTest.java index 61a1a72645..549a50df50 100644 --- a/core/src/test/java/hudson/model/FingerprintCleanupThreadTest.java +++ b/core/src/test/java/hudson/model/FingerprintCleanupThreadTest.java @@ -107,7 +107,7 @@ public class FingerprintCleanupThreadTest { tempDirectory.toFile().deleteOnExit(); } - private class TestTaskListener implements TaskListener { + private static class TestTaskListener implements TaskListener { private ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); private PrintStream logStream = new PrintStream(outputStream); @@ -126,7 +126,6 @@ public class FingerprintCleanupThreadTest { public TestFingerprintCleanupThread(Fingerprint fingerprintToLoad) throws IOException { this.fingerprintToLoad = fingerprintToLoad; - return; } @Override @@ -146,7 +145,7 @@ public class FingerprintCleanupThreadTest { } - private class TestFingerprint extends Fingerprint { + private static class TestFingerprint extends Fingerprint { private boolean isAlive = true; diff --git a/core/src/test/java/hudson/model/LoadStatisticsTest.java b/core/src/test/java/hudson/model/LoadStatisticsTest.java index 246bdb3f1d..d49fad2609 100644 --- a/core/src/test/java/hudson/model/LoadStatisticsTest.java +++ b/core/src/test/java/hudson/model/LoadStatisticsTest.java @@ -101,7 +101,7 @@ public class LoadStatisticsTest { assertThat(LoadStatistics.isModern(LoadStatistics.class), is(false)); } - private class Modern extends LoadStatistics { + private static class Modern extends LoadStatistics { protected Modern(int initialOnlineExecutors, int initialBusyExecutors) { super(initialOnlineExecutors, initialBusyExecutors); diff --git a/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java b/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java index d99640068b..42c68e0e27 100644 --- a/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java +++ b/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java @@ -16,7 +16,7 @@ import java.util.Set; */ public class CyclicGraphDetectorTest { - private class Edge { + private static class Edge { String src,dst; private Edge(String src, String dst) { @@ -25,7 +25,7 @@ public class CyclicGraphDetectorTest { } } - private class Graph extends ArrayList { + private static class Graph extends ArrayList { Graph e(String src, String dst) { add(new Edge(src,dst)); return this; diff --git a/core/src/test/java/hudson/util/IsOverriddenTest.java b/core/src/test/java/hudson/util/IsOverriddenTest.java index 36f45c3de5..0048a69553 100644 --- a/core/src/test/java/hudson/util/IsOverriddenTest.java +++ b/core/src/test/java/hudson/util/IsOverriddenTest.java @@ -62,7 +62,7 @@ public class IsOverriddenTest { Util.isOverridden(Base.class, Intermediate.class, "aPrivateMethod"); } - public abstract class Base { + public static abstract class Base { protected abstract void method(); private void aPrivateMethod() {} public void setX(T t) {} diff --git a/core/src/test/java/hudson/util/io/TarArchiverTest.java b/core/src/test/java/hudson/util/io/TarArchiverTest.java index 8900f83193..0983d9a199 100644 --- a/core/src/test/java/hudson/util/io/TarArchiverTest.java +++ b/core/src/test/java/hudson/util/io/TarArchiverTest.java @@ -136,7 +136,7 @@ public class TarArchiverTest { t1.join(); } - private class GrowingFileRunnable implements Runnable { + private static class GrowingFileRunnable implements Runnable { private boolean finish = false; private Exception ex = null; private File file; diff --git a/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java b/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java index 3de38b3449..19e18af62b 100644 --- a/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java +++ b/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java @@ -84,7 +84,7 @@ public class MarkFindingOutputStreamTest { m.write(s.charAt(i)); } - class MarkCountingOutputStream extends MarkFindingOutputStream { + static class MarkCountingOutputStream extends MarkFindingOutputStream { int count = 0; MarkCountingOutputStream(OutputStream base) { diff --git a/test/src/test/java/hudson/ExtensionListListenerTest.java b/test/src/test/java/hudson/ExtensionListListenerTest.java index b3449dbeb9..3a6088e50d 100644 --- a/test/src/test/java/hudson/ExtensionListListenerTest.java +++ b/test/src/test/java/hudson/ExtensionListListenerTest.java @@ -56,7 +56,7 @@ public class ExtensionListListenerTest { Assert.assertEquals(1, listListener.onChangeCallCount); } - private class MyExtensionListListener extends ExtensionListListener { + private static class MyExtensionListListener extends ExtensionListListener { private int onChangeCallCount = 0; @Override public void onChange() { diff --git a/test/src/test/java/hudson/model/ApiSEC1704Test.java b/test/src/test/java/hudson/model/ApiSEC1704Test.java index e0a8bcf4b6..3aca1048b5 100644 --- a/test/src/test/java/hudson/model/ApiSEC1704Test.java +++ b/test/src/test/java/hudson/model/ApiSEC1704Test.java @@ -99,7 +99,7 @@ public class ApiSEC1704Test { } @ExportedBean - class CustomData { + static class CustomData { private String secret; CustomData(String secret){ this.secret = secret; diff --git a/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java index b06ee59627..50c2eb69a9 100644 --- a/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java @@ -124,7 +124,7 @@ public class UpdateCenterConnectionStatusTest { Assert.assertEquals(ConnectionStatus.FAILED, job.connectionStates.get(ConnectionStatus.UPDATE_SITE)); } - private class TestConfig extends UpdateCenter.UpdateCenterConfiguration { + private static class TestConfig extends UpdateCenter.UpdateCenterConfiguration { private IOException checkConnectionException; private IOException checkUpdateCenterException; diff --git a/test/src/test/java/hudson/security/SecurityRealmTest.java b/test/src/test/java/hudson/security/SecurityRealmTest.java index 5d4ef3868f..da4f4a05e7 100644 --- a/test/src/test/java/hudson/security/SecurityRealmTest.java +++ b/test/src/test/java/hudson/security/SecurityRealmTest.java @@ -72,7 +72,7 @@ public class SecurityRealmTest { assertThat(response.getResponseHeaderValue("Expires"), is("0")); } - private class DummyCaptcha extends CaptchaSupport { + private static class DummyCaptcha extends CaptchaSupport { @Override public boolean validateCaptcha(String id, String text) { return false; diff --git a/test/src/test/java/hudson/security/WhoAmITest.java b/test/src/test/java/hudson/security/WhoAmITest.java index b59bc98cbc..e74e07ccf2 100644 --- a/test/src/test/java/hudson/security/WhoAmITest.java +++ b/test/src/test/java/hudson/security/WhoAmITest.java @@ -201,7 +201,7 @@ public class WhoAmITest { ))); } - private class SecurityRealmImpl extends AbstractPasswordBasedSecurityRealm { + private static class SecurityRealmImpl extends AbstractPasswordBasedSecurityRealm { @Override protected UserDetails authenticate(String username, String password) throws AuthenticationException { diff --git a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java index 22a211ddfd..75f41e5d6e 100644 --- a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java +++ b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java @@ -136,7 +136,7 @@ public class ZipExtractionInstallerTest { assertThat(lastRequest.getResponseText(), containsString(Messages.ZipExtractionInstaller_malformed_url())); } - private class SpyingJavaScriptEngine extends JavaScriptEngine { + private static class SpyingJavaScriptEngine extends JavaScriptEngine { private List storedRequests = new ArrayList<>(); private String urlToMatch; private HttpMethod method; diff --git a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java index ed5bafdfca..d59bed0d8a 100644 --- a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java +++ b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java @@ -73,7 +73,7 @@ public class DoActionFilterTest extends StaplerAbstractTest { private TestAccessModifier getPrivate() {return new TestAccessModifier();} - public class TestAccessModifier { + public static class TestAccessModifier { @GET public String doValue() { return "hello"; From 5ba7c464cf31a7649d83763a8c66c0125602c07f Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Thu, 20 Feb 2020 07:54:15 +0800 Subject: [PATCH 2/2] Revert public classes --- core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java | 2 +- core/src/main/java/hudson/model/Queue.java | 2 +- core/src/main/java/hudson/tasks/BuildWrapper.java | 2 +- core/src/main/java/hudson/tasks/LogRotator.java | 2 +- core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java | 2 +- core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java index b46eb9ec28..eb0c10584a 100644 --- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java @@ -53,7 +53,7 @@ public final class MemoryUsageMonitor extends PeriodicWork { /** * A memory group is conceptually a set of memory pools. */ - public static final class MemoryGroup { + public 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 cbbb41a80b..0ceb35fbce 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2419,7 +2419,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 static class StubItem { + public class StubItem { @Exported public StubTask task; diff --git a/core/src/main/java/hudson/tasks/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index 4c9ea301c3..bce32eae14 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -76,7 +76,7 @@ public abstract class BuildWrapper extends AbstractDescribableImpl * It is expected that the subclasses of {@link BuildWrapper} extends this * class and implements its own semantics. */ - public static abstract class Environment extends hudson.model.Environment { + public abstract class Environment extends hudson.model.Environment { /** * Runs after the {@link Builder} completes, and performs a tear down. * diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 8c44d1ca5a..b73aea0912 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -64,7 +64,7 @@ public class LogRotator extends BuildDiscarder { /** @deprecated Replaced by more generic {@link CompositeIOException}. */ @Deprecated - public static class CollatedLogRotatorException extends IOException { + public class CollatedLogRotatorException extends IOException { private static final long serialVersionUID = 5944233808072651101L; public final Collection collated; diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java index adbc0ea500..6fa7dd8371 100644 --- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java +++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java @@ -248,7 +248,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { * Convenient abstract class to implement a NodeSpecificInstallable based on an existing Installable * @since 1.626 */ - public static abstract class NodeSpecificInstallable extends Installable implements NodeSpecific { + public abstract class NodeSpecificInstallable extends Installable implements NodeSpecific { public NodeSpecificInstallable(Installable inst) { this.id = inst.id; diff --git a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java index 15bcdc9fe2..131181c0be 100644 --- a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java +++ b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java @@ -92,7 +92,7 @@ public class SlowTriggerAdminMonitor extends AdministrativeMonitor { return HttpResponses.redirectViaContextPath("/manage"); } - public static class Value { + public class Value { private final LocalDateTime time; private final String msg;