Author: ebourg
Date: Tue May 9 12:38:17 2017
New Revision: 1794556
URL: http://svn.apache.org/viewvc?rev=1794556&view=rev
Log:
Inner enums are implicitly static
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Tue May 9
12:38:17 2017
@@ -430,7 +430,7 @@ public interface WebResourceRoot extends
*/
void gc();
- static enum ResourceSetType {
+ enum ResourceSetType {
PRE,
RESOURCE_JAR,
POST,
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Tue
May 9 12:38:17 2017
@@ -736,7 +736,7 @@ public class DefaultInstanceManager impl
}
- private static enum AnnotationCacheEntryType {
+ private enum AnnotationCacheEntryType {
FIELD, SETTER, POST_CONSTRUCT, PRE_DESTROY
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Tue May 9
12:38:17 2017
@@ -1022,7 +1022,7 @@ public class CorsFilter extends GenericF
* Enumerates varies types of CORS requests. Also, provides utility methods
* to determine the request type.
*/
- protected static enum CORSRequestType {
+ protected enum CORSRequestType {
/**
* A simple HTTP request, i.e. it shouldn't be pre-flighted.
*/
Modified:
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
Tue May 9 12:38:17 2017
@@ -247,7 +247,7 @@ public class HttpHeaderSecurityFilter ex
}
- private static enum XFrameOption {
+ private enum XFrameOption {
DENY("DENY"),
SAME_ORIGIN("SAMEORIGIN"),
ALLOW_FROM("ALLOW-FROM");
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
Tue May 9 12:38:17 2017
@@ -76,7 +76,7 @@ import javax.servlet.http.HttpSession;
* </pre>
*/
public class RestCsrfPreventionFilter extends CsrfPreventionFilterBase {
- private static enum MethodType {
+ private enum MethodType {
NON_MODIFYING_METHOD, MODIFYING_METHOD
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Tue
May 9 12:38:17 2017
@@ -298,7 +298,7 @@ public final class ClassLoaderFactory {
}
- public static enum RepositoryType {
+ public enum RepositoryType {
DIR,
GLOB,
JAR,
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue May 9 12:38:17 2017
@@ -1625,7 +1625,7 @@ public abstract class AbstractReplicated
this.accessTimeout = accessTimeout;
}
- private static enum State {
+ private enum State {
NEW(false),
INITIALIZED(true),
DESTROYED(false);
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
Tue May 9 12:38:17 2017
@@ -137,14 +137,14 @@ public abstract class AbstractAccessLogV
/**
* The list of our time format types.
*/
- private static enum FormatType {
+ private enum FormatType {
CLF, SEC, MSEC, MSEC_FRAC, SDF
}
/**
* The list of our port types.
*/
- private static enum PortType {
+ private enum PortType {
LOCAL, REMOTE
}
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Tue May
9 12:38:17 2017
@@ -130,7 +130,7 @@ public class AsyncStateMachine {
*/
private static final StringManager sm =
StringManager.getManager(AsyncStateMachine.class);
- private static enum AsyncState {
+ private enum AsyncState {
DISPATCHED (false, false, false, false),
STARTING (true, true, false, false),
STARTED (true, true, false, false),
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Tue May
9 12:38:17 2017
@@ -927,12 +927,12 @@ public class Http11InputBuffer implement
// ----------------------------------------------------------- Inner
classes
- private static enum HeaderParseStatus {
+ private enum HeaderParseStatus {
DONE, HAVE_MORE_HEADERS, NEED_MORE_DATA
}
- private static enum HeaderParsePosition {
+ private enum HeaderParsePosition {
/**
* Start of a new header. A CRLF here means that there are no more
* headers. Any other character starts a header name.
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue May
9 12:38:17 2017
@@ -1582,7 +1582,7 @@ class Http2UpgradeHandler extends Abstra
}
- private static enum ConnectionState {
+ private enum ConnectionState {
NEW(true),
CONNECTED(true),
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java Tue May 9
12:38:17 2017
@@ -113,7 +113,7 @@ public class CheckEol extends Task {
}
}
- private static enum Mode {
+ private enum Mode {
LF, CRLF
}
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java Tue
May 9 12:38:17 2017
@@ -430,7 +430,7 @@ public class PoolingConnection extends D
* The possible statement types.
* @since 2.0
*/
- protected static enum StatementType {
+ protected enum StatementType {
CALLABLE_STATEMENT,
PREPARED_STATEMENT
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Tue
May 9 12:38:17 2017
@@ -669,7 +669,7 @@ public class HttpParser {
}
- private static enum DomainParseState {
+ private enum DomainParseState {
NEW( true, false, false, false, false, false),
ALPHA( true, true, true, true, true, true),
NUMERIC( true, true, true, true, true, true),
Modified: tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java Tue May 9
12:38:17 2017
@@ -131,7 +131,7 @@ public class UserDataHelper {
}
- private static enum Config {
+ private enum Config {
NONE,
DEBUG_ALL,
INFO_THEN_DEBUG,
@@ -141,7 +141,7 @@ public class UserDataHelper {
/**
* Log mode for the next log message.
*/
- public static enum Mode {
+ public enum Mode {
DEBUG,
INFO_THEN_DEBUG,
INFO
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue May 9
12:38:17 2017
@@ -800,14 +800,14 @@ public class SSLHostConfig implements Se
// ----------------------------------------------------------- Inner
classes
- public static enum Type {
+ public enum Type {
JSSE,
OPENSSL,
EITHER
}
- public static enum CertificateVerification {
+ public enum CertificateVerification {
NONE,
OPTIONAL_NO_CA,
OPTIONAL,
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue May 9 12:38:17 2017
@@ -239,7 +239,7 @@ public class SSLHostConfigCertificate im
// Nested types
- public static enum Type {
+ public enum Type {
UNDEFINED,
RSA(Authentication.RSA),
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
Tue May 9 12:38:17 2017
@@ -279,7 +279,7 @@ public class TLSClientHelloExtractor {
}
- public static enum ExtractorResult {
+ public enum ExtractorResult {
COMPLETE,
NOT_PRESENT,
UNDERFLOW,
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue May 9
12:38:17 2017
@@ -688,7 +688,7 @@ public abstract class WsFrameBase {
}
- private static enum State {
+ private enum State {
NEW_FRAME, PARTIAL_HEADER, DATA
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Tue May 9 12:38:17 2017
@@ -1142,7 +1142,7 @@ public abstract class WsRemoteEndpointIm
}
- private static enum State {
+ private enum State {
OPEN,
STREAM_WRITING,
WRITER_WRITING,
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Tue May 9
12:38:17 2017
@@ -787,7 +787,7 @@ public class WsSession implements Sessio
}
}
- private static enum State {
+ private enum State {
OPEN,
OUTPUT_CLOSED,
CLOSED
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1794556&r1=1794555&r2=1794556&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Tue May 9 12:38:17 2017
@@ -722,7 +722,7 @@ public class PojoMethodMapping {
}
- private static enum MethodType {
+ private enum MethodType {
ON_OPEN,
ON_CLOSE,
ON_ERROR
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
