You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/14 11:05:54 UTC
[tomcat] branch main updated (2dcf2acc25 -> 91365f8e27)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 2dcf2acc25 Fix copy/paste error & simplify
new a6534bca9f Code clean-up - formatting. No functional change.
new b8e6d382c6 Code clean-up - formatting. No functional change.
new f49913c656 Code clean-up - formatting. No functional change.
new 91365f8e27 Code clean-up - formatting. No fucntional change.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/catalina/core/ApplicationContext.java | 20 +--
.../catalina/core/ApplicationContextFacade.java | 6 +-
.../catalina/core/ApplicationDispatcher.java | 8 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java | 8 +-
.../core/ApplicationFilterRegistration.java | 10 +-
.../catalina/core/ApplicationHttpRequest.java | 20 +--
java/org/apache/catalina/core/ApplicationPart.java | 2 +-
.../catalina/core/ApplicationPushBuilder.java | 8 +-
.../apache/catalina/core/ApplicationRequest.java | 16 +-
.../core/ApplicationServletRegistration.java | 10 +-
.../core/ApplicationSessionCookieConfig.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 2 +-
.../catalina/core/ContextNamingInfoListener.java | 13 +-
.../catalina/core/DefaultInstanceManager.java | 38 +++--
.../apache/catalina/core/FrameworkListener.java | 2 +-
.../core/JreMemoryLeakPreventionListener.java | 5 +-
.../catalina/core/NamingContextListener.java | 12 +-
java/org/apache/catalina/core/StandardContext.java | 86 +++++-----
java/org/apache/catalina/core/StandardHost.java | 8 +-
java/org/apache/catalina/core/StandardServer.java | 9 +-
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
.../tomcat/util/http/FastHttpDateFormat.java | 12 +-
java/org/apache/tomcat/util/http/MimeHeaders.java | 181 +++++++++++----------
java/org/apache/tomcat/util/http/Parameters.java | 8 +-
.../tomcat/util/http/Rfc6265CookieProcessor.java | 6 +-
test/jakarta/servlet/TestSessionCookieConfig.java | 2 +-
test/org/apache/jasper/compiler/Dumper.java | 20 +--
.../jasper/compiler/TestAttributeParser.java | 39 ++---
test/org/apache/jasper/compiler/TestCompiler.java | 41 ++---
.../jasper/compiler/TestELInterpreterFactory.java | 8 +-
test/org/apache/jasper/compiler/TestELParser.java | 26 ++-
.../jasper/compiler/TestEncodingDetector.java | 39 +++--
test/org/apache/jasper/compiler/TestGenerator.java | 60 +++----
test/org/apache/jasper/compiler/TestJspConfig.java | 36 ++--
.../jasper/compiler/TestJspDocumentParser.java | 17 +-
test/org/apache/jasper/compiler/TestJspReader.java | 3 +-
test/org/apache/jasper/compiler/TestJspUtil.java | 2 +-
.../compiler/TestJspUtilMakeJavaPackage.java | 26 +--
test/org/apache/jasper/compiler/TestNode.java | 4 +-
.../jasper/compiler/TestNodeIntegration.java | 6 +-
test/org/apache/jasper/compiler/TestParser.java | 89 ++++------
.../compiler/TestParserNoStrictWhitespace.java | 5 +-
.../jasper/compiler/TestScriptingVariabler.java | 5 +-
.../apache/jasper/compiler/TestSmapStratum.java | 2 +
.../jasper/compiler/TestTagLibraryInfoImpl.java | 6 +-
.../jasper/compiler/TestTagPluginManager.java | 15 +-
test/org/apache/jasper/compiler/TestValidator.java | 57 +++----
.../apache/jasper/compiler/TesterValidator.java | 15 +-
50 files changed, 458 insertions(+), 575 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: Code clean-up - formatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f49913c656a808172adaf329667c3253935c01f4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 12:00:33 2023 +0100
Code clean-up - formatting. No functional change.
---
test/jakarta/servlet/TestSessionCookieConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/jakarta/servlet/TestSessionCookieConfig.java b/test/jakarta/servlet/TestSessionCookieConfig.java
index 5faa6680ba..737c702f83 100644
--- a/test/jakarta/servlet/TestSessionCookieConfig.java
+++ b/test/jakarta/servlet/TestSessionCookieConfig.java
@@ -48,7 +48,7 @@ public class TestSessionCookieConfig extends TomcatBaseTest {
Assert.assertTrue(responseHeaders.containsKey("Set-Cookie"));
List<String> setCookieHeaders = responseHeaders.get("Set-Cookie");
- Assert.assertEquals(1, setCookieHeaders.size());
+ Assert.assertEquals(1, setCookieHeaders.size());
String setCookieHeader = setCookieHeaders.get(0);
Assert.assertTrue(setCookieHeader.contains("; aaa=bbb"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Code clean-up - formatting. No fucntional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 91365f8e27349c177bc0f7028c194aa62ffabfcb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 12:05:27 2023 +0100
Code clean-up - formatting. No fucntional change.
---
test/org/apache/jasper/compiler/Dumper.java | 20 +++--
.../jasper/compiler/TestAttributeParser.java | 39 ++++------
test/org/apache/jasper/compiler/TestCompiler.java | 41 ++++------
.../jasper/compiler/TestELInterpreterFactory.java | 8 +-
test/org/apache/jasper/compiler/TestELParser.java | 26 +++----
.../jasper/compiler/TestEncodingDetector.java | 39 +++++-----
test/org/apache/jasper/compiler/TestGenerator.java | 60 +++++----------
test/org/apache/jasper/compiler/TestJspConfig.java | 36 ++++-----
.../jasper/compiler/TestJspDocumentParser.java | 17 ++---
test/org/apache/jasper/compiler/TestJspReader.java | 3 +-
test/org/apache/jasper/compiler/TestJspUtil.java | 2 +-
.../compiler/TestJspUtilMakeJavaPackage.java | 26 +++----
test/org/apache/jasper/compiler/TestNode.java | 4 +-
.../jasper/compiler/TestNodeIntegration.java | 6 +-
test/org/apache/jasper/compiler/TestParser.java | 89 ++++++++--------------
.../compiler/TestParserNoStrictWhitespace.java | 5 +-
.../jasper/compiler/TestScriptingVariabler.java | 5 +-
.../apache/jasper/compiler/TestSmapStratum.java | 2 +
.../jasper/compiler/TestTagLibraryInfoImpl.java | 6 +-
.../jasper/compiler/TestTagPluginManager.java | 15 ++--
test/org/apache/jasper/compiler/TestValidator.java | 57 +++++---------
.../apache/jasper/compiler/TesterValidator.java | 15 ++--
22 files changed, 200 insertions(+), 321 deletions(-)
diff --git a/test/org/apache/jasper/compiler/Dumper.java b/test/org/apache/jasper/compiler/Dumper.java
index afa55bbaa3..b94811a6b5 100644
--- a/test/org/apache/jasper/compiler/Dumper.java
+++ b/test/org/apache/jasper/compiler/Dumper.java
@@ -26,13 +26,12 @@ class Dumper {
private String getAttributes(Attributes attrs) {
if (attrs == null) {
- return "";
+ return "";
}
StringBuilder buf = new StringBuilder();
- for (int i=0; i < attrs.getLength(); i++) {
- buf.append(" " + attrs.getQName(i) + "=\""
- + attrs.getValue(i) + "\"");
+ for (int i = 0; i < attrs.getLength(); i++) {
+ buf.append(" " + attrs.getQName(i) + "=\"" + attrs.getValue(i) + "\"");
}
return buf.toString();
}
@@ -51,17 +50,16 @@ class Dumper {
}
}
- private void printAttributes(String prefix, Attributes attrs,
- String suffix) {
+ private void printAttributes(String prefix, Attributes attrs, String suffix) {
printString(prefix, getAttributes(attrs), suffix);
}
private void dumpBody(Node n) throws JasperException {
Node.Nodes page = n.getBody();
if (page != null) {
-// indent++;
+ // indent++;
page.visit(this);
-// indent--;
+ // indent--;
}
}
@@ -157,7 +155,7 @@ class Dumper {
@Override
public void visit(Node.ELExpression n) throws JasperException {
- printString( "${" + n.getText() + "}" );
+ printString("${" + n.getText() + "}");
}
@Override
@@ -170,7 +168,7 @@ class Dumper {
@Override
public void visit(Node.UninterpretedTag n) throws JasperException {
String tag = n.getQName();
- printAttributes("<"+tag, n.getAttributes(), ">");
+ printAttributes("<" + tag, n.getAttributes(), ">");
dumpBody(n);
printString("</" + tag + ">");
}
@@ -181,7 +179,7 @@ class Dumper {
}
private void printIndent() {
- for (int i=0; i < indent; i++) {
+ for (int i = 0; i < indent; i++) {
System.out.print(" ");
}
}
diff --git a/test/org/apache/jasper/compiler/TestAttributeParser.java b/test/org/apache/jasper/compiler/TestAttributeParser.java
index 7fc0d29813..b9854f9ff1 100644
--- a/test/org/apache/jasper/compiler/TestAttributeParser.java
+++ b/test/org/apache/jasper/compiler/TestAttributeParser.java
@@ -26,14 +26,13 @@ import org.apache.el.TesterFunctions;
import org.apache.jasper.el.ELContextImpl;
/**
- * Test the EL processing from JSP attributes. Similar tests may be found in
- * {@link org.apache.el.TestELEvaluation} and {@link org.apache.el.TestELInJsp}.
+ * Test the EL processing from JSP attributes. Similar tests may be found in {@link org.apache.el.TestELEvaluation} and
+ * {@link org.apache.el.TestELInJsp}.
*/
public class TestAttributeParser {
/**
- * Test use of spaces in ternary expressions. This was primarily an EL
- * parser bug.
+ * Test use of spaces in ternary expressions. This was primarily an EL parser bug.
*/
@Test
public void testBug42565() {
@@ -57,25 +56,20 @@ public class TestAttributeParser {
/**
- * Test use nested ternary expressions. Full tests in
- * {@link org.apache.el.TestELEvaluation}. This is just a smoke test to
- * ensure JSP attribute processing doesn't cause any additional issues.
+ * Test use nested ternary expressions. Full tests in {@link org.apache.el.TestELEvaluation}. This is just a smoke
+ * test to ensure JSP attribute processing doesn't cause any additional issues.
*/
@Test
public void testBug44994() {
- Assert.assertEquals("none",
- evalAttr("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}", '\"'));
- Assert.assertEquals("one",
- evalAttr("${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}", '\"'));
- Assert.assertEquals("many",
- evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
+ Assert.assertEquals("none", evalAttr("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}", '\"'));
+ Assert.assertEquals("one", evalAttr("${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}", '\"'));
+ Assert.assertEquals("many", evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
}
/**
- * Test the quoting requirements of JSP attributes. This doesn't make use of
- * EL. See {@link #testBug45451()} for a test that combines JSP attribute
- * quoting and EL quoting.
+ * Test the quoting requirements of JSP attributes. This doesn't make use of EL. See {@link #testBug45451()} for a
+ * test that combines JSP attribute quoting and EL quoting.
*/
@Test
public void testBug45015() {
@@ -153,10 +147,8 @@ public class TestAttributeParser {
@Test
public void testScriptExpressionLiterals() {
- Assert.assertEquals(" \"hello world\" ", parseScriptExpression(
- " \"hello world\" ", (char) 0));
- Assert.assertEquals(" \"hello \\\"world\" ", parseScriptExpression(
- " \"hello \\\\\"world\" ", (char) 0));
+ Assert.assertEquals(" \"hello world\" ", parseScriptExpression(" \"hello world\" ", (char) 0));
+ Assert.assertEquals(" \"hello \\\"world\" ", parseScriptExpression(" \"hello \\\\\"world\" ", (char) 0));
}
private String evalAttr(String expression, char quote) {
@@ -165,14 +157,11 @@ public class TestAttributeParser {
ELContextImpl ctx = new ELContextImpl();
ctx.setFunctionMapper(new TesterFunctions.FMapper());
ValueExpression ve = exprFactory.createValueExpression(ctx,
- AttributeParser.getUnquoted(expression, quote, false, false,
- false, false),
- String.class);
+ AttributeParser.getUnquoted(expression, quote, false, false, false, false), String.class);
return (String) ve.getValue(ctx);
}
private String parseScriptExpression(String expression, char quote) {
- return AttributeParser.getUnquoted(expression, quote, false, false,
- false, false);
+ return AttributeParser.getUnquoted(expression, quote, false, false, false, false);
}
}
diff --git a/test/org/apache/jasper/compiler/TestCompiler.java b/test/org/apache/jasper/compiler/TestCompiler.java
index b8911894a1..9f439b9774 100644
--- a/test/org/apache/jasper/compiler/TestCompiler.java
+++ b/test/org/apache/jasper/compiler/TestCompiler.java
@@ -39,8 +39,7 @@ public class TestCompiler extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<>();
- getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726a.jsp",
- res, headers);
+ getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726a.jsp", res, headers);
// Check request completed
String result = res.toString();
@@ -58,8 +57,7 @@ public class TestCompiler extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<>();
- getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726b.jsp",
- res, headers);
+ getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726b.jsp", res, headers);
// Check request completed
String result = res.toString();
@@ -75,8 +73,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo;bar.jsp
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%3bbar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%3bbar.jsp");
// Check request completed
String result = res.toString();
@@ -87,8 +84,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo&bar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo&bar.jsp");
// Check request completed
String result = res.toString();
@@ -100,8 +96,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo#bar.jsp
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%23bar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%23bar.jsp");
// Check request completed
String result = res.toString();
@@ -113,8 +108,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo%bar.jsp
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%25bar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%25bar.jsp");
// Check request completed
String result = res.toString();
@@ -125,8 +119,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257e() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo+bar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo+bar.jsp");
// Check request completed
String result = res.toString();
@@ -137,8 +130,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257f() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%20bar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%20bar.jsp");
// Check request completed
String result = res.toString();
@@ -149,8 +141,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257g() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%20bar/foobar.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%20bar/foobar.jsp");
// Check request completed
String result = res.toString();
@@ -163,8 +154,7 @@ public class TestCompiler extends TomcatBaseTest {
// Check that URL decoding is not done twice
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug53257/foo%2525bar.jsp", res, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug53257/foo%2525bar.jsp", res, null);
Assert.assertEquals(404, rc);
}
@@ -187,15 +177,10 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug55262() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug55262.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug55262.jsp");
String result = res.toString();
- Pattern prelude = Pattern.compile(
- "(.*This is a prelude\\.){2}.*",
- Pattern.MULTILINE | Pattern.DOTALL);
- Pattern coda = Pattern.compile(
- "(.*This is a coda\\.){2}.*",
- Pattern.MULTILINE|Pattern.DOTALL);
+ Pattern prelude = Pattern.compile("(.*This is a prelude\\.){2}.*", Pattern.MULTILINE | Pattern.DOTALL);
+ Pattern coda = Pattern.compile("(.*This is a coda\\.){2}.*", Pattern.MULTILINE | Pattern.DOTALL);
Assert.assertTrue(prelude.matcher(result).matches());
Assert.assertTrue(coda.matcher(result).matches());
}
diff --git a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
index 04bb5f8456..47608b85b6 100644
--- a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
+++ b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
@@ -39,9 +39,8 @@ public class TestELInterpreterFactory extends TomcatBaseTest {
public static class SimpleELInterpreter implements ELInterpreter {
@Override
- public String interpreterCall(JspCompilationContext context,
- boolean isTagFile, String expression, Class<?> expectedType,
- String fnmapvar) {
+ public String interpreterCall(JspCompilationContext context, boolean isTagFile, String expression,
+ Class<?> expectedType, String fnmapvar) {
return expression;
}
}
@@ -62,8 +61,7 @@ public class TestELInterpreterFactory extends TomcatBaseTest {
context.removeAttribute(ELInterpreter.class.getName());
- context.setAttribute(ELInterpreter.class.getName(),
- SimpleELInterpreter.class.getName());
+ context.setAttribute(ELInterpreter.class.getName(), SimpleELInterpreter.class.getName());
interpreter = ELInterpreterFactory.getELInterpreter(context);
Assert.assertNotNull(interpreter);
assertThat(interpreter, instanceOf(SimpleELInterpreter.class));
diff --git a/test/org/apache/jasper/compiler/TestELParser.java b/test/org/apache/jasper/compiler/TestELParser.java
index 6b47533b64..f68507c47e 100644
--- a/test/org/apache/jasper/compiler/TestELParser.java
+++ b/test/org/apache/jasper/compiler/TestELParser.java
@@ -30,21 +30,18 @@ import org.apache.jasper.compiler.ELNode.Nodes;
import org.apache.jasper.compiler.ELParser.TextBuilder;
/**
- * You will need to keep your wits about you when working with this class. Keep
- * in mind the following:
+ * You will need to keep your wits about you when working with this class. Keep in mind the following:
* <ul>
* <li>If in doubt, read the EL and JSP specifications. Twice.</li>
- * <li>The escaping rules are complex and subtle. The explanation below (as well
- * as the tests and the implementation) may have missed an edge case despite
- * trying hard not to.
- * <li>The strings passed to {@link #doTestParser(String,String)} are Java
- * escaped in the source code and will be unescaped before being used.</li>
- * <li>LiteralExpressions always occur outside of "${...}" and "#{...}". Literal
- * expressions escape '$' and '#' with '\\'</li>
- * <li>LiteralStrings always occur inside "${...}" or "#{...}". Literal strings
- * escape '\'', '\"' and '\\' with '\\'. Escaping '\"' is optional if the
- * literal string is delimited by '\''. Escaping '\'' is optional if the
- * literal string is delimited by '\"'.</li>
+ * <li>The escaping rules are complex and subtle. The explanation below (as well as the tests and the implementation)
+ * may have missed an edge case despite trying hard not to.
+ * <li>The strings passed to {@link #doTestParser(String,String)} are Java escaped in the source code and will be
+ * unescaped before being used.</li>
+ * <li>LiteralExpressions always occur outside of "${...}" and "#{...}". Literal expressions escape '$' and '#' with
+ * '\\'</li>
+ * <li>LiteralStrings always occur inside "${...}" or "#{...}". Literal strings escape '\'', '\"' and '\\' with '\\'.
+ * Escaping '\"' is optional if the literal string is delimited by '\''. Escaping '\'' is optional if the literal string
+ * is delimited by '\"'.</li>
* </ul>
*/
public class TestELParser {
@@ -285,7 +282,8 @@ public class TestELParser {
doTestParser(input, expected, input);
}
- private void doTestParser(String input, String expectedResult, String expectedBuilderOutput) throws JasperException {
+ private void doTestParser(String input, String expectedResult, String expectedBuilderOutput)
+ throws JasperException {
ELException elException = null;
String elResult = null;
diff --git a/test/org/apache/jasper/compiler/TestEncodingDetector.java b/test/org/apache/jasper/compiler/TestEncodingDetector.java
index 4cc5016b14..6d4f07eef5 100644
--- a/test/org/apache/jasper/compiler/TestEncodingDetector.java
+++ b/test/org/apache/jasper/compiler/TestEncodingDetector.java
@@ -37,28 +37,28 @@ public class TestEncodingDetector extends TomcatBaseTest {
public static Collection<Object[]> inputs() {
/// Note: These files are saved using the encoding indicated by the BOM
List<Object[]> result = new ArrayList<>();
- result.add(new Object[] { "bom-none-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf16be.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf16le.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-utf16be.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf8-prolog-utf16le.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf8-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16be-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16be-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16be.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16le.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-utf16be.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf16le.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16be-prolog-utf16be.jspx", Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16be-prolog-utf16le.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf16be-prolog-utf8.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf16le-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16le-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-utf8.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16le-prolog-utf16be.jspx", Integer.valueOf(500), null });
result.add(new Object[] { "bom-utf16le-prolog-utf16le.jspx", Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16le-prolog-utf8.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bug60769a.jspx", Integer.valueOf(500), null });
- result.add(new Object[] { "bug60769b.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-utf8.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bug60769a.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bug60769b.jspx", Integer.valueOf(200), Boolean.TRUE });
return result;
}
@@ -77,8 +77,7 @@ public class TestEncodingDetector extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk responseBody = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/encoding/" + jspName,
- responseBody, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/encoding/" + jspName, responseBody, null);
Assert.assertEquals(expectedResponseCode, rc);
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index 192a4fca17..8cfe73f54c 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -56,8 +56,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015a() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45015a.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45015a.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -78,8 +77,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -88,8 +86,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015c() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -98,8 +95,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug48701Fail() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -127,8 +123,7 @@ public class TestGenerator extends TomcatBaseTest {
private void testBug48701(String jsp) throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/" + jsp);
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/" + jsp);
String result = res.toString();
assertEcho(result, "00-PASS");
@@ -163,9 +158,7 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public VariableInfo[] getVariableInfo(TagData data) {
return new VariableInfo[] {
- new VariableInfo("now", Bean.class.getCanonicalName(),
- true, VariableInfo.AT_END)
- };
+ new VariableInfo("now", Bean.class.getCanonicalName(), true, VariableInfo.AT_END) };
}
}
@@ -185,12 +178,9 @@ public class TestGenerator extends TomcatBaseTest {
@Test
public void testBug49799() throws Exception {
- String[] expected = { "<p style=\"color:red\">00-Red</p>",
- "<p>01-Not Red</p>",
- "<p style=\"color:red\">02-Red</p>",
- "<p>03-Not Red</p>",
- "<p style=\"color:red\">04-Red</p>",
- "<p>05-Not Red</p>"};
+ String[] expected =
+ { "<p style=\"color:red\">00-Red</p>", "<p>01-Not Red</p>", "<p style=\"color:red\">02-Red</p>",
+ "<p>03-Not Red</p>", "<p style=\"color:red\">04-Red</p>", "<p>05-Not Red</p>" };
getTomcatInstanceTestWebapp(false, true);
@@ -219,14 +209,11 @@ public class TestGenerator extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56529.jsp", bc, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56529.jsp", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
String response = bc.toStringInternal();
- Assert.assertTrue(response,
- response.contains("[1:attribute1: '', attribute2: '']"));
- Assert.assertTrue(response,
- response.contains("[2:attribute1: '', attribute2: '']"));
+ Assert.assertTrue(response, response.contains("[1:attribute1: '', attribute2: '']"));
+ Assert.assertTrue(response, response.contains("[2:attribute1: '', attribute2: '']"));
}
public static class Bug56529 extends TagSupport {
@@ -256,9 +243,7 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public int doEndTag() throws JspException {
try {
- pageContext.getOut().print(
- "attribute1: '" + attribute1 + "', " + "attribute2: '"
- + attribute2 + "'");
+ pageContext.getOut().print("attribute1: '" + attribute1 + "', " + "attribute2: '" + attribute2 + "'");
} catch (IOException e) {
throw new JspException(e);
}
@@ -273,8 +258,7 @@ public class TestGenerator extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
try {
- getUrl("http://localhost:" + getPort()
- + "/test/bug5nnnn/bug56581.jsp", res, null);
+ getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56581.jsp", res, null);
Assert.fail("An IOException was expected.");
} catch (IOException expected) {
// ErrorReportValve in Tomcat 8.0.9+ flushes and aborts the
@@ -607,12 +591,10 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public VariableInfo[] getVariableInfo(TagData data) {
- return new VariableInfo[] {
- new VariableInfo("variable01", "java.lang.String", true, VariableInfo.NESTED),
- new VariableInfo(data.getAttribute("attribute02").toString(),
- "java.lang.String", true, VariableInfo.NESTED),
- new VariableInfo("variable03", "java.lang.String", false, VariableInfo.NESTED)
- };
+ return new VariableInfo[] { new VariableInfo("variable01", "java.lang.String", true, VariableInfo.NESTED),
+ new VariableInfo(data.getAttribute("attribute02").toString(), "java.lang.String", true,
+ VariableInfo.NESTED),
+ new VariableInfo("variable03", "java.lang.String", false, VariableInfo.NESTED) };
}
}
@@ -622,8 +604,7 @@ public class TestGenerator extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- public void setDynamicAttribute(String uri, String localName, Object value)
- throws JspException {
+ public void setDynamicAttribute(String uri, String localName, Object value) throws JspException {
// NO-OP
}
}
@@ -951,7 +932,8 @@ public class TestGenerator extends TomcatBaseTest {
// This should break all subsequent requests
ByteChunk body = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/generator/break-string-interpreter.jsp", body, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/generator/break-string-interpreter.jsp", body,
+ null);
Assert.assertEquals(body.toString(), HttpServletResponse.SC_OK, rc);
body.recycle();
diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java b/test/org/apache/jasper/compiler/TestJspConfig.java
index 64f6d0c092..4f9cf26cd9 100644
--- a/test/org/apache/jasper/compiler/TestJspConfig.java
+++ b/test/org/apache/jasper/compiler/TestJspConfig.java
@@ -39,8 +39,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -52,15 +51,13 @@ public class TestJspConfig extends TomcatBaseTest {
public void testServlet23NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.3");
+ File appDir = new File("test/webapp-2.3");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -78,8 +75,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -97,8 +93,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -115,8 +110,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -133,8 +127,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -151,8 +144,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -169,8 +161,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -187,8 +178,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp");
String result = res.toString();
@@ -227,7 +217,8 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/errorOnELNotFound/page-directive-true.jsp", res, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/errorOnELNotFound/page-directive-true.jsp", res,
+ null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
@@ -248,7 +239,8 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/errorOnELNotFound/page-directive-false.jsp", res, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/errorOnELNotFound/page-directive-false.jsp", res,
+ null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index 015afaabe5..8eac2bf2c3 100644
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -39,8 +39,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
public void testBug47977() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug47977.jspx", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -65,13 +64,11 @@ public class TestJspDocumentParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug54801a.jspx", bc, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug54801a.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
bc.recycle();
- rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug54801b.jspx", bc, null);
+ rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug54801b.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -80,13 +77,11 @@ public class TestJspDocumentParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug54821a.jspx", bc, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug54821a.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
bc.recycle();
- rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug54821b.jspx", bc, null);
+ rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug54821b.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -206,7 +201,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
doTestDocument(false, "5.4");
}
- private void doTestDocument(boolean valid, String version) throws Exception{
+ private void doTestDocument(boolean valid, String version) throws Exception {
getTomcatInstanceTestWebapp(false, true);
StringBuilder url = new StringBuilder("http://localhost:");
diff --git a/test/org/apache/jasper/compiler/TestJspReader.java b/test/org/apache/jasper/compiler/TestJspReader.java
index f82fbc9904..9e12a65be0 100644
--- a/test/org/apache/jasper/compiler/TestJspReader.java
+++ b/test/org/apache/jasper/compiler/TestJspReader.java
@@ -28,8 +28,7 @@ public class TestJspReader extends TomcatBaseTest {
public void testBug53986() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug53986.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug53986.jsp");
Assert.assertTrue(res.toString().contains("OK"));
}
}
diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java b/test/org/apache/jasper/compiler/TestJspUtil.java
index f7755d0324..9516f0339e 100644
--- a/test/org/apache/jasper/compiler/TestJspUtil.java
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -41,7 +41,7 @@ public class TestJspUtil extends TomcatBaseTest {
if (line.startsWith("<p>")) {
line = line.substring(3, line.length() - 4);
String[] parts = line.split(":");
- Assert.assertEquals(parts[0], parts[1], parts[2]);
+ Assert.assertEquals(parts[0], parts[1], parts[2]);
}
}
Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
diff --git a/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java b/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
index c02837fb85..dba45a67ca 100644
--- a/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
+++ b/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
@@ -33,19 +33,19 @@ public class TestJspUtilMakeJavaPackage {
public static Collection<Object[]> parameters() {
List<Object[]> parameterSets = new ArrayList<>();
- parameterSets.add(new Object[] { "/foo", "foo"});
- parameterSets.add(new Object[] { "//foo", "foo"});
- parameterSets.add(new Object[] { "//foo//", "foo"});
- parameterSets.add(new Object[] { "/foo//", "foo"});
- parameterSets.add(new Object[] { "/foo/", "foo"});
- parameterSets.add(new Object[] { "foo/", "foo"});
-
- parameterSets.add(new Object[] { "/foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "//foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "//foo//bar", "foo.bar"});
- parameterSets.add(new Object[] { "/foo//bar", "foo.bar"});
- parameterSets.add(new Object[] { "/foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "foo/bar", "foo.bar"});
+ parameterSets.add(new Object[] { "/foo", "foo" });
+ parameterSets.add(new Object[] { "//foo", "foo" });
+ parameterSets.add(new Object[] { "//foo//", "foo" });
+ parameterSets.add(new Object[] { "/foo//", "foo" });
+ parameterSets.add(new Object[] { "/foo/", "foo" });
+ parameterSets.add(new Object[] { "foo/", "foo" });
+
+ parameterSets.add(new Object[] { "/foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "//foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "//foo//bar", "foo.bar" });
+ parameterSets.add(new Object[] { "/foo//bar", "foo.bar" });
+ parameterSets.add(new Object[] { "/foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "foo/bar", "foo.bar" });
return parameterSets;
}
diff --git a/test/org/apache/jasper/compiler/TestNode.java b/test/org/apache/jasper/compiler/TestNode.java
index c1ee3087a4..c959b0977e 100644
--- a/test/org/apache/jasper/compiler/TestNode.java
+++ b/test/org/apache/jasper/compiler/TestNode.java
@@ -28,7 +28,7 @@ public class TestNode {
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=57099
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testPageDirectiveImport01() {
doTestPageDirectiveImport("java.io.*;\r\n\timport java.net.*");
}
@@ -53,7 +53,7 @@ public class TestNode {
doTestPageDirectiveImport("java.util.List,java.util.ArrayList,java.util.Set");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testPageDirectiveImport06() {
doTestPageDirectiveImport("java.util.List;import java.util.ArrayList; import java.util.Set");
}
diff --git a/test/org/apache/jasper/compiler/TestNodeIntegration.java b/test/org/apache/jasper/compiler/TestNodeIntegration.java
index 148b1630fa..9a1bb05288 100644
--- a/test/org/apache/jasper/compiler/TestNodeIntegration.java
+++ b/test/org/apache/jasper/compiler/TestNodeIntegration.java
@@ -28,12 +28,10 @@ public class TestNodeIntegration extends TomcatBaseTest {
public void testJspAttributeIsLiteral() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug55642a.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug55642a.jsp");
String result = res.toString();
- Assert.assertTrue(
- result.indexOf("/test/bug5nnnn/bug55642b.jsp?foo=bar&a=1&b=2") > 0);
+ Assert.assertTrue(result.indexOf("/test/bug5nnnn/bug55642b.jsp?foo=bar&a=1&b=2") > 0);
}
}
diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java
index 356ebabb44..e2f2079b08 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -23,9 +23,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests that depend on strict whitespace parsing are duplicated in
- * {@link TestParserNoStrictWhitespace} with the strict whitespace parsing
- * disabled.
+ * Tests that depend on strict whitespace parsing are duplicated in {@link TestParserNoStrictWhitespace} with the strict
+ * whitespace parsing disabled.
*/
public class TestParser extends TomcatBaseTest {
@@ -33,8 +32,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48627() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug48nnn/bug48627.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48627.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -47,8 +45,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48668a() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug48nnn/bug48668a.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48668a.jsp");
String result = res.toString();
assertEcho(result, "00-Hello world</p>#{foo.bar}");
assertEcho(result, "01-Hello world</p>${foo.bar}");
@@ -86,8 +83,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48668b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug48nnn/bug48668b.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48668b.jsp");
String result = res.toString();
assertEcho(result, "00-Hello world</p>#{foo.bar}");
assertEcho(result, "01-Hello world</p>#{foo2");
@@ -97,8 +93,8 @@ public class TestParser extends TomcatBaseTest {
public void testBug49297NoSpaceStrict() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297NoSpaceStrict.jsp", new ByteChunk(), null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297NoSpaceStrict.jsp", new ByteChunk(),
+ null);
Assert.assertEquals(500, sc);
}
@@ -107,8 +103,8 @@ public class TestParser extends TomcatBaseTest {
public void testBug49297DuplicateAttr() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(), null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
+ null);
Assert.assertEquals(500, sc);
}
@@ -118,8 +114,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultipleImport1.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultipleImport1.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -130,8 +125,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultipleImport2.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultipleImport2.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -142,8 +136,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -153,8 +147,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -164,8 +158,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -175,8 +169,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -186,8 +180,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:" + getPort() +
- "/test/bug49nnn/bug49297Tag.jsp", res, null);
+ int sc = getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49297Tag.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -197,8 +190,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug52335() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug52335.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug52335.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -212,53 +204,38 @@ public class TestParser extends TomcatBaseTest {
public void testBug55198() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug55198.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug55198.jsp");
String result = res.toString();
Assert.assertTrue(result,
- result.contains(""1foo1<&>"")
- || result.contains(""1foo1<&>""));
+ result.contains(""1foo1<&>"") || result.contains(""1foo1<&>""));
Assert.assertTrue(result,
- result.contains(""2bar2<&>"")
- || result.contains(""2bar2<&>""));
- Assert.assertTrue(result,
- result.contains(""3a&b3"")
- || result.contains(""3a&b3""));
- Assert.assertTrue(result,
- result.contains(""4&4"")
- || result.contains(""4&4""));
- Assert.assertTrue(result,
- result.contains(""5'5"")
- || result.contains(""5'5""));
+ result.contains(""2bar2<&>"") || result.contains(""2bar2<&>""));
+ Assert.assertTrue(result, result.contains(""3a&b3"") || result.contains(""3a&b3""));
+ Assert.assertTrue(result, result.contains(""4&4"") || result.contains(""4&4""));
+ Assert.assertTrue(result, result.contains(""5'5"") || result.contains(""5'5""));
}
@Test
public void testBug56265() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56265.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56265.jsp");
String result = res.toString();
- Assert.assertTrue(result,
- result.contains("[1: [data-test]: [window.alert('Hello World <&>!')]]"));
- Assert.assertTrue(result,
- result.contains("[2: [data-test]: [window.alert('Hello World <&>!')]]"));
- Assert.assertTrue(result,
- result.contains("[3: [data-test]: [window.alert('Hello 'World <&>'!')]]"));
- Assert.assertTrue(result,
- result.contains("[4: [data-test]: [window.alert('Hello 'World <&>'!')]]"));
+ Assert.assertTrue(result, result.contains("[1: [data-test]: [window.alert('Hello World <&>!')]]"));
+ Assert.assertTrue(result, result.contains("[2: [data-test]: [window.alert('Hello World <&>!')]]"));
+ Assert.assertTrue(result, result.contains("[3: [data-test]: [window.alert('Hello 'World <&>'!')]]"));
+ Assert.assertTrue(result, result.contains("[4: [data-test]: [window.alert('Hello 'World <&>'!')]]"));
}
@Test
public void testBug56334And56561() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56334and56561.jspx");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56334and56561.jspx");
String result = res.toString();
diff --git a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
index 3101dcc97c..56c6663ea9 100644
--- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
+++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
@@ -23,9 +23,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests duplicate those in {@link TestParser} where the strict whitespace
- * parsing is enabled by default. Strict whitespace parsing is disabled for
- * these tests in web.xml.
+ * Tests duplicate those in {@link TestParser} where the strict whitespace parsing is enabled by default. Strict
+ * whitespace parsing is disabled for these tests in web.xml.
*/
public class TestParserNoStrictWhitespace extends TomcatBaseTest {
diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
index dc5f0b502a..ca502e571e 100644
--- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java
+++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
@@ -59,10 +59,7 @@ public class TestScriptingVariabler extends TomcatBaseTest {
*/
@Override
public VariableInfo[] getVariableInfo(TagData data) {
- return new VariableInfo[] {
- new VariableInfo("Test", "java.lang.String", true,
- VariableInfo.AT_END)
- };
+ return new VariableInfo[] { new VariableInfo("Test", "java.lang.String", true, VariableInfo.AT_END) };
}
}
diff --git a/test/org/apache/jasper/compiler/TestSmapStratum.java b/test/org/apache/jasper/compiler/TestSmapStratum.java
index b3e3eeaa38..ee3fe75669 100644
--- a/test/org/apache/jasper/compiler/TestSmapStratum.java
+++ b/test/org/apache/jasper/compiler/TestSmapStratum.java
@@ -34,6 +34,7 @@ public class TestSmapStratum {
s.addLineData(20, "/foo/foo/bar.jsp", 1, 30, 1);
s.setOutputFileName("foo.java");
+ //@formatter:off
Assert.assertEquals(
"SMAP\n" +
"foo.java\n" +
@@ -51,5 +52,6 @@ public class TestSmapStratum {
"20#1:30\n" +
"*E\n",
s.getSmapString());
+ //@formatter:on
}
}
diff --git a/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java b/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
index 65c0ca596c..9012262696 100644
--- a/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
+++ b/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
@@ -35,8 +35,7 @@ public class TestTagLibraryInfoImpl extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/jsp/test.jsp", res, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/test.jsp", res, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -50,8 +49,7 @@ public class TestTagLibraryInfoImpl extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug6nnnn/bug64373.jsp", res, null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug6nnnn/bug64373.jsp", res, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
diff --git a/test/org/apache/jasper/compiler/TestTagPluginManager.java b/test/org/apache/jasper/compiler/TestTagPluginManager.java
index 4b2f607873..f7eb60ffcc 100644
--- a/test/org/apache/jasper/compiler/TestTagPluginManager.java
+++ b/test/org/apache/jasper/compiler/TestTagPluginManager.java
@@ -32,24 +32,21 @@ import org.apache.catalina.startup.TomcatBaseTest;
*/
public class TestTagPluginManager extends TomcatBaseTest {
- private static TagInfo tagInfo = new TagInfo("ATag",
- "org.apache.jasper.compiler.ATagSupport", "", "", null, null, null);
+ private static TagInfo tagInfo =
+ new TagInfo("ATag", "org.apache.jasper.compiler.ATagSupport", "", "", null, null, null);
@Test
public void testBug54240() throws Exception {
Tomcat tomcat = getTomcatInstanceTestWebapp(false, true);
-
ServletContext context = ((Context) tomcat.getHost().findChildren()[0]).getServletContext();
TagPluginManager manager = new TagPluginManager(context);
Node.Nodes nodes = new Node.Nodes();
- Node.CustomTag c = new Node.CustomTag("test:ATag", "test", "ATag",
- "http://tomcat.apache.org/jasper", null, null, null, null, null,
- new TagFileInfo("ATag", "http://tomcat.apache.org/jasper",
- tagInfo));
+ Node.CustomTag c = new Node.CustomTag("test:ATag", "test", "ATag", "http://tomcat.apache.org/jasper", null,
+ null, null, null, null, new TagFileInfo("ATag", "http://tomcat.apache.org/jasper", tagInfo));
c.setTagHandlerClass(TesterTag.class);
nodes.add(c);
manager.apply(nodes, null, null);
@@ -57,13 +54,13 @@ public class TestTagPluginManager extends TomcatBaseTest {
Node n = nodes.getNode(0);
Assert.assertNotNull(n);
- Node.CustomTag t = (Node.CustomTag)n;
+ Node.CustomTag t = (Node.CustomTag) n;
Assert.assertNotNull(t.getAtSTag());
Node.Nodes sTag = c.getAtSTag();
Node scriptlet = sTag.getNode(0);
Assert.assertNotNull(scriptlet);
- Node.Scriptlet s = (Node.Scriptlet)scriptlet;
+ Node.Scriptlet s = (Node.Scriptlet) scriptlet;
Assert.assertEquals("//Just a comment", s.getText());
}
}
diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java
index e2b36e8b1f..aec4efc425 100644
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -36,8 +36,7 @@ public class TestValidator extends TomcatBaseTest {
public void testBug47331() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug47331.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug47331.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -46,15 +45,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions22() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.2");
+ File appDir = new File("test/webapp-2.2");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -71,15 +68,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions23() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.3");
+ File appDir = new File("test/webapp-2.3");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -96,15 +91,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions24() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.4");
+ File appDir = new File("test/webapp-2.4");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -121,15 +114,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions25() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.5");
+ File appDir = new File("test/webapp-2.5");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -146,15 +137,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions30() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.0");
+ File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -171,15 +160,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions31() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.1");
+ File appDir = new File("test/webapp-3.1");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -196,15 +183,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions40() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-4.0");
+ File appDir = new File("test/webapp-4.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -221,15 +206,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions50() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-5.0");
+ File appDir = new File("test/webapp-5.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
@@ -247,15 +230,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions60() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-6.0");
+ File appDir = new File("test/webapp-6.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/tld-versions.jsp");
String result = res.toString();
diff --git a/test/org/apache/jasper/compiler/TesterValidator.java b/test/org/apache/jasper/compiler/TesterValidator.java
index f2d47f825d..b6ed4cc557 100644
--- a/test/org/apache/jasper/compiler/TesterValidator.java
+++ b/test/org/apache/jasper/compiler/TesterValidator.java
@@ -26,9 +26,7 @@ import org.apache.tomcat.util.security.Escape;
*/
public class TesterValidator {
- private static String[] bug53867TestData = new String[] {
- "Hello World!",
- "<meta http-equiv=\"Content-Language\">",
+ private static String[] bug53867TestData = new String[] { "Hello World!", "<meta http-equiv=\"Content-Language\">",
"This connection has limited network connectivity.",
"Please use this web page & to access file server resources." };
@@ -43,8 +41,7 @@ public class TesterValidator {
int count = 100000;
for (String testDatum : bug53867TestData) {
- Assert.assertEquals(doTestBug53867OldVersion(testDatum),
- Escape.xml(testDatum));
+ Assert.assertEquals(doTestBug53867OldVersion(testDatum), Escape.xml(testDatum));
}
for (int i = 0; i < 100; i++) {
@@ -64,8 +61,7 @@ public class TesterValidator {
doTestBug53867OldVersion(bug53867TestDatum);
}
}
- System.out.println(
- "Old escape:" + (System.currentTimeMillis() - start));
+ System.out.println("Old escape:" + (System.currentTimeMillis() - start));
start = System.currentTimeMillis();
for (int i = 0; i < count; i++) {
@@ -73,13 +69,12 @@ public class TesterValidator {
Escape.xml(bug53867TestDatum);
}
}
- System.out.println(
- "New escape:" + (System.currentTimeMillis() - start));
+ System.out.println("New escape:" + (System.currentTimeMillis() - start));
}
private static String doTestBug53867OldVersion(String s) {
if (s == null) {
- return null;
+ return null;
}
StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/04: Code clean-up - formatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a6534bca9ff82044da749ec01b64ef167dd0c6a9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 11:56:07 2023 +0100
Code clean-up - formatting. No functional change.
---
.../tomcat/util/http/FastHttpDateFormat.java | 12 +-
java/org/apache/tomcat/util/http/MimeHeaders.java | 181 +++++++++++----------
java/org/apache/tomcat/util/http/Parameters.java | 8 +-
.../tomcat/util/http/Rfc6265CookieProcessor.java | 6 +-
4 files changed, 105 insertions(+), 102 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index f33aa851a3..f48913bad8 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -34,8 +34,8 @@ public final class FastHttpDateFormat {
// -------------------------------------------------------------- Variables
- private static final int CACHE_SIZE = Integer
- .getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 1000).intValue();
+ private static final int CACHE_SIZE =
+ Integer.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 1000).intValue();
// HTTP date formats
@@ -57,8 +57,8 @@ public final class FastHttpDateFormat {
FORMAT_OBSOLETE_RFC850 = new ConcurrentDateFormat(DATE_OBSOLETE_RFC850, Locale.US, tz);
FORMAT_OBSOLETE_ASCTIME = new ConcurrentDateFormat(DATE_OBSOLETE_ASCTIME, Locale.US, tz);
- httpParseFormats = new ConcurrentDateFormat[] { FORMAT_RFC5322, FORMAT_OBSOLETE_RFC850,
- FORMAT_OBSOLETE_ASCTIME };
+ httpParseFormats =
+ new ConcurrentDateFormat[] { FORMAT_RFC5322, FORMAT_OBSOLETE_RFC850, FORMAT_OBSOLETE_ASCTIME };
}
/**
@@ -76,13 +76,13 @@ public final class FastHttpDateFormat {
/**
* Formatter cache.
*/
- private static final Map<Long, String> formatCache = new ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<Long,String> formatCache = new ConcurrentHashMap<>(CACHE_SIZE);
/**
* Parser cache.
*/
- private static final Map<String, Long> parseCache = new ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<String,Long> parseCache = new ConcurrentHashMap<>(CACHE_SIZE);
// --------------------------------------------------------- Public Methods
diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 3f1992dc3c..eb9a06534a 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -65,26 +65,22 @@ import org.apache.tomcat.util.res.StringManager;
/**
- * Memory-efficient repository for Mime Headers. When the object is recycled, it
- * will keep the allocated headers[] and all the MimeHeaderField - no GC is generated.
- * <p>
- * For input headers it is possible to use the MessageByte for Fields - so no GC
- * will be generated.
+ * Memory-efficient repository for Mime Headers. When the object is recycled, it will keep the allocated headers[] and
+ * all the MimeHeaderField - no GC is generated.
* <p>
- * The only garbage is generated when using the String for header names/values -
- * this can't be avoided when the servlet calls header methods, but is easy
- * to avoid inside tomcat. The goal is to use _only_ MessageByte-based Fields,
- * and reduce to 0 the memory overhead of tomcat.
- * <p>
- *
- * TODO:
- * <ul>
- * <li>one-buffer parsing - for http (other protocols don't need that)</li>
- * <li>remove unused methods</li>
- * <li>External enumerations, with 0 GC.</li>
- * <li>use HeaderName ID</li>
- * </ul>
- *
+ * For input headers it is possible to use the MessageByte for Fields - so no GC will be generated.
+ * <p>
+ * The only garbage is generated when using the String for header names/values - this can't be avoided when the servlet
+ * calls header methods, but is easy to avoid inside tomcat. The goal is to use _only_ MessageByte-based Fields, and
+ * reduce to 0 the memory overhead of tomcat.
+ * <p>
+ * TODO:
+ * <ul>
+ * <li>one-buffer parsing - for http (other protocols don't need that)</li>
+ * <li>remove unused methods</li>
+ * <li>External enumerations, with 0 GC.</li>
+ * <li>use HeaderName ID</li>
+ * </ul>
*
* @author dac@eng.sun.com
* @author James Todd [gonzo@eng.sun.com]
@@ -97,16 +93,14 @@ public class MimeHeaders {
* <p>
* TODO make it configurable (fine-tuning of web-apps)
*/
- public static final int DEFAULT_HEADER_SIZE=8;
+ public static final int DEFAULT_HEADER_SIZE = 8;
- private static final StringManager sm =
- StringManager.getManager("org.apache.tomcat.util.http");
+ private static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.http");
/**
* The header fields.
*/
- private MimeHeaderField[] headers = new
- MimeHeaderField[DEFAULT_HEADER_SIZE];
+ private MimeHeaderField[] headers = new MimeHeaderField[DEFAULT_HEADER_SIZE];
/**
* The current number of header fields.
@@ -127,6 +121,7 @@ public class MimeHeaders {
/**
* Set limit on the number of header fields.
+ *
* @param limit The new limit
*/
public void setLimit(int limit) {
@@ -158,7 +153,7 @@ public class MimeHeaders {
}
/**
- * EXPENSIVE!!! only for debugging.
+ * EXPENSIVE!!! only for debugging.
*/
@Override
public String toString() {
@@ -199,8 +194,9 @@ public class MimeHeaders {
/**
* @param n The header index
- * @return the Nth header name, or null if there is no such header.
- * This may be used to iterate through all header fields.
+ *
+ * @return the Nth header name, or null if there is no such header. This may be used to iterate through all header
+ * fields.
*/
public MessageBytes getName(int n) {
return n >= 0 && n < count ? headers[n].getName() : null;
@@ -208,8 +204,9 @@ public class MimeHeaders {
/**
* @param n The header index
- * @return the Nth header value, or null if there is no such header.
- * This may be used to iterate through all header fields.
+ *
+ * @return the Nth header value, or null if there is no such header. This may be used to iterate through all header
+ * fields.
*/
public MessageBytes getValue(int n) {
return n >= 0 && n < count ? headers[n].getValue() : null;
@@ -217,13 +214,15 @@ public class MimeHeaders {
/**
* Find the index of a header with the given name.
- * @param name The header name
+ *
+ * @param name The header name
* @param starting Index on which to start looking
+ *
* @return the header index
*/
- public int findHeader( String name, int starting ) {
+ public int findHeader(String name, int starting) {
// We can use a hash - but it's not clear how much
- // benefit you can get - there is an overhead
+ // benefit you can get - there is an overhead
// and the number of headers is small (4-5 ?)
// Another problem is that we'll pay the overhead
// of constructing the hashtable
@@ -240,9 +239,9 @@ public class MimeHeaders {
// -------------------- --------------------
/**
- * Returns an enumeration of strings representing the header field names.
- * Field names may appear multiple times in this enumeration, indicating
- * that multiple fields with that name exist in this header.
+ * Returns an enumeration of strings representing the header field names. Field names may appear multiple times in
+ * this enumeration, indicating that multiple fields with that name exist in this header.
+ *
* @return the enumeration
*/
public Enumeration<String> names() {
@@ -257,13 +256,11 @@ public class MimeHeaders {
/**
- * Adds a partially constructed field to the header. This
- * field has not had its name or value initialized.
+ * Adds a partially constructed field to the header. This field has not had its name or value initialized.
*/
private MimeHeaderField createHeader() {
if (limit > -1 && count >= limit) {
- throw new IllegalStateException(sm.getString(
- "headers.maxCountFail", Integer.valueOf(limit)));
+ throw new IllegalStateException(sm.getString("headers.maxCountFail", Integer.valueOf(limit)));
}
MimeHeaderField mh;
int len = headers.length;
@@ -285,43 +282,46 @@ public class MimeHeaders {
}
/**
- * Create a new named header , return the MessageBytes
- * container for the new value
+ * Create a new named header , return the MessageBytes container for the new value
+ *
* @param name The header name
+ *
* @return the message bytes container for the value
*/
- public MessageBytes addValue( String name ) {
+ public MessageBytes addValue(String name) {
MimeHeaderField mh = createHeader();
mh.getName().setString(name);
return mh.getValue();
}
/**
- * Create a new named header using un-translated byte[].
- * The conversion to chars can be delayed until
- * encoding is known.
- * @param b The header name bytes
+ * Create a new named header using un-translated byte[]. The conversion to chars can be delayed until encoding is
+ * known.
+ *
+ * @param b The header name bytes
* @param startN Offset
- * @param len Length
+ * @param len Length
+ *
* @return the message bytes container for the value
*/
public MessageBytes addValue(byte b[], int startN, int len) {
- MimeHeaderField mhf=createHeader();
+ MimeHeaderField mhf = createHeader();
mhf.getName().setBytes(b, startN, len);
return mhf.getValue();
}
/**
- * Allow "set" operations, which removes all current values
- * for this header.
+ * Allow "set" operations, which removes all current values for this header.
+ *
* @param name The header name
+ *
* @return the message bytes container for the value
*/
- public MessageBytes setValue( String name ) {
- for ( int i = 0; i < count; i++ ) {
- if(headers[i].getName().equalsIgnoreCase(name)) {
- for ( int j=i+1; j < count; j++ ) {
- if(headers[j].getName().equalsIgnoreCase(name)) {
+ public MessageBytes setValue(String name) {
+ for (int i = 0; i < count; i++) {
+ if (headers[i].getName().equalsIgnoreCase(name)) {
+ for (int j = i + 1; j < count; j++) {
+ if (headers[j].getName().equalsIgnoreCase(name)) {
removeHeader(j--);
}
}
@@ -333,12 +333,13 @@ public class MimeHeaders {
return mh.getValue();
}
- //-------------------- Getting headers --------------------
+ // -------------------- Getting headers --------------------
/**
- * Finds and returns a header field with the given name. If no such
- * field exists, null is returned. If more than one such field is
- * in the header, an arbitrary one is returned.
+ * Finds and returns a header field with the given name. If no such field exists, null is returned. If more than one
+ * such field is in the header, an arbitrary one is returned.
+ *
* @param name The header name
+ *
* @return the value
*/
public MessageBytes getValue(String name) {
@@ -351,11 +352,13 @@ public class MimeHeaders {
}
/**
- * Finds and returns a unique header field with the given name. If no such
- * field exists, null is returned. If the specified header field is not
- * unique then an {@link IllegalArgumentException} is thrown.
+ * Finds and returns a unique header field with the given name. If no such field exists, null is returned. If the
+ * specified header field is not unique then an {@link IllegalArgumentException} is thrown.
+ *
* @param name The header name
+ *
* @return the value if unique
+ *
* @throws IllegalArgumentException if the header has multiple values
*/
public MessageBytes getUniqueValue(String name) {
@@ -381,8 +384,8 @@ public class MimeHeaders {
// -------------------- Removing --------------------
/**
- * Removes a header field with the specified name. Does nothing
- * if such a field could not be found.
+ * Removes a header field with the specified name. Does nothing if such a field could not be found.
+ *
* @param name the name of the header field to be removed
*/
public void removeHeader(String name) {
@@ -398,6 +401,7 @@ public class MimeHeaders {
/**
* Reset, move to the end and then reduce count by 1.
+ *
* @param idx the index of the header to remove.
*/
public void removeHeader(int idx) {
@@ -412,7 +416,7 @@ public class MimeHeaders {
mh.recycle();
// Move the remaining headers
- System.arraycopy(headers, idx + 1, headers, idx, count - idx -1);
+ System.arraycopy(headers, idx + 1, headers, idx, count - idx - 1);
// Place the removed header at the end
headers[count - 1] = mh;
@@ -424,9 +428,8 @@ public class MimeHeaders {
}
/**
- * Enumerate the distinct header names. Each nextElement() is O(n) ( a
- * comparison is done with all previous elements ). This is less frequent than
- * add() - we want to keep add O(1).
+ * Enumerate the distinct header names. Each nextElement() is O(n) ( a comparison is done with all previous elements ).
+ * This is less frequent than add() - we want to keep add O(1).
*/
class NamesEnumerator implements Enumeration<String> {
private int pos;
@@ -435,24 +438,24 @@ class NamesEnumerator implements Enumeration<String> {
private final MimeHeaders headers;
NamesEnumerator(MimeHeaders headers) {
- this.headers=headers;
- pos=0;
+ this.headers = headers;
+ pos = 0;
size = headers.size();
findNext();
}
private void findNext() {
- next=null;
- for(; pos< size; pos++ ) {
- next=headers.getName( pos ).toString();
- for( int j=0; j<pos ; j++ ) {
- if( headers.getName( j ).equalsIgnoreCase( next )) {
+ next = null;
+ for (; pos < size; pos++) {
+ next = headers.getName(pos).toString();
+ for (int j = 0; j < pos; j++) {
+ if (headers.getName(j).equalsIgnoreCase(next)) {
// duplicate.
- next=null;
+ next = null;
break;
}
}
- if( next!=null ) {
+ if (next != null) {
// it's not a duplicate
break;
}
@@ -464,12 +467,12 @@ class NamesEnumerator implements Enumeration<String> {
@Override
public boolean hasMoreElements() {
- return next!=null;
+ return next != null;
}
@Override
public String nextElement() {
- String current=next;
+ String current = next;
findNext();
return current;
}
@@ -486,19 +489,19 @@ class ValuesEnumerator implements Enumeration<String> {
private final String name;
ValuesEnumerator(MimeHeaders headers, String name) {
- this.name=name;
- this.headers=headers;
- pos=0;
+ this.name = name;
+ this.headers = headers;
+ pos = 0;
size = headers.size();
findNext();
}
private void findNext() {
- next=null;
- for(; pos< size; pos++ ) {
- MessageBytes n1=headers.getName( pos );
- if( n1.equalsIgnoreCase( name )) {
- next=headers.getValue( pos );
+ next = null;
+ for (; pos < size; pos++) {
+ MessageBytes n1 = headers.getName(pos);
+ if (n1.equalsIgnoreCase(name)) {
+ next = headers.getValue(pos);
break;
}
}
@@ -507,12 +510,12 @@ class ValuesEnumerator implements Enumeration<String> {
@Override
public boolean hasMoreElements() {
- return next!=null;
+ return next != null;
}
@Override
public String nextElement() {
- MessageBytes current=next;
+ MessageBytes current = next;
findNext();
return current.toString();
}
diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
index debf968acf..e56793b3de 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -44,7 +44,7 @@ public final class Parameters {
private static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.http");
- private final Map<String, ArrayList<String>> paramHashValues = new LinkedHashMap<>();
+ private final Map<String,ArrayList<String>> paramHashValues = new LinkedHashMap<>();
private boolean didQueryParameters = false;
private MessageBytes queryMB;
@@ -418,8 +418,8 @@ public final class Parameters {
} else if (log.isInfoEnabled()) {
UserDataHelper.Mode logMode = userDataLog.getNextMode();
if (logMode != null) {
- String message = sm.getString("parameters.decodeFail.info", tmpName.toString(),
- tmpValue.toString());
+ String message =
+ sm.getString("parameters.decodeFail.info", tmpName.toString(), tmpValue.toString());
switch (logMode) {
case INFO_THEN_DEBUG:
message += sm.getString("parameters.fallToDebug");
@@ -487,7 +487,7 @@ public final class Parameters {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- for (Map.Entry<String, ArrayList<String>> e : paramHashValues.entrySet()) {
+ for (Map.Entry<String,ArrayList<String>> e : paramHashValues.entrySet()) {
sb.append(e.getKey()).append('=');
StringUtils.join(e.getValue(), ',', sb);
sb.append('\n');
diff --git a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
index 03281b82e5..9e3c5227db 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -38,8 +38,8 @@ public class Rfc6265CookieProcessor extends CookieProcessorBase {
private static final Log log = LogFactory.getLog(Rfc6265CookieProcessor.class);
- private static final StringManager sm = StringManager
- .getManager(Rfc6265CookieProcessor.class.getPackage().getName());
+ private static final StringManager sm =
+ StringManager.getManager(Rfc6265CookieProcessor.class.getPackage().getName());
private static final BitSet domainValid = new BitSet(128);
@@ -178,7 +178,7 @@ public class Rfc6265CookieProcessor extends CookieProcessorBase {
}
// Add the remaining attributes
- for (Map.Entry<String, String> entry : cookie.getAttributes().entrySet()) {
+ for (Map.Entry<String,String> entry : cookie.getAttributes().entrySet()) {
switch (entry.getKey()) {
case Constants.COOKIE_COMMENT_ATTR:
case Constants.COOKIE_DOMAIN_ATTR:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/04: Code clean-up - formatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b8e6d382c61c9ea250b082bbe70d4f85ef804928
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 11:59:33 2023 +0100
Code clean-up - formatting. No functional change.
---
.../apache/catalina/core/ApplicationContext.java | 20 ++---
.../catalina/core/ApplicationContextFacade.java | 6 +-
.../catalina/core/ApplicationDispatcher.java | 8 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java | 8 +-
.../core/ApplicationFilterRegistration.java | 10 +--
.../catalina/core/ApplicationHttpRequest.java | 20 ++---
java/org/apache/catalina/core/ApplicationPart.java | 2 +-
.../catalina/core/ApplicationPushBuilder.java | 8 +-
.../apache/catalina/core/ApplicationRequest.java | 16 ++--
.../core/ApplicationServletRegistration.java | 10 +--
.../core/ApplicationSessionCookieConfig.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 2 +-
.../catalina/core/ContextNamingInfoListener.java | 13 ++--
.../catalina/core/DefaultInstanceManager.java | 38 +++++-----
.../apache/catalina/core/FrameworkListener.java | 2 +-
.../core/JreMemoryLeakPreventionListener.java | 5 +-
.../catalina/core/NamingContextListener.java | 12 +--
java/org/apache/catalina/core/StandardContext.java | 86 +++++++++++-----------
java/org/apache/catalina/core/StandardHost.java | 8 +-
java/org/apache/catalina/core/StandardServer.java | 9 +--
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
23 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index a04a7706b0..682ccc123b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -113,13 +113,13 @@ public class ApplicationContext implements ServletContext {
/**
* The context attributes for this context.
*/
- protected Map<String, Object> attributes = new ConcurrentHashMap<>();
+ protected Map<String,Object> attributes = new ConcurrentHashMap<>();
/**
* List of read only attributes for this context.
*/
- private final Map<String, String> readOnlyAttributes = new ConcurrentHashMap<>();
+ private final Map<String,String> readOnlyAttributes = new ConcurrentHashMap<>();
/**
@@ -143,7 +143,7 @@ public class ApplicationContext implements ServletContext {
/**
* The merged context initialization parameters for this Context.
*/
- private final Map<String, String> parameters = new ConcurrentHashMap<>();
+ private final Map<String,String> parameters = new ConcurrentHashMap<>();
/**
@@ -799,7 +799,7 @@ public class ApplicationContext implements ServletContext {
}
String jspServletClassName = null;
- Map<String, String> jspFileInitParams = new HashMap<>();
+ Map<String,String> jspFileInitParams = new HashMap<>();
Wrapper jspServlet = (Wrapper) context.findChild("jsp");
@@ -826,7 +826,7 @@ public class ApplicationContext implements ServletContext {
private ServletRegistration.Dynamic addServlet(String servletName, String servletClass, Servlet servlet,
- Map<String, String> initParams) throws IllegalStateException {
+ Map<String,String> initParams) throws IllegalStateException {
if (servletName == null || servletName.equals("")) {
throw new IllegalArgumentException(sm.getString("applicationContext.invalidServletName", servletName));
@@ -869,7 +869,7 @@ public class ApplicationContext implements ServletContext {
}
if (initParams != null) {
- for (Map.Entry<String, String> initParam : initParams.entrySet()) {
+ for (Map.Entry<String,String> initParam : initParams.entrySet()) {
wrapper.addInitParameter(initParam.getKey(), initParam.getValue());
}
}
@@ -1121,8 +1121,8 @@ public class ApplicationContext implements ServletContext {
@Override
- public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
- Map<String, ApplicationFilterRegistration> result = new HashMap<>();
+ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
+ Map<String,ApplicationFilterRegistration> result = new HashMap<>();
FilterDef[] filterDefs = context.findFilterDefs();
for (FilterDef filterDef : filterDefs) {
@@ -1140,8 +1140,8 @@ public class ApplicationContext implements ServletContext {
@Override
- public Map<String, ? extends ServletRegistration> getServletRegistrations() {
- Map<String, ApplicationServletRegistration> result = new HashMap<>();
+ public Map<String,? extends ServletRegistration> getServletRegistrations() {
+ Map<String,ApplicationServletRegistration> result = new HashMap<>();
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java b/java/org/apache/catalina/core/ApplicationContextFacade.java
index 260eaa91fd..24678d8782 100644
--- a/java/org/apache/catalina/core/ApplicationContextFacade.java
+++ b/java/org/apache/catalina/core/ApplicationContextFacade.java
@@ -50,7 +50,7 @@ public class ApplicationContextFacade implements ServletContext {
/**
* Cache Class object used for reflection.
*/
- private final Map<String, Class<?>[]> classCache;
+ private final Map<String,Class<?>[]> classCache;
// ----------------------------------------------------------- Constructors
@@ -387,7 +387,7 @@ public class ApplicationContextFacade implements ServletContext {
@Override
- public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
return context.getFilterRegistrations();
}
@@ -399,7 +399,7 @@ public class ApplicationContextFacade implements ServletContext {
@Override
- public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+ public Map<String,? extends ServletRegistration> getServletRegistrations() {
return context.getServletRegistrations();
}
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 60976a5587..9052ca8587 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -122,8 +122,8 @@ final class ApplicationDispatcher implements AsyncDispatcher, RequestDispatcher
* @param mapping The mapping for this resource (if any)
* @param name Servlet name (if a named dispatcher was created) else <code>null</code>
*/
- ApplicationDispatcher(Wrapper wrapper, String requestURI, String servletPath, String pathInfo,
- String queryString, HttpServletMapping mapping, String name) {
+ ApplicationDispatcher(Wrapper wrapper, String requestURI, String servletPath, String pathInfo, String queryString,
+ HttpServletMapping mapping, String name) {
super();
@@ -519,8 +519,8 @@ final class ApplicationDispatcher implements AsyncDispatcher, RequestDispatcher
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException", wrapper.getName()), e);
- servletException = new ServletException(
- sm.getString("applicationDispatcher.allocateException", wrapper.getName()), e);
+ servletException =
+ new ServletException(sm.getString("applicationDispatcher.allocateException", wrapper.getName()), e);
servlet = null;
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index acf10b0d2a..a581816641 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -153,7 +153,7 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable
@Override
public String getInitParameter(String name) {
- Map<String, String> map = filterDef.getParameterMap();
+ Map<String,String> map = filterDef.getParameterMap();
if (map == null) {
return null;
}
@@ -168,7 +168,7 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable
*/
@Override
public Enumeration<String> getInitParameterNames() {
- Map<String, String> map = filterDef.getParameterMap();
+ Map<String,String> map = filterDef.getParameterMap();
if (map == null) {
return Collections.enumeration(emptyString);
@@ -205,7 +205,7 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable
// --------------------------------------------------------- Public Methods
- public Map<String, String> getFilterInitParameterMap() {
+ public Map<String,String> getFilterInitParameterMap() {
return Collections.unmodifiableMap(filterDef.getParameterMap());
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index 8774fa70af..610abd3364 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -100,8 +100,8 @@ public final class ApplicationFilterFactory {
if (!matchFiltersURL(filterMap, requestPath)) {
continue;
}
- ApplicationFilterConfig filterConfig = (ApplicationFilterConfig) context
- .findFilterConfig(filterMap.getFilterName());
+ ApplicationFilterConfig filterConfig =
+ (ApplicationFilterConfig) context.findFilterConfig(filterMap.getFilterName());
if (filterConfig == null) {
// FIXME - log configuration problem
continue;
@@ -117,8 +117,8 @@ public final class ApplicationFilterFactory {
if (!matchFiltersServlet(filterMap, servletName)) {
continue;
}
- ApplicationFilterConfig filterConfig = (ApplicationFilterConfig) context
- .findFilterConfig(filterMap.getFilterName());
+ ApplicationFilterConfig filterConfig =
+ (ApplicationFilterConfig) context.findFilterConfig(filterMap.getFilterName());
if (filterConfig == null) {
// FIXME - log configuration problem
continue;
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 98839f0f2f..c14ce0314f 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -145,8 +145,8 @@ public class ApplicationFilterRegistration implements FilterRegistration.Dynamic
}
@Override
- public Map<String, String> getInitParameters() {
- ParameterMap<String, String> result = new ParameterMap<>();
+ public Map<String,String> getInitParameters() {
+ ParameterMap<String,String> result = new ParameterMap<>();
result.putAll(filterDef.getParameterMap());
result.setLocked(true);
return result;
@@ -173,11 +173,11 @@ public class ApplicationFilterRegistration implements FilterRegistration.Dynamic
}
@Override
- public Set<String> setInitParameters(Map<String, String> initParameters) {
+ public Set<String> setInitParameters(Map<String,String> initParameters) {
Set<String> conflicts = new HashSet<>();
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(
sm.getString("applicationFilterRegistration.nullInitParams", entry.getKey(), entry.getValue()));
@@ -189,7 +189,7 @@ public class ApplicationFilterRegistration implements FilterRegistration.Dynamic
// Have to add in a separate loop since spec requires no updates at all
// if there is an issue
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
setInitParameter(entry.getKey(), entry.getValue());
}
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 46118f0161..1b93479d32 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -74,13 +74,13 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
/**
* The set of attribute names that are special for request dispatchers.
*/
- protected static final String specials[] = { RequestDispatcher.INCLUDE_REQUEST_URI,
- RequestDispatcher.INCLUDE_CONTEXT_PATH, RequestDispatcher.INCLUDE_SERVLET_PATH,
- RequestDispatcher.INCLUDE_PATH_INFO, RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.INCLUDE_MAPPING, RequestDispatcher.FORWARD_REQUEST_URI,
- RequestDispatcher.FORWARD_CONTEXT_PATH, RequestDispatcher.FORWARD_SERVLET_PATH,
- RequestDispatcher.FORWARD_PATH_INFO, RequestDispatcher.FORWARD_QUERY_STRING,
- RequestDispatcher.FORWARD_MAPPING };
+ protected static final String specials[] =
+ { RequestDispatcher.INCLUDE_REQUEST_URI, RequestDispatcher.INCLUDE_CONTEXT_PATH,
+ RequestDispatcher.INCLUDE_SERVLET_PATH, RequestDispatcher.INCLUDE_PATH_INFO,
+ RequestDispatcher.INCLUDE_QUERY_STRING, RequestDispatcher.INCLUDE_MAPPING,
+ RequestDispatcher.FORWARD_REQUEST_URI, RequestDispatcher.FORWARD_CONTEXT_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH, RequestDispatcher.FORWARD_PATH_INFO,
+ RequestDispatcher.FORWARD_QUERY_STRING, RequestDispatcher.FORWARD_MAPPING };
private static final int SPECIALS_FIRST_FORWARD_INDEX = 6;
@@ -135,7 +135,7 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
/**
* The request parameters for this request. This is initialized from the wrapped request.
*/
- protected Map<String, String[]> parameters = null;
+ protected Map<String,String[]> parameters = null;
/**
@@ -400,7 +400,7 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
* Override the <code>getParameterMap()</code> method of the wrapped request.
*/
@Override
- public Map<String, String[]> getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
parseParameters();
return parameters;
}
@@ -719,7 +719,7 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
parameters = new ParameterMap<>();
parameters.putAll(getRequest().getParameterMap());
mergeParameters();
- ((ParameterMap<String, String[]>) parameters).setLocked(true);
+ ((ParameterMap<String,String[]>) parameters).setLocked(true);
parsedParams = true;
}
diff --git a/java/org/apache/catalina/core/ApplicationPart.java b/java/org/apache/catalina/core/ApplicationPart.java
index c5aaf264bd..62720374fe 100644
--- a/java/org/apache/catalina/core/ApplicationPart.java
+++ b/java/org/apache/catalina/core/ApplicationPart.java
@@ -137,7 +137,7 @@ public class ApplicationPart implements Part {
ParameterParser paramParser = new ParameterParser();
paramParser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String, String> params = paramParser.parse(cd, ';');
+ Map<String,String> params = paramParser.parse(cd, ';');
if (params.containsKey("filename")) {
fileName = params.get("filename");
// The parser will remove surrounding '"' but will not
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index b7a671dc9a..90250326ac 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -67,7 +67,7 @@ public class ApplicationPushBuilder implements PushBuilder {
private final boolean addSessionCookie;
private final boolean addSessionPathParameter;
- private final Map<String, List<String>> headers = new CaseInsensitiveKeyMap<>();
+ private final Map<String,List<String>> headers = new CaseInsensitiveKeyMap<>();
private final List<Cookie> cookies = new ArrayList<>();
private String method = "GET";
private String path;
@@ -128,8 +128,8 @@ public class ApplicationPushBuilder implements PushBuilder {
sessionId = request.getRequestedSessionId();
}
if (!request.isRequestedSessionIdFromCookie() && !request.isRequestedSessionIdFromURL() && sessionId != null) {
- Set<SessionTrackingMode> sessionTrackingModes = request.getServletContext()
- .getEffectiveSessionTrackingModes();
+ Set<SessionTrackingMode> sessionTrackingModes =
+ request.getServletContext().getEffectiveSessionTrackingModes();
addSessionCookie = sessionTrackingModes.contains(SessionTrackingMode.COOKIE);
addSessionPathParameter = sessionTrackingModes.contains(SessionTrackingMode.URL);
} else {
@@ -300,7 +300,7 @@ public class ApplicationPushBuilder implements PushBuilder {
pushTarget.scheme().setString(baseRequest.getScheme());
// Copy headers
- for (Map.Entry<String, List<String>> header : headers.entrySet()) {
+ for (Map.Entry<String,List<String>> header : headers.entrySet()) {
for (String value : header.getValue()) {
pushTarget.getMimeHeaders().addValue(header.getKey()).setString(value);
}
diff --git a/java/org/apache/catalina/core/ApplicationRequest.java b/java/org/apache/catalina/core/ApplicationRequest.java
index 050aa92145..d3f247267a 100644
--- a/java/org/apache/catalina/core/ApplicationRequest.java
+++ b/java/org/apache/catalina/core/ApplicationRequest.java
@@ -47,13 +47,13 @@ class ApplicationRequest extends ServletRequestWrapper {
/**
* The set of attribute names that are special for request dispatchers.
*/
- protected static final String specials[] = { RequestDispatcher.INCLUDE_REQUEST_URI,
- RequestDispatcher.INCLUDE_CONTEXT_PATH, RequestDispatcher.INCLUDE_SERVLET_PATH,
- RequestDispatcher.INCLUDE_PATH_INFO, RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.INCLUDE_MAPPING, RequestDispatcher.FORWARD_REQUEST_URI,
- RequestDispatcher.FORWARD_CONTEXT_PATH, RequestDispatcher.FORWARD_SERVLET_PATH,
- RequestDispatcher.FORWARD_PATH_INFO, RequestDispatcher.FORWARD_QUERY_STRING,
- RequestDispatcher.FORWARD_MAPPING };
+ protected static final String specials[] =
+ { RequestDispatcher.INCLUDE_REQUEST_URI, RequestDispatcher.INCLUDE_CONTEXT_PATH,
+ RequestDispatcher.INCLUDE_SERVLET_PATH, RequestDispatcher.INCLUDE_PATH_INFO,
+ RequestDispatcher.INCLUDE_QUERY_STRING, RequestDispatcher.INCLUDE_MAPPING,
+ RequestDispatcher.FORWARD_REQUEST_URI, RequestDispatcher.FORWARD_CONTEXT_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH, RequestDispatcher.FORWARD_PATH_INFO,
+ RequestDispatcher.FORWARD_QUERY_STRING, RequestDispatcher.FORWARD_MAPPING };
// ----------------------------------------------------------- Constructors
@@ -78,7 +78,7 @@ class ApplicationRequest extends ServletRequestWrapper {
/**
* The request attributes for this request. This is initialized from the wrapped request, but updates are allowed.
*/
- protected final HashMap<String, Object> attributes = new HashMap<>();
+ protected final HashMap<String,Object> attributes = new HashMap<>();
// ------------------------------------------------- ServletRequest Methods
diff --git a/java/org/apache/catalina/core/ApplicationServletRegistration.java b/java/org/apache/catalina/core/ApplicationServletRegistration.java
index 808e16bf52..71adec81ac 100644
--- a/java/org/apache/catalina/core/ApplicationServletRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationServletRegistration.java
@@ -62,8 +62,8 @@ public class ApplicationServletRegistration implements ServletRegistration.Dynam
}
@Override
- public Map<String, String> getInitParameters() {
- ParameterMap<String, String> result = new ParameterMap<>();
+ public Map<String,String> getInitParameters() {
+ ParameterMap<String,String> result = new ParameterMap<>();
String[] parameterNames = wrapper.findInitParameters();
@@ -96,11 +96,11 @@ public class ApplicationServletRegistration implements ServletRegistration.Dynam
}
@Override
- public Set<String> setInitParameters(Map<String, String> initParameters) {
+ public Set<String> setInitParameters(Map<String,String> initParameters) {
Set<String> conflicts = new HashSet<>();
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(
sm.getString("applicationFilterRegistration.nullInitParams", entry.getKey(), entry.getValue()));
@@ -113,7 +113,7 @@ public class ApplicationServletRegistration implements ServletRegistration.Dynam
// Have to add in a separate loop since spec requires no updates at all
// if there is an issue
if (conflicts.isEmpty()) {
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
setInitParameter(entry.getKey(), entry.getValue());
}
}
diff --git a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
index ab71ead321..c9f6bda066 100644
--- a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
+++ b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
@@ -40,7 +40,7 @@ public class ApplicationSessionCookieConfig implements SessionCookieConfig {
private static final boolean DEFAULT_HTTP_ONLY = false;
private static final boolean DEFAULT_SECURE = false;
- private final Map<String, String> attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ private final Map<String,String> attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private String name;
private StandardContext context;
@@ -175,7 +175,7 @@ public class ApplicationSessionCookieConfig implements SessionCookieConfig {
@Override
- public Map<String, String> getAttributes() {
+ public Map<String,String> getAttributes() {
return Collections.unmodifiableMap(attributes);
}
@@ -224,7 +224,7 @@ public class ApplicationSessionCookieConfig implements SessionCookieConfig {
cookie.setPath(SessionConfig.getSessionCookiePath(context));
// Other attributes
- for (Map.Entry<String, String> attribute : scc.getAttributes().entrySet()) {
+ for (Map.Entry<String,String> attribute : scc.getAttributes().entrySet()) {
switch (attribute.getKey()) {
case Constants.COOKIE_COMMENT_ATTR:
case Constants.COOKIE_DOMAIN_ATTR:
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java
index 3d2bf5f8c6..f956800455 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -386,8 +386,8 @@ public class AsyncContextImpl implements AsyncContext, AsyncContextCallback {
if (log.isDebugEnabled()) {
log.debug(sm.getString("asyncContextImpl.fireOnError"));
}
- AsyncEvent errorEvent = new AsyncEvent(event.getAsyncContext(), event.getSuppliedRequest(),
- event.getSuppliedResponse(), t);
+ AsyncEvent errorEvent =
+ new AsyncEvent(event.getAsyncContext(), event.getSuppliedRequest(), event.getSuppliedResponse(), t);
List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(listeners);
for (AsyncListenerWrapper listener : listenersCopy) {
try {
diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index a7e7c69a4a..d7fa461628 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -128,7 +128,7 @@ public abstract class ContainerBase extends LifecycleMBeanBase implements Contai
/**
* The child Containers belonging to this Container, keyed by name.
*/
- protected final HashMap<String, Container> children = new HashMap<>();
+ protected final HashMap<String,Container> children = new HashMap<>();
/**
diff --git a/java/org/apache/catalina/core/ContextNamingInfoListener.java b/java/org/apache/catalina/core/ContextNamingInfoListener.java
index 58d61a738f..bacdfe404a 100644
--- a/java/org/apache/catalina/core/ContextNamingInfoListener.java
+++ b/java/org/apache/catalina/core/ContextNamingInfoListener.java
@@ -26,8 +26,7 @@ import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
import org.apache.tomcat.util.res.StringManager;
/**
- * Implementation of {@code LifecycleListener} that will create context naming information
- * environment entries.
+ * Implementation of {@code LifecycleListener} that will create context naming information environment entries.
* <p>
* This listener must only be nested within {@link Context} elements.
* <p>
@@ -41,8 +40,8 @@ import org.apache.tomcat.util.res.StringManager;
* <li>Display Name: {@code context/displayName} from {@link Context#getDisplayName()}</li>
* </ul>
* <p>
- * See the <a href="https://tomcat.apache.org/tomcat-11.0-doc/config/context.html#Naming">Tomcat
- * documentation</a> for more details on the values.
+ * See the <a href="https://tomcat.apache.org/tomcat-11.0-doc/config/context.html#Naming">Tomcat documentation</a> for
+ * more details on the values.
*/
public class ContextNamingInfoListener implements LifecycleListener {
@@ -62,8 +61,8 @@ public class ContextNamingInfoListener implements LifecycleListener {
private boolean emptyOnRoot = true;
/**
- * Sets whether for the root context {@code context/path} and {@code context/encodedPath} will
- * contain {@code "/"} and {@code context/name} will contain {@code "ROOT"} with a version, if any.
+ * Sets whether for the root context {@code context/path} and {@code context/encodedPath} will contain {@code "/"}
+ * and {@code context/name} will contain {@code "ROOT"} with a version, if any.
*
* @param emptyOnRoot whether paths and name for root context shall be empty
*/
@@ -113,7 +112,7 @@ public class ContextNamingInfoListener implements LifecycleListener {
ce.setType("java.lang.String");
ce.setValue(value);
if (log.isDebugEnabled()) {
- log.info(sm.getString("contextNamingInfoListener.envEntry",name, value));
+ log.info(sm.getString("contextNamingInfoListener.envEntry", name, value));
}
context.getNamingResources().addEnvironment(ce);
}
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index b4d0e856b2..c0fe2c6f73 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -92,18 +92,19 @@ public class DefaultInstanceManager implements InstanceManager {
private final Context context;
- private final Map<String, Map<String, String>> injectionMap;
+ private final Map<String,Map<String,String>> injectionMap;
protected final ClassLoader classLoader;
protected final ClassLoader containerClassLoader;
protected final boolean privileged;
protected final boolean ignoreAnnotations;
protected final boolean metadataComplete;
private final Set<String> restrictedClasses;
- private final ManagedConcurrentWeakHashMap<Class<?>, AnnotationCacheEntry[]> annotationCache = new ManagedConcurrentWeakHashMap<>();
- private final Map<String, String> postConstructMethods;
- private final Map<String, String> preDestroyMethods;
+ private final ManagedConcurrentWeakHashMap<Class<?>,AnnotationCacheEntry[]> annotationCache =
+ new ManagedConcurrentWeakHashMap<>();
+ private final Map<String,String> postConstructMethods;
+ private final Map<String,String> preDestroyMethods;
- public DefaultInstanceManager(Context context, Map<String, Map<String, String>> injectionMap,
+ public DefaultInstanceManager(Context context, Map<String,Map<String,String>> injectionMap,
org.apache.catalina.Context catalinaContext, ClassLoader containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
privileged = catalinaContext.getPrivileged();
@@ -155,7 +156,7 @@ public class DefaultInstanceManager implements InstanceManager {
private Object newInstance(Object instance, Class<?> clazz)
throws IllegalAccessException, InvocationTargetException, NamingException {
if (!ignoreAnnotations) {
- Map<String, String> injections = assembleInjectionsFromClassHierarchy(clazz);
+ Map<String,String> injections = assembleInjectionsFromClassHierarchy(clazz);
populateAnnotationsCache(clazz, injections);
processAnnotations(instance, injections);
postConstruct(instance, clazz);
@@ -163,9 +164,9 @@ public class DefaultInstanceManager implements InstanceManager {
return instance;
}
- private Map<String, String> assembleInjectionsFromClassHierarchy(Class<?> clazz) {
- Map<String, String> injections = new HashMap<>();
- Map<String, String> currentInjections = null;
+ private Map<String,String> assembleInjectionsFromClassHierarchy(Class<?> clazz) {
+ Map<String,String> injections = new HashMap<>();
+ Map<String,String> currentInjections = null;
while (clazz != null) {
currentInjections = this.injectionMap.get(clazz.getName());
if (currentInjections != null) {
@@ -272,7 +273,7 @@ public class DefaultInstanceManager implements InstanceManager {
* @throws javax.naming.NamingException if value cannot be looked up in jndi
* @throws java.lang.reflect.InvocationTargetException if injection fails
*/
- protected void populateAnnotationsCache(Class<?> clazz, Map<String, String> injections)
+ protected void populateAnnotationsCache(Class<?> clazz, Map<String,String> injections)
throws IllegalAccessException, InvocationTargetException, NamingException {
List<AnnotationCacheEntry> annotations = null;
@@ -322,8 +323,8 @@ public class DefaultInstanceManager implements InstanceManager {
annotations.add(new AnnotationCacheEntry(method.getName(), method.getParameterTypes(),
((WebServiceRef) webServiceRefAnnotation).name(),
AnnotationCacheEntryType.SETTER));
- } else if (JPA_PRESENT && (persistenceContextAnnotation = method
- .getAnnotation(PersistenceContext.class)) != null) {
+ } else if (JPA_PRESENT && (persistenceContextAnnotation =
+ method.getAnnotation(PersistenceContext.class)) != null) {
annotations.add(new AnnotationCacheEntry(method.getName(), method.getParameterTypes(),
((PersistenceContext) persistenceContextAnnotation).name(),
AnnotationCacheEntryType.SETTER));
@@ -383,8 +384,8 @@ public class DefaultInstanceManager implements InstanceManager {
annotations.add(new AnnotationCacheEntry(fieldName, null,
((WebServiceRef) webServiceRefAnnotation).name(),
AnnotationCacheEntryType.FIELD));
- } else if (JPA_PRESENT && (persistenceContextAnnotation = field
- .getAnnotation(PersistenceContext.class)) != null) {
+ } else if (JPA_PRESENT && (persistenceContextAnnotation =
+ field.getAnnotation(PersistenceContext.class)) != null) {
annotations.add(new AnnotationCacheEntry(fieldName, null,
((PersistenceContext) persistenceContextAnnotation).name(),
AnnotationCacheEntryType.FIELD));
@@ -423,7 +424,7 @@ public class DefaultInstanceManager implements InstanceManager {
* @throws javax.naming.NamingException if value cannot be looked up in jndi
* @throws java.lang.reflect.InvocationTargetException if injection fails
*/
- protected void processAnnotations(Object instance, Map<String, String> injections)
+ protected void processAnnotations(Object instance, Map<String,String> injections)
throws IllegalAccessException, InvocationTargetException, NamingException {
if (context == null) {
@@ -578,7 +579,7 @@ public class DefaultInstanceManager implements InstanceManager {
if (properties.isEmpty()) {
return;
}
- for (Map.Entry<Object, Object> e : properties.entrySet()) {
+ for (Map.Entry<Object,Object> e : properties.entrySet()) {
if ("restricted".equals(e.getValue())) {
classNames.add(e.getKey().toString());
} else {
@@ -680,6 +681,9 @@ public class DefaultInstanceManager implements InstanceManager {
private enum AnnotationCacheEntryType {
- FIELD, SETTER, POST_CONSTRUCT, PRE_DESTROY
+ FIELD,
+ SETTER,
+ POST_CONSTRUCT,
+ PRE_DESTROY
}
}
diff --git a/java/org/apache/catalina/core/FrameworkListener.java b/java/org/apache/catalina/core/FrameworkListener.java
index 3796390190..e454d0886a 100644
--- a/java/org/apache/catalina/core/FrameworkListener.java
+++ b/java/org/apache/catalina/core/FrameworkListener.java
@@ -36,7 +36,7 @@ import org.apache.catalina.Service;
*/
public abstract class FrameworkListener implements LifecycleListener, ContainerListener {
- protected final ConcurrentHashMap<Context, LifecycleListener> contextListeners = new ConcurrentHashMap<>();
+ protected final ConcurrentHashMap<Context,LifecycleListener> contextListeners = new ConcurrentHashMap<>();
/**
* Create a lifecycle listener which will then be added to the specified context.
diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index babf34ad90..ac1c8573eb 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -186,9 +186,8 @@ public class JreMemoryLeakPreventionListener implements LifecycleListener {
}
/*
- * Initialize the SeedGenerator of the JVM, as some platforms use
- * a thread which could end up being associated with a webapp rather
- * than the container.
+ * Initialize the SeedGenerator of the JVM, as some platforms use a thread which could end up being
+ * associated with a webapp rather than the container.
*/
if (initSeedGenerator) {
SecureRandom.getSeed(1);
diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 30d00997a0..d995abde84 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -136,7 +136,7 @@ public class NamingContextListener implements LifecycleListener, PropertyChangeL
/**
* Objectnames Map.
*/
- protected HashMap<String, ObjectName> objectNames = new HashMap<>();
+ protected HashMap<String,ObjectName> objectNames = new HashMap<>();
/**
@@ -222,7 +222,7 @@ public class NamingContextListener implements LifecycleListener, PropertyChangeL
}
try {
- Hashtable<String, Object> contextEnv = new Hashtable<>();
+ Hashtable<String,Object> contextEnv = new Hashtable<>();
namingContext = new NamingContext(contextEnv, getName());
ContextAccessController.setSecurityToken(getName(), token);
ContextAccessController.setSecurityToken(container, token);
@@ -848,8 +848,8 @@ public class NamingContextListener implements LifecycleListener, PropertyChangeL
}
if (jaxrpcURL == null) {
try {
- jaxrpcURL = ((Context) container).getServletContext()
- .getResource(service.getJaxrpcmappingfile());
+ jaxrpcURL =
+ ((Context) container).getServletContext().getResource(service.getJaxrpcmappingfile());
} catch (MalformedURLException e) {
// Ignore and carry on
}
@@ -1021,8 +1021,8 @@ public class NamingContextListener implements LifecycleListener, PropertyChangeL
public void addResourceLink(ContextResourceLink resourceLink) {
// Create a reference to the resource.
- Reference ref = new ResourceLinkRef(resourceLink.getType(), resourceLink.getGlobal(), resourceLink.getFactory(),
- null);
+ Reference ref =
+ new ResourceLinkRef(resourceLink.getType(), resourceLink.getGlobal(), resourceLink.getFactory(), null);
Iterator<String> i = resourceLink.listProperties();
while (i.hasNext()) {
String key = i.next();
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 5d1cc905ad..6476bf08c5 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -227,7 +227,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
/**
* The ordered set of ServletContainerInitializers for this web application.
*/
- private Map<ServletContainerInitializer, Set<Class<?>>> initializers = new LinkedHashMap<>();
+ private Map<ServletContainerInitializer,Set<Class<?>>> initializers = new LinkedHashMap<>();
/**
@@ -357,13 +357,13 @@ public class StandardContext extends ContainerBase implements Context, Notificat
/**
* The set of filter configurations (and associated filter instances) we have initialized, keyed by filter name.
*/
- private Map<String, ApplicationFilterConfig> filterConfigs = new HashMap<>();
+ private Map<String,ApplicationFilterConfig> filterConfigs = new HashMap<>();
/**
* The set of filter definitions for this application, keyed by filter name.
*/
- private Map<String, FilterDef> filterDefs = new HashMap<>();
+ private Map<String,FilterDef> filterDefs = new HashMap<>();
/**
@@ -419,19 +419,19 @@ public class StandardContext extends ContainerBase implements Context, Notificat
/**
* The message destinations for this web application.
*/
- private HashMap<String, MessageDestination> messageDestinations = new HashMap<>();
+ private HashMap<String,MessageDestination> messageDestinations = new HashMap<>();
/**
* The MIME mappings for this web application, keyed by extension.
*/
- private Map<String, String> mimeMappings = new HashMap<>();
+ private Map<String,String> mimeMappings = new HashMap<>();
/**
* The context initialization parameters for this web application, keyed by name.
*/
- private final Map<String, String> parameters = new ConcurrentHashMap<>();
+ private final Map<String,String> parameters = new ConcurrentHashMap<>();
/**
@@ -494,7 +494,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
/**
* The security role mappings for this application, keyed by role name (as used within the application).
*/
- private Map<String, String> roleMappings = new HashMap<>();
+ private Map<String,String> roleMappings = new HashMap<>();
/**
@@ -508,7 +508,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
/**
* The servlet mappings for this web application, keyed by matching pattern.
*/
- private Map<String, String> servletMappings = new HashMap<>();
+ private Map<String,String> servletMappings = new HashMap<>();
private final Object servletMappingsLock = new Object();
@@ -746,8 +746,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
private boolean jndiExceptionOnFailedWrite = true;
- private Map<String, String> postConstructMethods = new HashMap<>();
- private Map<String, String> preDestroyMethods = new HashMap<>();
+ private Map<String,String> postConstructMethods = new HashMap<>();
+ private Map<String,String> preDestroyMethods = new HashMap<>();
private String containerSciFilter;
@@ -4267,7 +4267,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
boolean ok = true;
synchronized (filterConfigs) {
filterConfigs.clear();
- for (Entry<String, FilterDef> entry : filterDefs.entrySet()) {
+ for (Entry<String,FilterDef> entry : filterDefs.entrySet()) {
String name = entry.getKey();
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Starting filter '" + name + "'");
@@ -4301,7 +4301,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Release all Filter and FilterConfig instances
synchronized (filterConfigs) {
- for (Entry<String, ApplicationFilterConfig> entry : filterConfigs.entrySet()) {
+ for (Entry<String,ApplicationFilterConfig> entry : filterConfigs.entrySet()) {
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Stopping filter '" + entry.getKey() + "'");
}
@@ -4586,7 +4586,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
public boolean loadOnStartup(Container children[]) {
// Collect "load on startup" servlets that need to be initialized
- TreeMap<Integer, ArrayList<Wrapper>> map = new TreeMap<>();
+ TreeMap<Integer,ArrayList<Wrapper>> map = new TreeMap<>();
for (Container child : children) {
Wrapper wrapper = (Wrapper) child;
int loadOnStartup = wrapper.getLoadOnStartup();
@@ -4637,8 +4637,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Send j2ee.state.starting notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.state.starting", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.starting", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -4845,7 +4845,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
mergeParameters();
// Call ServletContainerInitializers
- for (Map.Entry<ServletContainerInitializer, Set<Class<?>>> entry : initializers.entrySet()) {
+ for (Map.Entry<ServletContainerInitializer,Set<Class<?>>> entry : initializers.entrySet()) {
try {
entry.getKey().onStartup(entry.getValue(), getServletContext());
} catch (ServletException e) {
@@ -4917,8 +4917,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Send j2ee.state.running notification
if (ok && (this.getObjectName() != null)) {
- Notification notification = new Notification("j2ee.state.running", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.running", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -4933,8 +4933,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
setState(LifecycleState.FAILED);
// Send j2ee.object.failed notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.object.failed", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.failed", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
} else {
@@ -4944,8 +4944,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
private void checkConstraintsForUncoveredMethods(SecurityConstraint[] constraints) {
- SecurityConstraint[] newConstraints = SecurityConstraint.findUncoveredHttpMethods(constraints,
- getDenyUncoveredHttpMethods(), getLogger());
+ SecurityConstraint[] newConstraints =
+ SecurityConstraint.findUncoveredHttpMethods(constraints, getDenyUncoveredHttpMethods(), getLogger());
for (SecurityConstraint constraint : newConstraints) {
addConstraint(constraint);
}
@@ -4958,13 +4958,13 @@ public class StandardContext extends ContainerBase implements Context, Notificat
if (isUseNaming() && getNamingContextListener() != null) {
context = getNamingContextListener().getEnvContext();
}
- Map<String, Map<String, String>> injectionMap = buildInjectionMap(
- getIgnoreAnnotations() ? new NamingResourcesImpl() : getNamingResources());
+ Map<String,Map<String,String>> injectionMap =
+ buildInjectionMap(getIgnoreAnnotations() ? new NamingResourcesImpl() : getNamingResources());
return new DefaultInstanceManager(context, injectionMap, this, this.getClass().getClassLoader());
}
- private Map<String, Map<String, String>> buildInjectionMap(NamingResourcesImpl namingResources) {
- Map<String, Map<String, String>> injectionMap = new HashMap<>();
+ private Map<String,Map<String,String>> buildInjectionMap(NamingResourcesImpl namingResources) {
+ Map<String,Map<String,String>> injectionMap = new HashMap<>();
for (Injectable resource : namingResources.findLocalEjbs()) {
addInjectionTarget(resource, injectionMap);
}
@@ -4989,7 +4989,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
return injectionMap;
}
- private void addInjectionTarget(Injectable resource, Map<String, Map<String, String>> injectionMap) {
+ private void addInjectionTarget(Injectable resource, Map<String,Map<String,String>> injectionMap) {
List<InjectionTarget> injectionTargets = resource.getInjectionTargets();
if (injectionTargets != null && injectionTargets.size() > 0) {
String jndiName = resource.getName();
@@ -5008,7 +5008,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
* the application parameters appropriately.
*/
private void mergeParameters() {
- Map<String, String> mergedParams = new HashMap<>();
+ Map<String,String> mergedParams = new HashMap<>();
String names[] = findParameters();
for (String s : names) {
@@ -5025,7 +5025,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
}
ServletContext sc = getServletContext();
- for (Map.Entry<String, String> entry : mergedParams.entrySet()) {
+ for (Map.Entry<String,String> entry : mergedParams.entrySet()) {
sc.setInitParameter(entry.getKey(), entry.getValue());
}
@@ -5044,8 +5044,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Send j2ee.state.stopping notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.state.stopping", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.stopping", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5145,8 +5145,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Send j2ee.state.stopped notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.state.stopped", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.stopped", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5182,8 +5182,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// have been set so the notification can't be created
if (getObjectName() != null) {
// Send j2ee.object.deleted notification
- Notification notification = new Notification("j2ee.object.deleted", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.deleted", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5385,8 +5385,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// If the pattern did not conflict, add the new constraint(s).
if (!foundConflict) {
- SecurityConstraint[] newSecurityConstraints = SecurityConstraint
- .createConstraints(servletSecurityElement, urlPattern);
+ SecurityConstraint[] newSecurityConstraints =
+ SecurityConstraint.createConstraints(servletSecurityElement, urlPattern);
for (SecurityConstraint securityConstraint : newSecurityConstraints) {
addConstraint(securityConstraint);
}
@@ -5680,13 +5680,13 @@ public class StandardContext extends ContainerBase implements Context, Notificat
@Override
- public Map<String, String> findPostConstructMethods() {
+ public Map<String,String> findPostConstructMethods() {
return postConstructMethods;
}
@Override
- public Map<String, String> findPreDestroyMethods() {
+ public Map<String,String> findPreDestroyMethods() {
return preDestroyMethods;
}
@@ -5872,8 +5872,8 @@ public class StandardContext extends ContainerBase implements Context, Notificat
// Send j2ee.object.created notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.object.created", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.created", this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
}
@@ -6189,7 +6189,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
}
@Override
- public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+ public Map<String,? extends ServletRegistration> getServletRegistrations() {
throw new UnsupportedOperationException(sm.getString("noPluggabilityServletContext.notAllowed"));
}
@@ -6220,7 +6220,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
}
@Override
- public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
throw new UnsupportedOperationException(sm.getString("noPluggabilityServletContext.notAllowed"));
}
diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index f2297fa2e0..14e6dbc64a 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -170,7 +170,7 @@ public class StandardHost extends ContainerBase implements Host {
/**
* Track the class loaders for the child web applications so memory leaks can be detected.
*/
- private final Map<ClassLoader, String> childClassLoaders = new WeakHashMap<>();
+ private final Map<ClassLoader,String> childClassLoaders = new WeakHashMap<>();
/**
@@ -745,7 +745,7 @@ public class StandardHost extends ContainerBase implements Host {
List<String> result = new ArrayList<>();
- for (Map.Entry<ClassLoader, String> entry : childClassLoaders.entrySet()) {
+ for (Map.Entry<ClassLoader,String> entry : childClassLoaders.entrySet()) {
ClassLoader cl = entry.getKey();
if (cl instanceof WebappClassLoaderBase) {
if (!((WebappClassLoaderBase) cl).getState().isAvailable()) {
@@ -833,8 +833,8 @@ public class StandardHost extends ContainerBase implements Host {
}
}
if (!found) {
- Valve valve = ErrorReportValve.class.getName().equals(errorValve) ? new ErrorReportValve()
- : (Valve) Class.forName(errorValve).getConstructor().newInstance();
+ Valve valve = ErrorReportValve.class.getName().equals(errorValve) ? new ErrorReportValve() :
+ (Valve) Class.forName(errorValve).getConstructor().newInstance();
getPipeline().addValve(valve);
}
} catch (Throwable t) {
diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index a4383f2503..7d2cbced6b 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -446,8 +446,7 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
utilityExecutor = scheduledThreadPoolExecutor;
- utilityExecutorWrapper = new org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
- utilityExecutor);
+ utilityExecutorWrapper = new org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(utilityExecutor);
}
}
@@ -933,9 +932,9 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
log.error(sm.getString("standardServer.periodicEventError"), e);
}
}
- periodicLifecycleEventFuture = getUtilityExecutor().scheduleAtFixedRate(
- () -> fireLifecycleEvent(Lifecycle.PERIODIC_EVENT, null), periodicEventDelay, periodicEventDelay,
- TimeUnit.SECONDS);
+ periodicLifecycleEventFuture =
+ getUtilityExecutor().scheduleAtFixedRate(() -> fireLifecycleEvent(Lifecycle.PERIODIC_EVENT, null),
+ periodicEventDelay, periodicEventDelay, TimeUnit.SECONDS);
}
}
diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index a3006fb496..1bef8ecb81 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -142,14 +142,14 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra
/**
* The initialization parameters for this servlet, keyed by parameter name.
*/
- protected HashMap<String, String> parameters = new HashMap<>();
+ protected HashMap<String,String> parameters = new HashMap<>();
/**
* The security role references for this servlet, keyed by role name used in the servlet. The corresponding value is
* the role name of the web application itself.
*/
- protected HashMap<String, String> references = new HashMap<>();
+ protected HashMap<String,String> references = new HashMap<>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org