[tomcat] 01/02: Code cleanup (format) - no functional change
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 0f22c1d60264735cba9500f7a1ccfc1d724694d2
Author: Mark Thomas
AuthorDate: Wed Feb 15 15:00:12 2023 +
Code cleanup (format) - no functional change
---
test/org/apache/catalina/valves/Benchmarks.java| 78 ++---
.../apache/catalina/valves/TestAccessLogValve.java | 11 +-
.../valves/TestCrawlerSessionManagerValve.java | 13 +-
.../catalina/valves/TestErrorReportValve.java | 31 +-
.../valves/TestLoadBalancerDrainingValve.java | 79 +++--
.../apache/catalina/valves/TestRemoteIpValve.java | 99 +++---
.../catalina/valves/TestRequestFilterValve.java| 340 ++---
.../valves/TestStuckThreadDetectionValve.java | 21 +-
.../catalina/valves/TesterAccessLogValve.java | 9 +-
9 files changed, 326 insertions(+), 355 deletions(-)
diff --git a/test/org/apache/catalina/valves/Benchmarks.java
b/test/org/apache/catalina/valves/Benchmarks.java
index 973df0b946..431c73bc0c 100644
--- a/test/org/apache/catalina/valves/Benchmarks.java
+++ b/test/org/apache/catalina/valves/Benchmarks.java
@@ -22,20 +22,17 @@ import java.util.Date;
import org.junit.Test;
/**
- * Some simple micro-benchmarks to help determine best approach for thread
- * safety in valves, particularly the {@link AccessLogValve}. Implemented as
- * JUnit tests to make the simple to execute but does not used Test* as the
- * class name to avoid being included in the automated unit tests.
+ * Some simple micro-benchmarks to help determine best approach for thread
safety in valves, particularly the
+ * {@link AccessLogValve}. Implemented as JUnit tests to make the simple to
execute but does not used Test* as the class
+ * name to avoid being included in the automated unit tests.
*/
public class Benchmarks {
@Test
public void testAccessLogGetDate() throws Exception {
// Is it better to use a sync or a thread local here?
BenchmarkTest benchmark = new BenchmarkTest();
-Runnable[] tests = new Runnable[] { new GetDateBenchmarkTest_Sync(),
-new GetDateBenchmarkTest_Local(),
-new GetDateBenchmarkTest_LocalMutableLong(),
-new GetDateBenchmarkTest_LocalStruct() };
+Runnable[] tests = new Runnable[] { new GetDateBenchmarkTest_Sync(),
new GetDateBenchmarkTest_Local(),
+new GetDateBenchmarkTest_LocalMutableLong(), new
GetDateBenchmarkTest_LocalStruct() };
benchmark.doTest(5, tests);
}
@@ -99,8 +96,7 @@ public class Benchmarks {
}
}
-private static class GetDateBenchmarkTest_LocalMutableLong implements
-Runnable {
+private static class GetDateBenchmarkTest_LocalMutableLong implements
Runnable {
@Override
public String toString() {
@@ -175,17 +171,15 @@ public class Benchmarks {
public void testAccessLogTimeDateElement() throws Exception {
// Is it better to use a sync or a thread local here?
BenchmarkTest benchmark = new BenchmarkTest();
-Runnable[] tests = new Runnable[] {
-new TimeDateElementBenchmarkTest_Sync(),
-new TimeDateElementBenchmarkTest_Local(),
-new TimeDateElementBenchmarkTest_LocalStruct(),
+Runnable[] tests = new Runnable[] { new
TimeDateElementBenchmarkTest_Sync(),
+new TimeDateElementBenchmarkTest_Local(), new
TimeDateElementBenchmarkTest_LocalStruct(),
new TimeDateElementBenchmarkTest_LocalStruct_SBuilder() };
benchmark.doTest(5, tests);
}
private abstract static class TimeDateElementBenchmarkTestBase {
-protected static final String months[] = { "Jan", "Feb", "Mar", "Apr",
-"May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+protected static final String months[] = { "Jan", "Feb", "Mar", "Apr",
"May", "Jun", "Jul", "Aug", "Sep", "Oct",
+"Nov", "Dec" };
protected String lookup(String month) {
int index;
@@ -198,8 +192,8 @@ public class Benchmarks {
}
}
-private static class TimeDateElementBenchmarkTest_Sync extends
-TimeDateElementBenchmarkTestBase implements Runnable {
+private static class TimeDateElementBenchmarkTest_Sync extends
TimeDateElementBenchmarkTestBase
+implements Runnable {
@Override
public String toString() {
@@ -211,8 +205,7 @@ public class Benchmarks {
private SimpleDateFormat dayFormatter = new SimpleDateFormat("dd");
private SimpleDateFormat monthFormatter = new SimpleDateFormat("MM");
private SimpleDateFormat yearFormatter = new SimpleDateFormat("");
-private SimpleDateFormat timeFormatter = new SimpleDateFormat(
-"hh:mm:ss");
+private SimpleDateFormat timeFormatter =
[tomcat] 01/02: Code cleanup (format). No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 90b564ce38fa5d6a8894b63245330f38ae0551f4
Author: Mark Thomas
AuthorDate: Tue Jan 24 12:24:04 2023 +
Code cleanup (format). No functional change.
---
.../webresources/AbstractArchiveResource.java | 22 ++--
.../webresources/AbstractArchiveResourceSet.java | 73 +--
.../webresources/AbstractFileResourceSet.java | 21 ++--
.../catalina/webresources/AbstractResource.java| 3 +-
.../catalina/webresources/AbstractResourceSet.java | 8 +-
.../AbstractSingleArchiveResource.java | 4 +-
.../AbstractSingleArchiveResourceSet.java | 14 +--
java/org/apache/catalina/webresources/Cache.java | 42 +++
.../catalina/webresources/CachedResource.java | 63 --
.../webresources/ClasspathURLStreamHandler.java| 3 +-
.../catalina/webresources/DirResourceSet.java | 45 +++
.../catalina/webresources/EmptyResourceSet.java| 10 +-
.../catalina/webresources/ExtractingRoot.java | 15 +--
.../apache/catalina/webresources/FileResource.java | 32 ++---
.../catalina/webresources/FileResourceSet.java | 38 +++---
.../apache/catalina/webresources/JarContents.java | 37 +++---
.../apache/catalina/webresources/JarResource.java | 7 +-
.../catalina/webresources/JarResourceRoot.java | 7 +-
.../catalina/webresources/JarResourceSet.java | 33 ++---
.../catalina/webresources/JarWarResource.java | 16 +--
.../catalina/webresources/JarWarResourceSet.java | 69 ---
.../apache/catalina/webresources/StandardRoot.java | 136 -
.../webresources/TomcatJarInputStream.java | 5 +-
.../TomcatURLStreamHandlerFactory.java | 44 +++
.../catalina/webresources/VirtualResource.java | 3 +-
.../apache/catalina/webresources/WarResource.java | 10 +-
.../catalina/webresources/WarResourceSet.java | 25 ++--
27 files changed, 306 insertions(+), 479 deletions(-)
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
index 8e4daffddc..982d676f12 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -40,8 +40,8 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
private boolean readCerts = false;
private Certificate[] certificates;
-protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
-String webAppPath, String baseUrl, JarEntry jarEntry, String
codeBaseUrl) {
+protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath, String baseUrl,
+JarEntry jarEntry, String codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
this.archiveResourceSet = archiveResourceSet;
this.baseUrl = baseUrl;
@@ -53,8 +53,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
resourceName = resourceName.substring(0, resourceName.length() -
1);
}
String internalPath = archiveResourceSet.getInternalPath();
-if (internalPath.length() > 0 && resourceName.equals(
-internalPath.subSequence(1, internalPath.length( {
+if (internalPath.length() > 0 &&
resourceName.equals(internalPath.subSequence(1, internalPath.length( {
name = "";
} else {
int index = resourceName.lastIndexOf('/');
@@ -171,9 +170,8 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
if (len > Integer.MAX_VALUE) {
// Can't create an array that big
-throw new ArrayIndexOutOfBoundsException(sm.getString(
-"abstractResource.getContentTooLarge", getWebappPath(),
-Long.valueOf(len)));
+throw new ArrayIndexOutOfBoundsException(
+sm.getString("abstractResource.getContentTooLarge",
getWebappPath(), Long.valueOf(len)));
}
if (len < 0) {
@@ -202,8 +200,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
readCerts = true;
} catch (IOException ioe) {
if (getLog().isDebugEnabled()) {
-getLog().debug(sm.getString("abstractResource.getContentFail",
-getWebappPath()), ioe);
+getLog().debug(sm.getString("abstractResource.getContentFail",
getWebappPath()), ioe);
}
// Don't return corrupted content
return null;
@@ -238,10 +235,9 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
protected abstract JarInputStreamWrapper
[tomcat] 01/02: Code cleanup (format). No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a91a02d4575daff43bbf1b89db09a8ecad3484a3
Author: Mark Thomas
AuthorDate: Tue Jan 24 12:22:51 2023 +
Code cleanup (format). No functional change.
---
.../webresources/AbstractArchiveResource.java | 22 ++--
.../webresources/AbstractArchiveResourceSet.java | 73 +--
.../webresources/AbstractFileResourceSet.java | 21 ++--
.../catalina/webresources/AbstractResource.java| 3 +-
.../catalina/webresources/AbstractResourceSet.java | 8 +-
.../AbstractSingleArchiveResource.java | 4 +-
.../AbstractSingleArchiveResourceSet.java | 11 +-
java/org/apache/catalina/webresources/Cache.java | 42 +++
.../catalina/webresources/CachedResource.java | 63 --
.../webresources/ClasspathURLStreamHandler.java| 3 +-
.../catalina/webresources/DirResourceSet.java | 45 +++
.../catalina/webresources/EmptyResourceSet.java| 10 +-
.../catalina/webresources/ExtractingRoot.java | 15 +--
.../apache/catalina/webresources/FileResource.java | 32 ++---
.../catalina/webresources/FileResourceSet.java | 38 +++---
.../apache/catalina/webresources/JarContents.java | 37 +++---
.../apache/catalina/webresources/JarResource.java | 7 +-
.../catalina/webresources/JarResourceRoot.java | 7 +-
.../catalina/webresources/JarResourceSet.java | 33 ++---
.../catalina/webresources/JarWarResource.java | 16 +--
.../catalina/webresources/JarWarResourceSet.java | 69 ---
.../apache/catalina/webresources/StandardRoot.java | 136 -
.../webresources/TomcatJarInputStream.java | 5 +-
.../TomcatURLStreamHandlerFactory.java | 48 +++-
.../catalina/webresources/VirtualResource.java | 3 +-
.../apache/catalina/webresources/WarResource.java | 10 +-
.../catalina/webresources/WarResourceSet.java | 25 ++--
27 files changed, 307 insertions(+), 479 deletions(-)
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
index 8e4daffddc..982d676f12 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -40,8 +40,8 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
private boolean readCerts = false;
private Certificate[] certificates;
-protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
-String webAppPath, String baseUrl, JarEntry jarEntry, String
codeBaseUrl) {
+protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath, String baseUrl,
+JarEntry jarEntry, String codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
this.archiveResourceSet = archiveResourceSet;
this.baseUrl = baseUrl;
@@ -53,8 +53,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
resourceName = resourceName.substring(0, resourceName.length() -
1);
}
String internalPath = archiveResourceSet.getInternalPath();
-if (internalPath.length() > 0 && resourceName.equals(
-internalPath.subSequence(1, internalPath.length( {
+if (internalPath.length() > 0 &&
resourceName.equals(internalPath.subSequence(1, internalPath.length( {
name = "";
} else {
int index = resourceName.lastIndexOf('/');
@@ -171,9 +170,8 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
if (len > Integer.MAX_VALUE) {
// Can't create an array that big
-throw new ArrayIndexOutOfBoundsException(sm.getString(
-"abstractResource.getContentTooLarge", getWebappPath(),
-Long.valueOf(len)));
+throw new ArrayIndexOutOfBoundsException(
+sm.getString("abstractResource.getContentTooLarge",
getWebappPath(), Long.valueOf(len)));
}
if (len < 0) {
@@ -202,8 +200,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
readCerts = true;
} catch (IOException ioe) {
if (getLog().isDebugEnabled()) {
-getLog().debug(sm.getString("abstractResource.getContentFail",
-getWebappPath()), ioe);
+getLog().debug(sm.getString("abstractResource.getContentFail",
getWebappPath()), ioe);
}
// Don't return corrupted content
return null;
@@ -238,10 +235,9 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
protected abstract JarInputStreamWrapper
[tomcat] 01/02: Code cleanup (format). No functional change.
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 8b8fada54056aee4c63fd27339fea47a2062b883
Author: Mark Thomas
AuthorDate: Tue Jan 24 12:20:36 2023 +
Code cleanup (format). No functional change.
---
.../webresources/AbstractArchiveResource.java | 26 ++--
.../webresources/AbstractArchiveResourceSet.java | 73 +--
.../webresources/AbstractFileResourceSet.java | 21 ++--
.../catalina/webresources/AbstractResource.java| 3 +-
.../catalina/webresources/AbstractResourceSet.java | 8 +-
.../AbstractSingleArchiveResource.java | 4 +-
.../AbstractSingleArchiveResourceSet.java | 11 +-
java/org/apache/catalina/webresources/Cache.java | 42 +++
.../catalina/webresources/CachedResource.java | 63 --
.../webresources/ClasspathURLStreamHandler.java| 3 +-
.../catalina/webresources/DirResourceSet.java | 45 +++
.../catalina/webresources/EmptyResourceSet.java| 10 +-
.../catalina/webresources/ExtractingRoot.java | 15 +--
.../apache/catalina/webresources/FileResource.java | 32 ++---
.../catalina/webresources/FileResourceSet.java | 38 +++---
.../apache/catalina/webresources/JarContents.java | 37 +++---
.../apache/catalina/webresources/JarResource.java | 7 +-
.../catalina/webresources/JarResourceRoot.java | 6 +-
.../catalina/webresources/JarResourceSet.java | 33 ++---
.../catalina/webresources/JarWarResource.java | 16 +--
.../catalina/webresources/JarWarResourceSet.java | 69 ---
.../apache/catalina/webresources/StandardRoot.java | 136 -
.../webresources/TomcatJarInputStream.java | 5 +-
.../catalina/webresources/VirtualResource.java | 3 +-
.../apache/catalina/webresources/WarResource.java | 10 +-
.../catalina/webresources/WarResourceSet.java | 25 ++--
26 files changed, 290 insertions(+), 451 deletions(-)
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
index 03009670f8..aafc40f790 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -41,13 +41,13 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
@Deprecated
-protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath,
-String baseUrl, JarEntry jarEntry, @SuppressWarnings("unused")
String codeBaseUrl) {
+protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath, String baseUrl,
+JarEntry jarEntry, @SuppressWarnings("unused") String codeBaseUrl)
{
this(archiveResourceSet, webAppPath, baseUrl, jarEntry);
}
-protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath,
-String baseUrl, JarEntry jarEntry) {
+protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet, String webAppPath, String baseUrl,
+JarEntry jarEntry) {
super(archiveResourceSet.getRoot(), webAppPath);
this.archiveResourceSet = archiveResourceSet;
this.baseUrl = baseUrl;
@@ -58,8 +58,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
resourceName = resourceName.substring(0, resourceName.length() -
1);
}
String internalPath = archiveResourceSet.getInternalPath();
-if (internalPath.length() > 0 && resourceName.equals(
-internalPath.subSequence(1, internalPath.length( {
+if (internalPath.length() > 0 &&
resourceName.equals(internalPath.subSequence(1, internalPath.length( {
name = "";
} else {
int index = resourceName.lastIndexOf('/');
@@ -164,9 +163,8 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
if (len > Integer.MAX_VALUE) {
// Can't create an array that big
-throw new ArrayIndexOutOfBoundsException(sm.getString(
-"abstractResource.getContentTooLarge", getWebappPath(),
-Long.valueOf(len)));
+throw new ArrayIndexOutOfBoundsException(
+sm.getString("abstractResource.getContentTooLarge",
getWebappPath(), Long.valueOf(len)));
}
if (len < 0) {
@@ -195,8 +193,7 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
readCerts = true;
} catch (IOException ioe) {
if (getLog().isDebugEnabled()) {
-getLog().debug(sm.getString("abstractResource.getContentFail",
-getWebappPath()), ioe);
+
