Author: markt
Date: Tue May 22 18:54:04 2018
New Revision: 1832055
URL: http://svn.apache.org/viewvc?rev=1832055&view=rev
Log:
SpotBugs: Make inner classes static where possible
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/trunk/test/org/apache/juli/TestOneLineFormatterPerformance.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Tue
May 22 18:54:04 2018
@@ -418,7 +418,7 @@ public class Http2AsyncUpgradeHandler ex
}
- private class AsyncHeaderFrameBuffers implements HeaderFrameBuffers {
+ private static class AsyncHeaderFrameBuffers implements HeaderFrameBuffers
{
int payloadSize;
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
Tue May 22 18:54:04 2018
@@ -267,7 +267,7 @@ public class StatementDecoratorIntercept
}
}
- protected class ResultSetProxy implements InvocationHandler {
+ protected static class ResultSetProxy implements InvocationHandler {
private Object st;
private Object delegate;
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
Tue May 22 18:54:04 2018
@@ -197,7 +197,7 @@ public class TestSlowQueryReport extends
}
- public class ClientListener implements NotificationListener {
+ public static class ClientListener implements NotificationListener {
AtomicInteger notificationCount = new AtomicInteger(0);
@Override
public void handleNotification(Notification notification,
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
Tue May 22 18:54:04 2018
@@ -463,7 +463,7 @@ public class TestBasicAuthParser {
* for BASIC Authentication.
* Note: only used internally, so no need to validate arguments.
*/
- private final class BasicAuthHeader {
+ private static final class BasicAuthHeader {
private final String HTTP_AUTH = "authorization: ";
private final byte[] HEADER =
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Tue May 22
18:54:04 2018
@@ -845,7 +845,7 @@ public class TestRequest extends TomcatB
Assert.assertEquals(expected, resultPath);
}
- private class Bug56501Servlet extends HttpServlet {
+ private static class Bug56501Servlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -957,7 +957,7 @@ public class TestRequest extends TomcatB
}
- private class Bug61264GetReaderServlet extends HttpServlet {
+ private static class Bug61264GetReaderServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
Tue May 22 18:54:04 2018
@@ -139,7 +139,7 @@ public class TestDefaultInstanceManager
}
- private class InstanceManagerRunnable implements Runnable {
+ private static class InstanceManagerRunnable implements Runnable {
private final InstanceManager im;
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue May
22 18:54:04 2018
@@ -899,7 +899,7 @@ public class TestStandardContext extends
.isAvailable());
}
- private class FailingStartupServlet extends HttpServlet {
+ private static class FailingStartupServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
Tue May 22 18:54:04 2018
@@ -104,7 +104,7 @@ public class TestWebappClassLoaderExecut
resp.getWriter().flush();
}
- class Task implements Runnable {
+ static class Task implements Runnable {
String _id;
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
Tue May 22 18:54:04 2018
@@ -139,7 +139,7 @@ public class TestStuckThreadDetectionVal
Assert.assertTrue(result.toString().startsWith("OK"));
}
- private class StuckingServlet extends HttpServlet {
+ private static class StuckingServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private final long delay;
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Tue May
22 18:54:04 2018
@@ -305,7 +305,7 @@ public class TestUpgrade extends TomcatB
}
- private class EchoListener implements ReadListener, WriteListener {
+ private static class EchoListener implements ReadListener,
WriteListener {
private final ServletInputStream sis;
private final ServletOutputStream sos;
Modified: tomcat/trunk/test/org/apache/juli/TestOneLineFormatterPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/juli/TestOneLineFormatterPerformance.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/juli/TestOneLineFormatterPerformance.java
(original)
+++ tomcat/trunk/test/org/apache/juli/TestOneLineFormatterPerformance.java Tue
May 22 18:54:04 2018
@@ -49,7 +49,7 @@ public class TestOneLineFormatterPerform
}
- private class StringFormatImpl implements DateFormat {
+ private static class StringFormatImpl implements DateFormat {
@Override
public String format(long timestamp) {
@@ -58,7 +58,7 @@ public class TestOneLineFormatterPerform
}
- private class DateFormatCacheImpl implements DateFormat {
+ private static class DateFormatCacheImpl implements DateFormat {
private final DateFormatCache cache;
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Tue May 22
18:54:04 2018
@@ -189,7 +189,7 @@ public class TestByteChunk {
}
- public class Sink implements ByteOutputChannel {
+ public static class Sink implements ByteOutputChannel {
@Override
public void realWriteBytes(byte[] cbuf, int off, int len) throws
IOException {
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Tue May 22
18:54:04 2018
@@ -86,7 +86,7 @@ public class TestCharChunk {
}
- public class Sink implements CharOutputChannel {
+ public static class Sink implements CharOutputChannel {
@Override
public void realWriteChars(char[] cbuf, int off, int len) throws
IOException {
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterAsyncTiming.java Tue
May 22 18:54:04 2018
@@ -70,7 +70,7 @@ public class TesterAsyncTiming {
}
}
- private class SemaphoreSendHandler implements SendHandler {
+ private static class SemaphoreSendHandler implements SendHandler {
private final Semaphore semaphore;
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
Tue May 22 18:54:04 2018
@@ -89,7 +89,7 @@ public class TestCloseBug58624 extends W
}
@ClientEndpoint
- public class Bug58624ClientEndpoint {
+ public static class Bug58624ClientEndpoint {
private volatile Throwable t;
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1832055&r1=1832054&r2=1832055&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue May 22 18:54:04 2018
@@ -409,7 +409,7 @@ public final class Room {
* Note: This means a player object is actually a join between Room and
* Client.
*/
- public final class Player {
+ public static final class Player {
/**
* The room to which this player belongs.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
