[tomcat] 04/05: Make the inner classes static when possible to save a reference to the enclosing class
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit da81376ae66f1a5b3a38c5fc584b47d55ec5ca5c
Author: Emmanuel Bourg
AuthorDate: Fri Dec 4 00:48:39 2020 +0100
Make the inner classes static when possible to save a reference to the
enclosing class
---
java/org/apache/catalina/ssi/ExpressionParseTree.java | 10 +-
java/org/apache/catalina/valves/rewrite/Substitution.java | 14 +++---
java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
.../catalina/authenticator/TestFormAuthenticator.java | 2 +-
.../apache/catalina/valves/rewrite/TestResolverSSL.java| 2 +-
test/org/apache/coyote/TestRequest.java| 2 +-
test/org/apache/coyote/http2/Http2TestBase.java| 2 +-
test/org/apache/tomcat/util/net/TestSsl.java | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index aba5d27..2b672ed 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 abstract class Node {
+private static abstract 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 abstract class OppNode extends Node {
+private static abstract class OppNode extends Node {
/**
* The left branch.
*/
@@ -291,7 +291,7 @@ public class ExpressionParseTree {
left = values.remove(0);
}
}
-private final class NotNode extends OppNode {
+private static final class NotNode extends OppNode {
@Override
public boolean evaluate() {
return !left.evaluate();
@@ -318,7 +318,7 @@ public class ExpressionParseTree {
return left + " NOT";
}
}
-private final class AndNode extends OppNode {
+private static final class AndNode extends OppNode {
@Override
public boolean evaluate() {
if (!left.evaluate()) // Short circuit
@@ -338,7 +338,7 @@ public class ExpressionParseTree {
return left + " " + right + " AND";
}
}
-private final class OrNode extends OppNode {
+private static final class OrNode extends OppNode {
@Override
public boolean evaluate() {
if (left.evaluate()) // Short circuit
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index a4191eb..26fc210 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -25,11 +25,11 @@ import org.apache.catalina.util.URLEncoder;
public class Substitution {
-public abstract class SubstitutionElement {
+public static abstract class SubstitutionElement {
public abstract String evaluate(Matcher rule, Matcher cond, Resolver
resolver);
}
-public class StaticElement extends SubstitutionElement {
+public static class StaticElement extends SubstitutionElement {
public String value;
@Override
@@ -59,7 +59,7 @@ public class Substitution {
}
}
-public class RewriteCondBackReferenceElement extends SubstitutionElement {
+public static class RewriteCondBackReferenceElement extends
SubstitutionElement {
public int n;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@ -67,7 +67,7 @@ public class Substitution {
}
}
-public class ServerVariableElement extends SubstitutionElement {
+public static class ServerVariableElement extends SubstitutionElement {
public String key;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@ -75,7 +75,7 @@ public class Substitution {
}
}
-public class ServerVariableEnvElement extends SubstitutionElement {
+public static class ServerVariableEnvElement extends SubstitutionElement {
public String key;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@ -83,7 +83,7 @@ public class Substitution {
}
}
-public class ServerVariableSslElement extends SubstitutionElement {
+public static class ServerVariableSslElement extends SubstitutionElement {
public String key;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@
[tomcat] 04/05: Make the inner classes static when possible to save a reference to the enclosing class
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
commit 0b8b394241963e274e61c630c5ef5e9b191f2860
Author: Emmanuel Bourg
AuthorDate: Fri Dec 4 00:48:39 2020 +0100
Make the inner classes static when possible to save a reference to the
enclosing class
---
java/org/apache/catalina/realm/UserDatabaseRealm.java | 2 +-
java/org/apache/catalina/ssi/ExpressionParseTree.java | 10 +-
java/org/apache/catalina/valves/rewrite/Substitution.java | 14 +++---
java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
.../catalina/authenticator/TestFormAuthenticator.java | 2 +-
.../apache/catalina/valves/rewrite/TestResolverSSL.java| 2 +-
test/org/apache/coyote/TestRequest.java| 2 +-
test/org/apache/coyote/http2/Http2TestBase.java| 2 +-
test/org/apache/tomcat/util/net/TestSsl.java | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index b8aac01..4d055fd 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -307,7 +307,7 @@ public class UserDatabaseRealm extends RealmBase {
}
-private class UserDatabasePrincipal implements Principal {
+private static class UserDatabasePrincipal implements Principal {
private final String name;
private UserDatabasePrincipal(String name) {
this.name = name;
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index f32d08b..83da544 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -213,7 +213,7 @@ public class ExpressionParseTree {
/**
* A node in the expression parse tree.
*/
-private abstract class Node {
+private static abstract class Node {
/**
* @return {@code true} if the node evaluates to true.
*/
@@ -266,7 +266,7 @@ public class ExpressionParseTree {
/**
* A node implementation that represents an operation.
*/
-private abstract class OppNode extends Node {
+private static abstract class OppNode extends Node {
/**
* The left branch.
*/
@@ -295,7 +295,7 @@ public class ExpressionParseTree {
left = values.remove(0);
}
}
-private final class NotNode extends OppNode {
+private static final class NotNode extends OppNode {
@Override
public boolean evaluate() {
return !left.evaluate();
@@ -322,7 +322,7 @@ public class ExpressionParseTree {
return left + " NOT";
}
}
-private final class AndNode extends OppNode {
+private static final class AndNode extends OppNode {
@Override
public boolean evaluate() {
if (!left.evaluate()) // Short circuit
@@ -342,7 +342,7 @@ public class ExpressionParseTree {
return left + " " + right + " AND";
}
}
-private final class OrNode extends OppNode {
+private static final class OrNode extends OppNode {
@Override
public boolean evaluate() {
if (left.evaluate()) // Short circuit
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index a4191eb..26fc210 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -25,11 +25,11 @@ import org.apache.catalina.util.URLEncoder;
public class Substitution {
-public abstract class SubstitutionElement {
+public static abstract class SubstitutionElement {
public abstract String evaluate(Matcher rule, Matcher cond, Resolver
resolver);
}
-public class StaticElement extends SubstitutionElement {
+public static class StaticElement extends SubstitutionElement {
public String value;
@Override
@@ -59,7 +59,7 @@ public class Substitution {
}
}
-public class RewriteCondBackReferenceElement extends SubstitutionElement {
+public static class RewriteCondBackReferenceElement extends
SubstitutionElement {
public int n;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@ -67,7 +67,7 @@ public class Substitution {
}
}
-public class ServerVariableElement extends SubstitutionElement {
+public static class ServerVariableElement extends SubstitutionElement {
public String key;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
@@ -75,7 +75,7 @@
