This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4a6cfbd Fix checkstyle warnings
4a6cfbd is described below
commit 4a6cfbd432b3067a34d234e5e55b2ea7ef02bcf9
Author: Rainer Jung <[email protected]>
AuthorDate: Fri Dec 4 17:35:45 2020 +0100
Fix checkstyle warnings
---
java/org/apache/catalina/ssi/ExpressionParseTree.java | 4 ++--
java/org/apache/catalina/util/LifecycleMBeanBase.java | 1 -
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index 2b672ed..ceeb867 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -209,7 +209,7 @@ public class ExpressionParseTree {
/**
* A node in the expression parse tree.
*/
- private static abstract class Node {
+ private abstract static class Node {
/**
* @return {@code true} if the node evaluates to true.
*/
@@ -262,7 +262,7 @@ public class ExpressionParseTree {
/**
* A node implementation that represents an operation.
*/
- private static abstract class OppNode extends Node {
+ private abstract static class OppNode extends Node {
/**
* The left branch.
*/
diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java
b/java/org/apache/catalina/util/LifecycleMBeanBase.java
index 3bf3129..1d0ad7e 100644
--- a/java/org/apache/catalina/util/LifecycleMBeanBase.java
+++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java
@@ -20,7 +20,6 @@ package org.apache.catalina.util;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import org.apache.catalina.Globals;
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 26fc210..50d78db 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -25,7 +25,7 @@ import org.apache.catalina.util.URLEncoder;
public class Substitution {
- public static abstract class SubstitutionElement {
+ public abstract static class SubstitutionElement {
public abstract String evaluate(Matcher rule, Matcher cond, Resolver
resolver);
}
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 5779308..615dd31 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -912,7 +912,7 @@ public abstract class WsFrameBase {
protected abstract void resumeProcessing();
- private static abstract class TerminalTransformation implements
Transformation {
+ private abstract static class TerminalTransformation implements
Transformation {
@Override
public boolean validateRsvBits(int i) {
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 1ab2dd8..7e63d73 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -418,7 +418,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
* Encapsulate the logic needed to run a suitably-configured tomcat
* instance, send it an HTTP request and process the server response
*/
- private static abstract class FormAuthClientBase extends SimpleHttpClient {
+ private abstract static class FormAuthClientBase extends SimpleHttpClient {
protected static final String LOGIN_PARAM_TAG = "action=";
protected static final String LOGIN_RESOURCE = "j_security_check";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
