This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new a7a4b72 Removed the redundant 'static' modifier on the enums
a7a4b72 is described below
commit a7a4b72ecf3e47afc5318b30685847d3470c97df
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Thu May 9 00:06:52 2019 +0200
Removed the redundant 'static' modifier on the enums
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 ++--
test/javax/el/TestArrayELResolver.java | 2 +-
test/javax/el/TestBeanELResolver.java | 2 +-
test/javax/el/TestBeanNameELResolver.java | 2 +-
test/javax/el/TestListELResolver.java | 2 +-
test/javax/el/TestMapELResolver.java | 2 +-
test/javax/el/TestResourceBundleELResolver.java | 2 +-
test/javax/el/TestStaticFieldELResolver.java | 2 +-
test/org/apache/catalina/core/TestAsyncContextImpl.java | 2 +-
test/org/apache/el/lang/TestELSupport.java | 6 +++---
test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java | 2 +-
test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 +-
webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index e0b0e9c..5f10707 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -268,7 +268,7 @@ public class SSLHostConfigCertificate implements
Serializable {
// Nested types
- public static enum Type {
+ public enum Type {
UNDEFINED,
RSA(Authentication.RSA),
@@ -291,7 +291,7 @@ public class SSLHostConfigCertificate implements
Serializable {
}
}
- static enum StoreType {
+ enum StoreType {
KEYSTORE,
PEM
}
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index ccad23e..cea9b97 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -385,7 +385,7 @@ public class TestArrayELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE
}
diff --git a/test/javax/el/TestBeanELResolver.java
b/test/javax/el/TestBeanELResolver.java
index 6368ad5..7bd9bce 100644
--- a/test/javax/el/TestBeanELResolver.java
+++ b/test/javax/el/TestBeanELResolver.java
@@ -981,7 +981,7 @@ public class TestBeanELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
}
diff --git a/test/javax/el/TestBeanNameELResolver.java
b/test/javax/el/TestBeanNameELResolver.java
index a7c90c6..f5ea30f 100644
--- a/test/javax/el/TestBeanNameELResolver.java
+++ b/test/javax/el/TestBeanNameELResolver.java
@@ -606,7 +606,7 @@ public class TestBeanNameELResolver {
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE,
SET_VALUE,
GET_TYPE,
diff --git a/test/javax/el/TestListELResolver.java
b/test/javax/el/TestListELResolver.java
index cb9d574..60aea8c 100644
--- a/test/javax/el/TestListELResolver.java
+++ b/test/javax/el/TestListELResolver.java
@@ -381,7 +381,7 @@ public class TestListELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE
}
diff --git a/test/javax/el/TestMapELResolver.java
b/test/javax/el/TestMapELResolver.java
index fa8bb63..1a87b7f 100644
--- a/test/javax/el/TestMapELResolver.java
+++ b/test/javax/el/TestMapELResolver.java
@@ -312,7 +312,7 @@ public class TestMapELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE
}
}
diff --git a/test/javax/el/TestResourceBundleELResolver.java
b/test/javax/el/TestResourceBundleELResolver.java
index 3f9ebc7..5acf029 100644
--- a/test/javax/el/TestResourceBundleELResolver.java
+++ b/test/javax/el/TestResourceBundleELResolver.java
@@ -321,7 +321,7 @@ public class TestResourceBundleELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE
}
}
diff --git a/test/javax/el/TestStaticFieldELResolver.java
b/test/javax/el/TestStaticFieldELResolver.java
index 7efa86d..3655865 100644
--- a/test/javax/el/TestStaticFieldELResolver.java
+++ b/test/javax/el/TestStaticFieldELResolver.java
@@ -483,7 +483,7 @@ public class TestStaticFieldELResolver {
}
}
- private static enum MethodUnderTest {
+ private enum MethodUnderTest {
GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
}
}
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 3f6524b..fb8b30f 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -1676,7 +1676,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
REQUEST_TIME);
}
- private static enum ErrorPageAsyncMode {
+ private enum ErrorPageAsyncMode {
NO_COMPLETE,
COMPLETE,
DISPATCH
diff --git a/test/org/apache/el/lang/TestELSupport.java
b/test/org/apache/el/lang/TestELSupport.java
index 7152851..3276aff 100644
--- a/test/org/apache/el/lang/TestELSupport.java
+++ b/test/org/apache/el/lang/TestELSupport.java
@@ -264,15 +264,15 @@ public class TestELSupport {
Assert.assertEquals(value, ELSupport.coerceToNumber(null, value,
value.getClass()));
}
- private static enum TestEnumA {
+ private enum TestEnumA {
VALA1,
VALA2
}
- private static enum TestEnumB {
+ private enum TestEnumB {
VALB1,
VALB2
}
- private static enum TestEnumC {
+ private enum TestEnumC {
VALA1,
VALA2,
VALB1,
diff --git a/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
b/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
index 11c629e..c146e4a 100644
--- a/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
+++ b/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
@@ -268,7 +268,7 @@ public class TestHttpParserHost {
}
- private static enum TestType {
+ private enum TestType {
IPv4,
IPv6
}
diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 43af454..970229a 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -42,7 +42,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*/
public class TestCustomSsl extends TomcatBaseTest {
- private static enum TrustType {
+ private enum TrustType {
ALL,
CA,
NONE
diff --git a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
index bc9d92e..1d839fc 100644
--- a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
+++ b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
@@ -52,7 +52,7 @@ public final class Room {
* The number (single char) will be prefixed to the string when sending
* the message.
*/
- public static enum MessageType {
+ public enum MessageType {
/**
* '0': Error: contains error message.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
