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
The following commit(s) were added to refs/heads/10.1.x by this push: new d50b0df47b Code clean-up - formatting. No functional change. d50b0df47b is described below commit d50b0df47b08bf043b65deeee51298bc6c13a5c4 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jun 1 19:45:30 2023 +0100 Code clean-up - formatting. No functional change. --- .../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 | 38 +++++++++++----------- .../apache/catalina/connector/RequestFacade.java | 8 ++--- java/org/apache/catalina/connector/Response.java | 8 ++--- .../apache/catalina/connector/ResponseFacade.java | 4 +-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 40edce0b11..4242f34fc0 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -917,8 +917,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 1e1967b715..3bffaf74d1 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 Map<Charset, SynchronizedStack<B2CConverter>> encoders = new ConcurrentHashMap<>(); + private static final Map<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 62966c653b..fbc638bf05 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 879651f58b..a607dd08c0 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -194,7 +194,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<>(); /** @@ -213,7 +213,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<>(); /** @@ -304,7 +304,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<>(); /** @@ -1100,7 +1100,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; @@ -1549,8 +1549,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; @@ -1934,11 +1934,11 @@ public class Request implements HttpServletRequest { @Override - public Map<String, String> getTrailerFields() { + public Map<String,String> getTrailerFields() { if (!isTrailerFieldsReady()) { throw new IllegalStateException(sm.getString("coyoteRequest.trailersNotReady")); } - Map<String, String> result = new HashMap<>(coyoteRequest.getTrailerFields()); + Map<String,String> result = new HashMap<>(coyoteRequest.getTrailerFields()); return result; } @@ -2919,8 +2919,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")); } @@ -2968,8 +2968,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); } @@ -3280,7 +3280,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"); @@ -3305,7 +3305,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 { @@ -3335,14 +3335,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 @@ -3353,8 +3353,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 ae89d5087a..c815535472 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) { @@ -824,7 +824,7 @@ public class RequestFacade implements HttpServletRequest { @Override - public Map<String, String> getTrailerFields() { + public Map<String,String> getTrailerFields() { checkFacade(); return request.getTrailerFields(); } diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 72ea812186..3f1c1e8855 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -1081,13 +1081,13 @@ public class Response implements HttpServletResponse { @Override - public void setTrailerFields(Supplier<Map<String, String>> supplier) { + public void setTrailerFields(Supplier<Map<String,String>> supplier) { getCoyoteResponse().setTrailerFields(supplier); } @Override - public Supplier<Map<String, String>> getTrailerFields() { + public Supplier<Map<String,String>> getTrailerFields() { return getCoyoteResponse().getTrailerFields(); } @@ -1429,8 +1429,8 @@ public class Response implements HttpServletResponse { } if (SecurityUtil.isPackageProtectionEnabled()) { - Boolean result = AccessController - .doPrivileged(new PrivilegedDoIsEncodable(getContext(), hreq, session, location)); + Boolean result = + AccessController.doPrivileged(new PrivilegedDoIsEncodable(getContext(), hreq, session, location)); return result.booleanValue(); } else { return doIsEncodeable(getContext(), hreq, session, location); diff --git a/java/org/apache/catalina/connector/ResponseFacade.java b/java/org/apache/catalina/connector/ResponseFacade.java index 49e44e6dbd..1ad8fe9c13 100644 --- a/java/org/apache/catalina/connector/ResponseFacade.java +++ b/java/org/apache/catalina/connector/ResponseFacade.java @@ -478,14 +478,14 @@ public class ResponseFacade implements HttpServletResponse { @Override - public void setTrailerFields(Supplier<Map<String, String>> supplier) { + public void setTrailerFields(Supplier<Map<String,String>> supplier) { checkFacade(); response.setTrailerFields(supplier); } @Override - public Supplier<Map<String, String>> getTrailerFields() { + public Supplier<Map<String,String>> getTrailerFields() { checkFacade(); return response.getTrailerFields(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org