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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4af9b611e6 Code clean-up - formatting. No functional change.
4af9b611e6 is described below
commit 4af9b611e62351aa14b9cb1dfc7fc25fd05b7e23
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 1 19:47:12 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/connector/Connector.java | 10 ++---
.../apache/catalina/connector/CoyoteAdapter.java | 4 +-
.../org/apache/catalina/connector/InputBuffer.java | 2 +-
.../apache/catalina/connector/OutputBuffer.java | 2 +-
java/org/apache/catalina/connector/Request.java | 46 +++++++++++-----------
.../apache/catalina/connector/RequestFacade.java | 6 +--
java/org/apache/catalina/connector/Response.java | 4 +-
7 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 8d3ff0657a..faf6ee2094 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -64,8 +64,8 @@ public class Connector extends LifecycleMBeanBase {
/**
* Alternate flag to enable recycling of facades.
*/
- public static final boolean RECYCLE_FACADES = Boolean
-
.parseBoolean(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
"false"));
+ public static final boolean RECYCLE_FACADES =
+
Boolean.parseBoolean(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
"false"));
public static final String INTERNAL_EXECUTOR_NAME = "Internal";
@@ -275,8 +275,8 @@ public class Connector extends LifecycleMBeanBase {
* The behavior when an encoded solidus (slash) is submitted.
*/
@SuppressWarnings("deprecation")
- private EncodedSolidusHandling encodedSolidusHandling =
UDecoder.ALLOW_ENCODED_SLASH ? EncodedSolidusHandling.DECODE
- : EncodedSolidusHandling.REJECT;
+ private EncodedSolidusHandling encodedSolidusHandling =
+ UDecoder.ALLOW_ENCODED_SLASH ? EncodedSolidusHandling.DECODE :
EncodedSolidusHandling.REJECT;
/**
@@ -285,7 +285,7 @@ public class Connector extends LifecycleMBeanBase {
protected boolean useBodyEncodingForURI = false;
- protected static final HashMap<String, String> replacements = new
HashMap<>();
+ protected static final HashMap<String,String> replacements = new
HashMap<>();
static {
replacements.put("acceptCount", "backlog");
replacements.put("connectionLinger", "soLinger");
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index c674626bc7..066fa82d83 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -910,8 +910,8 @@ public class CoyoteAdapter implements Adapter {
int end = uriBC.getEnd();
int pathParamStart = semicolon + 1;
- int pathParamEnd = ByteChunk.findBytes(uriBC.getBuffer(), start +
pathParamStart, end,
- new byte[] { ';', '/' });
+ int pathParamEnd =
+ ByteChunk.findBytes(uriBC.getBuffer(), start +
pathParamStart, end, new byte[] { ';', '/' });
String pv = null;
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index cce362ce24..f65112646a 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -69,7 +69,7 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
/**
* Encoder cache.
*/
- private static final ConcurrentMap<Charset,
SynchronizedStack<B2CConverter>> encoders = new ConcurrentHashMap<>();
+ private static final
ConcurrentMap<Charset,SynchronizedStack<B2CConverter>> encoders = new
ConcurrentHashMap<>();
// ----------------------------------------------------- Instance Variables
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 7a14989b54..2249a21395 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -55,7 +55,7 @@ public class OutputBuffer extends Writer {
/**
* Encoder cache.
*/
- private final Map<Charset, C2BConverter> encoders = new HashMap<>();
+ private final Map<Charset,C2BConverter> encoders = new HashMap<>();
/**
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 75c24acd02..1bfe791e8f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -201,10 +201,10 @@ public class Request implements HttpServletRequest {
protected final SimpleDateFormat formats[];
@Deprecated
- private static final SimpleDateFormat formatsTemplate[] = {
- new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US),
- new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
- new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) };
+ private static final SimpleDateFormat formatsTemplate[] =
+ { new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US),
+ new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz",
Locale.US),
+ new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy",
Locale.US) };
/**
@@ -216,7 +216,7 @@ public class Request implements HttpServletRequest {
/**
* The attributes associated with this Request, keyed by attribute name.
*/
- private final Map<String, Object> attributes = new ConcurrentHashMap<>();
+ private final Map<String,Object> attributes = new ConcurrentHashMap<>();
/**
@@ -235,7 +235,7 @@ public class Request implements HttpServletRequest {
/**
* Internal notes associated with this request by Catalina components and
event listeners.
*/
- private final transient HashMap<String, Object> notes = new HashMap<>();
+ private final transient HashMap<String,Object> notes = new HashMap<>();
/**
@@ -326,7 +326,7 @@ public class Request implements HttpServletRequest {
/**
* Hash map used in the getParametersMap method.
*/
- protected ParameterMap<String, String[]> parameterMap = new
ParameterMap<>();
+ protected ParameterMap<String,String[]> parameterMap = new
ParameterMap<>();
/**
@@ -1157,7 +1157,7 @@ public class Request implements HttpServletRequest {
* @return A <code>Map</code> containing parameter names as keys and
parameter values as map values.
*/
@Override
- public Map<String, String[]> getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
if (parameterMap.isLocked()) {
return parameterMap;
@@ -1615,8 +1615,8 @@ public class Request implements HttpServletRequest {
if ((listeners == null) || (listeners.length == 0)) {
return;
}
- ServletRequestAttributeEvent event = new
ServletRequestAttributeEvent(context.getServletContext(), getRequest(),
- name, value);
+ ServletRequestAttributeEvent event =
+ new ServletRequestAttributeEvent(context.getServletContext(),
getRequest(), name, value);
for (Object o : listeners) {
if (!(o instanceof ServletRequestAttributeListener)) {
continue;
@@ -2010,8 +2010,8 @@ public class Request implements HttpServletRequest {
instanceManager = getContext().getInstanceManager();
handler = (T)
instanceManager.newInstance(httpUpgradeHandlerClass);
}
- } catch (InstantiationException | IllegalAccessException |
InvocationTargetException | NamingException
- | IllegalArgumentException | NoSuchMethodException |
SecurityException e) {
+ } catch (InstantiationException | IllegalAccessException |
InvocationTargetException | NamingException |
+ IllegalArgumentException | NoSuchMethodException |
SecurityException e) {
throw new ServletException(e);
}
UpgradeToken upgradeToken = new UpgradeToken(handler, getContext(),
instanceManager,
@@ -3007,8 +3007,8 @@ public class Request implements HttpServletRequest {
if (!create) {
return null;
}
- boolean trackModesIncludesCookie =
context.getServletContext().getEffectiveSessionTrackingModes()
- .contains(SessionTrackingMode.COOKIE);
+ boolean trackModesIncludesCookie =
+
context.getServletContext().getEffectiveSessionTrackingModes().contains(SessionTrackingMode.COOKIE);
if (trackModesIncludesCookie && response.getResponse().isCommitted()) {
throw new
IllegalStateException(sm.getString("coyoteRequest.sessionCreateCommitted"));
}
@@ -3056,8 +3056,8 @@ public class Request implements HttpServletRequest {
// Creating a new session cookie based on that session
if (session != null && trackModesIncludesCookie) {
- Cookie cookie =
ApplicationSessionCookieConfig.createSessionCookie(context,
session.getIdInternal(),
- isSecure());
+ Cookie cookie =
+
ApplicationSessionCookieConfig.createSessionCookie(context,
session.getIdInternal(), isSecure());
response.addSessionCookieInternal(cookie);
}
@@ -3377,7 +3377,7 @@ public class Request implements HttpServletRequest {
// a local collection, sorted by the quality value (so we can
// add Locales in descending order). The values will be ArrayLists
// containing the corresponding Locales to be added
- TreeMap<Double, ArrayList<Locale>> locales = new TreeMap<>();
+ TreeMap<Double,ArrayList<Locale>> locales = new TreeMap<>();
Enumeration<String> values = getHeaders("accept-language");
@@ -3402,7 +3402,7 @@ public class Request implements HttpServletRequest {
* @param value the header value
* @param locales the map that will hold the result
*/
- protected void parseLocalesHeader(String value, TreeMap<Double,
ArrayList<Locale>> locales) {
+ protected void parseLocalesHeader(String value,
TreeMap<Double,ArrayList<Locale>> locales) {
List<AcceptLanguage> acceptLanguages;
try {
@@ -3437,14 +3437,14 @@ public class Request implements HttpServletRequest {
// void remove(Request request, String name);
}
- private static final Map<String, SpecialAttributeAdapter>
specialAttributes = new HashMap<>();
+ private static final Map<String,SpecialAttributeAdapter> specialAttributes
= new HashMap<>();
static {
specialAttributes.put(Globals.DISPATCHER_TYPE_ATTR, new
SpecialAttributeAdapter() {
@Override
public Object get(Request request, String name) {
- return (request.internalDispatcherType == null) ?
DispatcherType.REQUEST
- : request.internalDispatcherType;
+ return (request.internalDispatcherType == null) ?
DispatcherType.REQUEST :
+ request.internalDispatcherType;
}
@Override
@@ -3455,8 +3455,8 @@ public class Request implements HttpServletRequest {
specialAttributes.put(Globals.DISPATCHER_REQUEST_PATH_ATTR, new
SpecialAttributeAdapter() {
@Override
public Object get(Request request, String name) {
- return (request.requestDispatcherPath == null) ?
request.getRequestPathMB().toString()
- : request.requestDispatcherPath.toString();
+ return (request.requestDispatcherPath == null) ?
request.getRequestPathMB().toString() :
+ request.requestDispatcherPath.toString();
}
@Override
diff --git a/java/org/apache/catalina/connector/RequestFacade.java
b/java/org/apache/catalina/connector/RequestFacade.java
index c0bbe5f0a5..45946d76d2 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -65,10 +65,10 @@ public class RequestFacade implements HttpServletRequest {
}
- private final class GetParameterMapPrivilegedAction implements
PrivilegedAction<Map<String, String[]>> {
+ private final class GetParameterMapPrivilegedAction implements
PrivilegedAction<Map<String,String[]>> {
@Override
- public Map<String, String[]> run() {
+ public Map<String,String[]> run() {
return request.getParameterMap();
}
}
@@ -347,7 +347,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
- public Map<String, String[]> getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
checkFacade();
if (Globals.IS_SECURITY_ENABLED) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 0e01cc05f0..8a4be807fd 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1568,8 +1568,8 @@ public class Response implements HttpServletResponse {
if (!file.startsWith(contextPath)) {
return false;
}
- String tok = ";" +
SessionConfig.getSessionUriParamName(request.getContext()) + "=" +
- session.getIdInternal();
+ String tok =
+ ";" +
SessionConfig.getSessionUriParamName(request.getContext()) + "=" +
session.getIdInternal();
if (file.indexOf(tok, contextPath.length()) >= 0) {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
