[tomcat] 01/02: Code clean-up. Formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 55c8468456ff228dab91cb021365826acdc57373
Author: Mark Thomas
AuthorDate: Tue May 23 11:23:54 2023 +0100
Code clean-up. Formatting. No functional change.
---
.../catalina/authenticator/AuthenticatorBase.java | 12 +--
.../apache/catalina/authenticator/Constants.java | 4 +-
.../authenticator/DigestAuthenticator.java | 36 +++
.../catalina/authenticator/SavedRequest.java | 2 +-
.../catalina/authenticator/SingleSignOn.java | 2 +-
.../catalina/authenticator/SingleSignOnEntry.java | 6 +-
.../authenticator/SpnegoAuthenticator.java | 2 +-
.../jaspic/AuthConfigFactoryImpl.java | 104 +
.../authenticator/jaspic/CallbackHandlerImpl.java | 11 +--
.../authenticator/jaspic/MessageInfoImpl.java | 10 +-
.../jaspic/PersistentProviderRegistrations.java| 30 +++---
.../jaspic/SimpleAuthConfigProvider.java | 18 ++--
.../jaspic/SimpleServerAuthConfig.java | 19 ++--
.../jaspic/SimpleServerAuthContext.java| 14 ++-
14 files changed, 122 insertions(+), 148 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e25174750f..af045ae94d 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -613,8 +613,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
String originHeader =
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
if (originHeader != null && !originHeader.isEmpty() &&
RequestUtil.isValidOrigin(originHeader) &&
!RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
// This appears to be a CORS Preflight request
if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -700,8 +700,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
try {
CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig =
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet",
jaspicAppContextID, callbackHandler);
String authContextID =
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
jaspicState.serverAuthContext =
serverAuthConfig.getAuthContext(authContextID, null, null);
} catch (AuthException e) {
@@ -1172,8 +1172,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (client != null) {
ServerAuthContext serverAuthContext;
try {
-ServerAuthConfig serverAuthConfig =
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet",
jaspicAppContextID, getCallbackHandler());
String authContextID =
serverAuthConfig.getAuthContextID(messageInfo);
serverAuthContext =
serverAuthConfig.getAuthContext(authContextID, null, null);
serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index 623bf3cecb..0fa2af7cc1 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -41,8 +41,8 @@ public class Constants {
public static final String USE_SUBJECT_CREDS_ONLY_PROPERTY =
"javax.security.auth.useSubjectCredsOnly";
// Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE = System
-
.getProperty("org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
"JSESSIONIDSSO");
+public static final String SINGLE_SIGN_ON_COOKIE =
+
System.getProperty("org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
"JSES
(tomcat) 01/02: Code clean-up. Formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5d509be3ede12e9616b5b8549613dc50c2e3b16b
Author: Mark Thomas
AuthorDate: Mon Jan 15 13:23:30 2024 +
Code clean-up. Formatting. No functional change.
---
.../catalina/ssi/ByteArrayServletOutputStream.java | 4 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 74
.../apache/catalina/ssi/ExpressionTokenizer.java | 39 ++--
.../catalina/ssi/ResponseIncludeWrapper.java | 49 +++--
java/org/apache/catalina/ssi/SSICommand.java | 29 ++-
java/org/apache/catalina/ssi/SSIConditional.java | 25 ++-
.../apache/catalina/ssi/SSIConditionalState.java | 11 +-
java/org/apache/catalina/ssi/SSIConfig.java| 14 +-
java/org/apache/catalina/ssi/SSIEcho.java | 15 +-
java/org/apache/catalina/ssi/SSIExec.java | 18 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 26 ++-
java/org/apache/catalina/ssi/SSIFilter.java| 45 ++---
java/org/apache/catalina/ssi/SSIFlastmod.java | 20 +--
java/org/apache/catalina/ssi/SSIFsize.java | 25 ++-
java/org/apache/catalina/ssi/SSIInclude.java | 23 +--
java/org/apache/catalina/ssi/SSIMediator.java | 70 +++-
java/org/apache/catalina/ssi/SSIPrintenv.java | 8 +-
java/org/apache/catalina/ssi/SSIProcessor.java | 113 +---
java/org/apache/catalina/ssi/SSIServlet.java | 86 -
.../catalina/ssi/SSIServletExternalResolver.java | 197 -
.../apache/catalina/ssi/SSIServletRequestUtil.java | 18 +-
java/org/apache/catalina/ssi/SSISet.java | 12 +-
.../catalina/ssi/SSIStopProcessingException.java | 5 +-
23 files changed, 389 insertions(+), 537 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
index 25cb0ee826..2b364e18a1 100644
--- a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
+++ b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
@@ -23,10 +23,10 @@ import javax.servlet.WriteListener;
/**
- * Class that extends ServletOutputStream, used as a wrapper from within
- * SsiInclude
+ * Class that extends ServletOutputStream, used as a wrapper from within
SsiInclude
*
* @author Bip Thelin
+ *
* @see ServletOutputStream and ByteArrayOutputStream
*/
public class ByteArrayServletOutputStream extends ServletOutputStream {
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index 17774e4ee8..c79623814a 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -32,13 +32,13 @@ import org.apache.tomcat.util.ExceptionUtils;
*/
public class ExpressionParseTree {
/**
- * Contains the current set of completed nodes. This is a workspace for the
- * parser. Needs to be LinkedList since it can contain {@code null}s.
+ * Contains the current set of completed nodes. This is a workspace for
the parser. Needs to be LinkedList since it
+ * can contain {@code null}s.
*/
private final LinkedList nodeStack = new LinkedList<>();
/**
- * Contains operator nodes that don't yet have values. This is a workspace
- * for the parser. Needs to be LinkedList since it can contain {@code
null}s.
+ * Contains operator nodes that don't yet have values. This is a workspace
for the parser. Needs to be LinkedList
+ * since it can contain {@code null}s.
*/
private final LinkedList oppStack = new LinkedList<>();
/**
@@ -53,20 +53,20 @@ public class ExpressionParseTree {
/**
* Creates a new parse tree for the specified expression.
- * @param expr The expression string
+ *
+ * @param exprThe expression string
* @param ssiMediator Used to evaluated the expressions
+ *
* @throws ParseException a parsing error occurred
*/
-public ExpressionParseTree(String expr, SSIMediator ssiMediator)
-throws ParseException {
+public ExpressionParseTree(String expr, SSIMediator ssiMediator) throws
ParseException {
this.ssiMediator = ssiMediator;
parseExpression(expr);
}
/**
- * Evaluates the tree and returns true or false. The specified SSIMediator
- * is used to resolve variable references.
+ * Evaluates the tree and returns true or false. The specified SSIMediator
is used to resolve variable references.
*
* @return the evaluation result
*
@@ -83,8 +83,8 @@ public class ExpressionParseTree {
/**
- * Pushes a new operator onto the opp stack, resolving existing opps as
- * needed.
+ * Pushes a new operator onto the opp stack, resolving existing opps as
needed.
+ *
* @p
(tomcat) 01/02: Code clean-up - formatting. 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 c578fdafa64c4549bea7d26aa06ec70fa20dbd33
Author: Mark Thomas
AuthorDate: Fri May 17 19:27:47 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 56 ++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 445 insertions(+), 580 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
*/
public String ge
(tomcat) 01/02: Code clean-up - formatting. 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 9ff474b753b497001d00abcd81324e6d06b9600d
Author: Mark Thomas
AuthorDate: Fri May 17 19:35:16 2024 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 66 +++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 451 insertions(+), 584 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
*/
public Strin
(tomcat) 01/02: Code clean-up - formatting. 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 1459a5e75e138a75dd0d80bb904c3dad842cf177
Author: Mark Thomas
AuthorDate: Thu Jun 13 12:57:42 2024 +0100
Code clean-up - formatting. No functional change.
---
.../catalina/webresources/AbstractArchiveResourceSet.java | 13 ++---
.../webresources/AbstractSingleArchiveResourceSet.java | 2 +-
java/org/apache/catalina/webresources/Cache.java | 14 +++---
java/org/apache/catalina/webresources/CachedResource.java | 4 ++--
.../apache/catalina/webresources/JarWarResourceSet.java| 10 +-
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git
a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
index 5eb08c6562..cf7affb3c7 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
@@ -37,7 +37,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
private URL baseUrl;
private String baseUrlString;
private JarFile archive = null;
-protected Map archiveEntries = null;
+protected Map archiveEntries = null;
protected final Object archiveLock = new Object();
private long archiveUseCount = 0;
private JarContents jarContents;
@@ -163,7 +163,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
*
* @return The archives entries mapped to their names or null if {@link
#getArchiveEntry(String)} should be used.
*/
-protected abstract Map getArchiveEntries(boolean single);
+protected abstract Map getArchiveEntries(boolean single);
/**
@@ -205,10 +205,9 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
* If jarContents reports that this resource definitely does not
contain the path, we can end this method and
* move on to the next jar.
*/
-if (jarContents != null &&
-!jarContents.mightContainResource(getInternalPath().isEmpty()
? path : getInternalPath() + path,
- webAppMount)) {
-return new EmptyResource(root, path);
+if (jarContents != null && !jarContents
+.mightContainResource(getInternalPath().isEmpty() ? path :
getInternalPath() + path, webAppMount)) {
+return new EmptyResource(root, path);
}
/*
@@ -245,7 +244,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
// Calls JarFile.getJarEntry() which is multi-release aware
jarEntry = getArchiveEntry(pathInJar);
} else {
-Map jarEntries = getArchiveEntries(true);
+Map jarEntries = getArchiveEntries(true);
if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
if (jarEntries == null) {
jarEntry = getArchiveEntry(pathInJar + '/');
diff --git
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
index 363e32e0e1..07198a5ef6 100644
---
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
+++
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
@@ -62,7 +62,7 @@ public abstract class AbstractSingleArchiveResourceSet
extends AbstractArchiveRe
@Override
-protected Map getArchiveEntries(boolean single) {
+protected Map getArchiveEntries(boolean single) {
synchronized (archiveLock) {
if (archiveEntries == null && !single) {
JarFile jarFile = null;
diff --git a/java/org/apache/catalina/webresources/Cache.java
b/java/org/apache/catalina/webresources/Cache.java
index 467a43bf2e..03e933d37c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -52,7 +52,7 @@ public class Cache {
private LongAdder lookupCount = new LongAdder();
private LongAdder hitCount = new LongAdder();
-private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
+private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
public Cache(StandardRoot root) {
this.root = root;
@@ -83,8 +83,8 @@ public class Cache {
if (cacheEntry == null) {
// Local copy to ensure consistency
int objectMaxSizeBytes = getObjectMaxSizeBytes();
-CachedResource newCacheEntry = new CachedResource(this, root,
path, getTtl(), objectMaxSizeBytes,
-useClassLoaderResources);
+CachedResource newC
(tomcat) 01/02: Code clean-up - formatting. 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 c9f0d989c4e45332790d1909bb868d4b6e721ff0
Author: Mark Thomas
AuthorDate: Thu Jun 13 13:08:56 2024 +0100
Code clean-up - formatting. No functional change.
---
.../catalina/webresources/AbstractArchiveResourceSet.java | 13 ++---
.../webresources/AbstractSingleArchiveResourceSet.java | 2 +-
java/org/apache/catalina/webresources/Cache.java | 14 +++---
java/org/apache/catalina/webresources/CachedResource.java | 4 ++--
.../apache/catalina/webresources/JarWarResourceSet.java| 10 +-
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git
a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
index 4f3c092f42..52ec4e9dbf 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
@@ -37,7 +37,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
private URL baseUrl;
private String baseUrlString;
private JarFile archive = null;
-protected Map archiveEntries = null;
+protected Map archiveEntries = null;
protected final Object archiveLock = new Object();
private long archiveUseCount = 0;
private JarContents jarContents;
@@ -163,7 +163,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
*
* @return The archives entries mapped to their names or null if {@link
#getArchiveEntry(String)} should be used.
*/
-protected abstract Map getArchiveEntries(boolean single);
+protected abstract Map getArchiveEntries(boolean single);
/**
@@ -205,10 +205,9 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
* If jarContents reports that this resource definitely does not
contain the path, we can end this method and
* move on to the next jar.
*/
-if (jarContents != null &&
-!jarContents.mightContainResource(getInternalPath().isEmpty()
? path : getInternalPath() + path,
- webAppMount)) {
-return new EmptyResource(root, path);
+if (jarContents != null && !jarContents
+.mightContainResource(getInternalPath().isEmpty() ? path :
getInternalPath() + path, webAppMount)) {
+return new EmptyResource(root, path);
}
/*
@@ -245,7 +244,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
// Calls JarFile.getJarEntry() which is multi-release aware
jarEntry = getArchiveEntry(pathInJar);
} else {
-Map jarEntries = getArchiveEntries(true);
+Map jarEntries = getArchiveEntries(true);
if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
if (jarEntries == null) {
jarEntry = getArchiveEntry(pathInJar + '/');
diff --git
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
index 13efaa3c2e..fb731e38f2 100644
---
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
+++
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
@@ -62,7 +62,7 @@ public abstract class AbstractSingleArchiveResourceSet
extends AbstractArchiveRe
@Override
-protected Map getArchiveEntries(boolean single) {
+protected Map getArchiveEntries(boolean single) {
synchronized (archiveLock) {
if (archiveEntries == null && !single) {
JarFile jarFile = null;
diff --git a/java/org/apache/catalina/webresources/Cache.java
b/java/org/apache/catalina/webresources/Cache.java
index 467a43bf2e..03e933d37c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -52,7 +52,7 @@ public class Cache {
private LongAdder lookupCount = new LongAdder();
private LongAdder hitCount = new LongAdder();
-private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
+private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
public Cache(StandardRoot root) {
this.root = root;
@@ -83,8 +83,8 @@ public class Cache {
if (cacheEntry == null) {
// Local copy to ensure consistency
int objectMaxSizeBytes = getObjectMaxSizeBytes();
-CachedResource newCacheEntry = new CachedResource(this, root,
path, getTtl(), objectMaxSizeBytes,
-useClassLoaderResources);
+CachedResource newCa
