(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 364cd76946 Code clean-up. Formatting. No functional change. 364cd76946 is described below commit 364cd7694648abcaca749268c84541a24e225096 Author: Mark Thomas AuthorDate: Fri Sep 20 15:13:42 2024 +0100 Code clean-up. Formatting. No functional change. --- .../jasper/compiler/tagplugin/TagPlugin.java | 11 ++-- .../compiler/tagplugin/TagPluginContext.java | 67 +++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java b/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java index 422794760a..e1711c1d5c 100644 --- a/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java +++ b/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java @@ -17,18 +17,17 @@ package org.apache.jasper.compiler.tagplugin; /** - * This interface is to be implemented by the plugin author, to supply - * an alternate implementation of the tag handlers. It can be used to - * specify the Java codes to be generated when a tag is invoked. - * - * An implementation of this interface must be registered in a file - * named "tagPlugins.xml" under WEB-INF. + * This interface is to be implemented by the plugin author, to supply an alternate implementation of the tag handlers. + * It can be used to specify the Java codes to be generated when a tag is invoked. + * + * An implementation of this interface must be registered in a file named "tagPlugins.xml" under WEB-INF. */ public interface TagPlugin { /** * Generate codes for a custom tag. + * * @param ctxt a TagPluginContext for accessing Jasper functions */ void doTag(TagPluginContext ctxt); diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java index b8c7d2bdd7..7f6ad2c098 100644 --- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java +++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java @@ -18,9 +18,8 @@ package org.apache.jasper.compiler.tagplugin; /** - * This interface allows the plugin author to make inquiries about the - * properties of the current tag, and to use Jasper resources to generate - * direct Java codes in place of tag handler invocations. + * This interface allows the plugin author to make inquiries about the properties of the current tag, and to use Jasper + * resources to generate direct Java codes in place of tag handler invocations. */ public interface TagPluginContext { @@ -31,6 +30,7 @@ public interface TagPluginContext { /** * @param attribute Name of the attribute + * * @return true if the attribute is specified in the tag */ boolean isAttributeSpecified(String attribute); @@ -42,47 +42,48 @@ public interface TagPluginContext { /** * Generate an import statement + * * @param s Name of the import class, '*' allowed. */ void generateImport(String s); /** - * Generate a declaration in the of the generated class. This can be - * used to declare an inner class, a method, or a class variable. - * @param id A unique ID identifying the declaration. It is not - * part of the declaration, and is used to ensure that the - * declaration will only appear once. If this method is - * invoked with the same id more than once in the translation - * unit, only the first declaration will be taken. + * Generate a declaration in the of the generated class. This can be used to declare an inner class, a method, or a + * class variable. + * + * @param id A unique ID identifying the declaration. It is not part of the declaration, and is used to ensure + * that the declaration will only appear once. If this method is invoked with the same id more than + * once in the translation unit, only the first declaration will be taken. * @param text The text of the declaration. */ void generateDeclaration(String id, String text); /** * Generate Java source code scriptlet + * * @param s the scriptlet (raw Java source) */ void generateJavaSource(String s); /** * @param attribute The attribute name - * @return true if the attribute is specified and its value is a - * translation-time constant. + * + * @return true if the attribute is specified and its value is a translation-time constant. */ boolean isConstantAttribute(String attribute); /** * @param attribute The attribute name - * @return A string that is the value of a constant attribute. Undefined - *
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new e7918d68a7 Code clean-up. Formatting. No functional change. e7918d68a7 is described below commit e7918d68a74025a9e3ffaecd252c16daba73efbb Author: Mark Thomas AuthorDate: Fri Jun 28 15:56:16 2024 +0100 Code clean-up. Formatting. No functional change. --- java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++-- java/org/apache/coyote/ajp/AjpProcessor.java| 4 ++-- java/org/apache/coyote/ajp/Constants.java | 16 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java index 8241a7b964..7e785affaa 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java @@ -43,7 +43,7 @@ public abstract class AbstractAjpProtocol extends AbstractProtocol { protected static final StringManager sm = StringManager.getManager(AbstractAjpProtocol.class); -public AbstractAjpProtocol(AbstractEndpoint endpoint) { +public AbstractAjpProtocol(AbstractEndpoint endpoint) { super(endpoint); setConnectionTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); // AJP does not use Send File @@ -63,7 +63,7 @@ public abstract class AbstractAjpProtocol extends AbstractProtocol { * {@inheritDoc} Overridden to make getter accessible to other classes in this package. */ @Override -protected AbstractEndpoint getEndpoint() { +protected AbstractEndpoint getEndpoint() { return super.getEndpoint(); } diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 6e81bffb68..08c29a97a8 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -982,8 +982,8 @@ public class AjpProcessor extends AbstractProcessor { responseMessage.appendBytes(hV); } catch (IllegalArgumentException iae) { // Log the problematic header - log.warn(sm.getString("ajpprocessor.response.invalidHeader", headers.getName(i), headers.getValue(i)), -iae); + log.warn(sm.getString("ajpprocessor.response.invalidHeader", headers.getName(i), +headers.getValue(i)), iae); // Remove the problematic header headers.removeHeader(i); numHeaders--; diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java index f124d8ebcb..2e4e4de60b 100644 --- a/java/org/apache/coyote/ajp/Constants.java +++ b/java/org/apache/coyote/ajp/Constants.java @@ -104,10 +104,10 @@ public final class Constants { public static final int MAX_SEND_SIZE = MAX_PACKET_SIZE - SEND_HEAD_LEN; // Translates integer codes to names of HTTP methods -private static final String[] methodTransArray = { "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", -"PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK", "UNLOCK", "ACL", "REPORT", "VERSION-CONTROL", -"CHECKIN", "CHECKOUT", "UNCHECKOUT", "SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", -"BASELINE-CONTROL", "MKACTIVITY" }; +private static final String[] methodTransArray = +{ "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "PROPFIND", "PROPPATCH", "MKCOL", "COPY", +"MOVE", "LOCK", "UNLOCK", "ACL", "REPORT", "VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT", +"SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", "BASELINE-CONTROL", "MKACTIVITY" }; /** * Converts an AJP coded HTTP method to the method name. @@ -139,9 +139,9 @@ public final class Constants { public static final int SC_REQ_USER_AGENT = 14; // Translates integer codes to request header names -private static final String[] headerTransArray = { "accept", "accept-charset", "accept-encoding", "accept-language", -"authorization", "connection", "content-type", "content-length", "cookie", "cookie2", "host", "pragma", -"referer", "user-agent" }; +private static final String[] headerTransArray = +{ "accept", "accept-charset", "accept-encoding", "accept-language", "authorization", "connection", +"content-type", "content-length", "cookie", "cookie2", "host", "pragma", "referer", "user-agent" }; /** * Converts an AJP coded HTTP request header to the header name. @@ -169,7 +169,7 @@ public final class Constants { return responseTransArray[code]; } -private static final
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new f0187b2349 Code clean-up - formatting. No functional change f0187b2349 is described below commit f0187b2349144855b9ff1ec7f2d266d4f6fe928e Author: Mark Thomas AuthorDate: Fri May 24 13:22:33 2024 +0100 Code clean-up - formatting. No functional change --- .../catalina/valves/AbstractAccessLogValve.java| 12 .../valves/CrawlerSessionManagerValve.java | 10 +++ .../catalina/valves/ExtendedAccessLogValve.java| 8 +++--- .../apache/catalina/valves/JsonAccessLogValve.java | 32 -- .../catalina/valves/LoadBalancerDrainingValve.java | 4 +-- .../apache/catalina/valves/PersistentValve.java| 11 java/org/apache/catalina/valves/RemoteIpValve.java | 4 +-- .../org/apache/catalina/valves/SemaphoreValve.java | 3 +- .../catalina/valves/StuckThreadDetectionValve.java | 11 9 files changed, 49 insertions(+), 46 deletions(-) diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java b/java/org/apache/catalina/valves/AbstractAccessLogValve.java index 86df26194f..3f39d609f0 100644 --- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java +++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java @@ -359,7 +359,7 @@ public abstract class AbstractAccessLogValve extends ValveBase implements Access private final Locale cacheDefaultLocale; private final DateFormatCache parent; protected final Cache cLFCache; -private final Map formatCache = new HashMap<>(); +private final Map formatCache = new HashMap<>(); protected DateFormatCache(int size, Locale loc, DateFormatCache parent) { cacheSize = size; @@ -406,14 +406,14 @@ public abstract class AbstractAccessLogValve extends ValveBase implements Access /** * Global date format cache. */ -private static final DateFormatCache globalDateCache = new DateFormatCache(globalCacheSize, Locale.getDefault(), -null); +private static final DateFormatCache globalDateCache = +new DateFormatCache(globalCacheSize, Locale.getDefault(), null); /** * Thread local date format cache. */ -private static final ThreadLocal localDateCache = ThreadLocal -.withInitial(() -> new DateFormatCache(localCacheSize, Locale.getDefault(), globalDateCache)); +private static final ThreadLocal localDateCache = +ThreadLocal.withInitial(() -> new DateFormatCache(localCacheSize, Locale.getDefault(), globalDateCache)); /** @@ -1858,7 +1858,7 @@ public abstract class AbstractAccessLogValve extends ValveBase implements Access // is encountered plus at the end. default: } -// Control (1-31), delete (127) or above 127 +// Control (1-31), delete (127) or above 127 } else { // Write unchanged string parts if (current > next) { diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java index de00f438fe..954082fe2f 100644 --- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java +++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java @@ -45,8 +45,8 @@ public class CrawlerSessionManagerValve extends ValveBase { private static final Log log = LogFactory.getLog(CrawlerSessionManagerValve.class); -private final Map clientIdSessionId = new ConcurrentHashMap<>(); -private final Map sessionIdClientId = new ConcurrentHashMap<>(); +private final Map clientIdSessionId = new ConcurrentHashMap<>(); +private final Map sessionIdClientId = new ConcurrentHashMap<>(); private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo! Slurp.*|.*Feedfetcher-Google.*"; private Pattern uaPattern = null; @@ -139,7 +139,7 @@ public class CrawlerSessionManagerValve extends ValveBase { } -public Map getClientIpSessionId() { +public Map getClientIpSessionId() { return clientIdSessionId; } @@ -272,10 +272,10 @@ public class CrawlerSessionManagerValve extends ValveBase { private static class CrawlerHttpSessionBindingListener implements HttpSessionBindingListener, Serializable { private static final long serialVersionUID = 1L; -private final transient Map clientIdSessionId; +private final transient Map clientIdSessionId; private final transient String clientIdentifier; -private CrawlerHttpSessionBindingListener(Map clientIdSessionId, String clientIdentifier) { +private CrawlerHttpSessionBindingListener(Map clientIdSessionId, String clientIdentifier) {
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 69372a3149 Code clean-up - formatting. No functional change 69372a3149 is described below commit 69372a3149258d16cd5a0734094d291d1d35bafe Author: Mark Thomas AuthorDate: Mon May 20 08:18:22 2024 +0100 Code clean-up - formatting. No functional change --- .../valves/rewrite/QuotedStringTokenizer.java | 48 ++--- .../valves/rewrite/RandomizedTextRewriteMap.java | 9 +- .../catalina/valves/rewrite/ResolverImpl.java | 39 ++-- .../catalina/valves/rewrite/RewriteCond.java | 39 ++-- .../apache/catalina/valves/rewrite/RewriteMap.java | 25 +-- .../catalina/valves/rewrite/RewriteRule.java | 209 - .../catalina/valves/rewrite/RewriteValve.java | 106 +-- .../catalina/valves/rewrite/Substitution.java | 59 +++--- 8 files changed, 281 insertions(+), 253 deletions(-) diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java index a6204fb077..0d39915c00 100644 --- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java +++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java @@ -32,7 +32,11 @@ public class QuotedStringTokenizer { private int returnedTokens = 0; enum WordMode { -SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT +SPACES, +QUOTED, +ESCAPED, +SIMPLE, +COMMENT } public QuotedStringTokenizer(String text) { @@ -55,27 +59,27 @@ public class QuotedStringTokenizer { while (pos < length) { char currentChar = inputText.charAt(pos); switch (currentMode) { -case SPACES: -currentMode = handleSpaces(currentToken, currentChar); -break; -case QUOTED: -currentMode = handleQuoted(tokens, currentToken, currentChar); -break; -case ESCAPED: -currentToken.append(currentChar); -currentMode = WordMode.QUOTED; -break; -case SIMPLE: -currentMode = handleSimple(tokens, currentToken, currentChar); -break; -case COMMENT: -if (currentChar == '\r' || currentChar == '\n') { -currentMode = WordMode.SPACES; -} -break; -default: -throw new IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError", -inputText, Integer.valueOf(pos), currentMode)); +case SPACES: +currentMode = handleSpaces(currentToken, currentChar); +break; +case QUOTED: +currentMode = handleQuoted(tokens, currentToken, currentChar); +break; +case ESCAPED: +currentToken.append(currentChar); +currentMode = WordMode.QUOTED; +break; +case SIMPLE: +currentMode = handleSimple(tokens, currentToken, currentChar); +break; +case COMMENT: +if (currentChar == '\r' || currentChar == '\n') { +currentMode = WordMode.SPACES; +} +break; +default: +throw new IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError", inputText, +Integer.valueOf(pos), currentMode)); } pos++; } diff --git a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java index 37a24332df..399aa98508 100644 --- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java +++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java @@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager; /** * Implement a map for the txt: and rnd: mod_rewrite capabilities. */ -public class RandomizedTextRewriteMap implements RewriteMap{ +public class RandomizedTextRewriteMap implements RewriteMap { protected static final StringManager sm = StringManager.getManager(RandomizedTextRewriteMap.class); private static final Random random = new Random(); -private final Map map = new HashMap<>(); +private final Map map = new HashMap<>(); /** * Create a map from a text file according to the mod_rewrite syntax. + * * @param txtFilePath the text file path - * @param useRandom if the map should produce random results + * @param useRandom
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 2b0508581a Code clean-up - formatting. No functional change. 2b0508581a is described below commit 2b0508581aaa6413a83dc1a334b3cc8a17661bca Author: Mark Thomas AuthorDate: Fri May 17 19:35:25 2024 +0100 Code clean-up - formatting. No functional change. --- java/org/apache/catalina/util/CharsetMapper.java | 37 ++-- .../apache/catalina/util/ConcurrentDateFormat.java | 11 +- 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/Extension.java | 72 +++ .../apache/catalina/util/ExtensionValidator.java | 147 + 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 +++--- .../org/apache/catalina/util/ManifestResource.java | 67 +++--- 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 ++- 28 files changed, 568 insertions(+), 764 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 speci
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 4c52586cf4 Code clean-up - formatting. No functional change 4c52586cf4 is described below commit 4c52586cf4ad4347fa35a668bad8c04a921e0408 Author: Mark Thomas AuthorDate: Tue May 14 11:02:12 2024 +0100 Code clean-up - formatting. No functional change --- java/org/apache/catalina/users/AbstractGroup.java | 5 +- java/org/apache/catalina/users/AbstractRole.java | 5 +- java/org/apache/catalina/users/AbstractUser.java | 5 +- java/org/apache/catalina/users/Constants.java | 2 +- .../catalina/users/DataSourceUserDatabase.java | 49 +- .../users/DataSourceUserDatabaseFactory.java | 48 +- java/org/apache/catalina/users/GenericGroup.java | 17 ++-- java/org/apache/catalina/users/GenericRole.java| 15 ++- java/org/apache/catalina/users/GenericUser.java| 16 ++-- java/org/apache/catalina/users/MemoryGroup.java| 22 +++-- java/org/apache/catalina/users/MemoryRole.java | 22 +++-- java/org/apache/catalina/users/MemoryUser.java | 30 +++--- .../apache/catalina/users/MemoryUserDatabase.java | 102 + .../catalina/users/MemoryUserDatabaseFactory.java | 52 +-- 14 files changed, 195 insertions(+), 195 deletions(-) diff --git a/java/org/apache/catalina/users/AbstractGroup.java b/java/org/apache/catalina/users/AbstractGroup.java index 0430b65f33..8d4e4f74cd 100644 --- a/java/org/apache/catalina/users/AbstractGroup.java +++ b/java/org/apache/catalina/users/AbstractGroup.java @@ -21,9 +21,12 @@ import org.apache.catalina.Group; /** - * Convenience base class for {@link Group} implementations. + * + * Convenience base class for {@link Group} implementations. + * * * @author Craig R. McClanahan + * * @since 4.1 */ public abstract class AbstractGroup implements Group { diff --git a/java/org/apache/catalina/users/AbstractRole.java b/java/org/apache/catalina/users/AbstractRole.java index 7de9d545aa..610aedde73 100644 --- a/java/org/apache/catalina/users/AbstractRole.java +++ b/java/org/apache/catalina/users/AbstractRole.java @@ -21,9 +21,12 @@ import org.apache.catalina.Role; /** - * Convenience base class for {@link Role} implementations. + * + * Convenience base class for {@link Role} implementations. + * * * @author Craig R. McClanahan + * * @since 4.1 */ public abstract class AbstractRole implements Role { diff --git a/java/org/apache/catalina/users/AbstractUser.java b/java/org/apache/catalina/users/AbstractUser.java index 7ff6752f62..a00ead6c80 100644 --- a/java/org/apache/catalina/users/AbstractUser.java +++ b/java/org/apache/catalina/users/AbstractUser.java @@ -21,9 +21,12 @@ import org.apache.catalina.User; /** - * Convenience base class for {@link User} implementations. + * + * Convenience base class for {@link User} implementations. + * * * @author Craig R. McClanahan + * * @since 4.1 */ public abstract class AbstractUser implements User { diff --git a/java/org/apache/catalina/users/Constants.java b/java/org/apache/catalina/users/Constants.java index c79f517a7b..df7e150ca8 100644 --- a/java/org/apache/catalina/users/Constants.java +++ b/java/org/apache/catalina/users/Constants.java @@ -20,8 +20,8 @@ package org.apache.catalina.users; /** * Manifest constants for this Java package. * - * * @author Craig R. McClanahan + * * @since 4.1 */ public final class Constants { diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java b/java/org/apache/catalina/users/DataSourceUserDatabase.java index 8ad9aa7a7f..99b4c2fe59 100644 --- a/java/org/apache/catalina/users/DataSourceUserDatabase.java +++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java @@ -61,17 +61,17 @@ public class DataSourceUserDatabase extends SparseUserDatabase { */ protected final String id; -protected final ConcurrentHashMap createdUsers = new ConcurrentHashMap<>(); -protected final ConcurrentHashMap modifiedUsers = new ConcurrentHashMap<>(); -protected final ConcurrentHashMap removedUsers = new ConcurrentHashMap<>(); +protected final ConcurrentHashMap createdUsers = new ConcurrentHashMap<>(); +protected final ConcurrentHashMap modifiedUsers = new ConcurrentHashMap<>(); +protected final ConcurrentHashMap removedUsers = new ConcurrentHashMap<>(); -protected final ConcurrentHashMap createdGroups = new ConcurrentHashMap<>(); -protected final ConcurrentHashMap modifiedGroups = new ConcurrentHashMap<>(); -protected final ConcurrentHashMap removedGroups = new ConcurrentHashMap<>(); +protected final ConcurrentHashMap createdGroups = new ConcurrentHashMap<>(); +protected final ConcurrentHashMap modifiedGroups = new ConcurrentHashMap<>(); +protected final
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new f75800761f Code clean-up - formatting. No functional change f75800761f is described below commit f75800761f433befcf2224b45624cc4406a839fc Author: Mark Thomas AuthorDate: Fri May 10 14:59:26 2024 +0100 Code clean-up - formatting. No functional change --- .../catalina/tribes/transport/AbstractRxTask.java | 3 +- .../catalina/tribes/transport/AbstractSender.java | 15 +- .../catalina/tribes/transport/Constants.java | 8 +- .../catalina/tribes/transport/DataSender.java | 7 + .../tribes/transport/MultiPointSender.java | 9 +- .../catalina/tribes/transport/PooledSender.java| 51 ++--- .../catalina/tribes/transport/ReceiverBase.java| 66 --- .../tribes/transport/ReplicationTransmitter.java | 11 +- .../catalina/tribes/transport/RxTaskPool.java | 48 ++--- .../catalina/tribes/transport/SenderState.java | 6 +- .../catalina/tribes/transport/bio/BioReceiver.java | 45 +++-- .../tribes/transport/bio/BioReplicationTask.java | 78 .../catalina/tribes/transport/bio/BioSender.java | 168 .../tribes/transport/bio/MultipointBioSender.java | 52 ++--- .../tribes/transport/bio/PooledMultiSender.java| 15 +- .../catalina/tribes/transport/nio/NioReceiver.java | 196 +-- .../tribes/transport/nio/NioReplicationTask.java | 212 ++--- .../catalina/tribes/transport/nio/NioSender.java | 195 +-- .../tribes/transport/nio/ParallelNioSender.java| 150 --- .../tribes/transport/nio/PooledParallelSender.java | 16 +- 20 files changed, 690 insertions(+), 661 deletions(-) diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java index 15844d9b7f..aa2d9a1b33 100644 --- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java +++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java @@ -18,8 +18,7 @@ package org.apache.catalina.tribes.transport; import org.apache.catalina.tribes.io.ListenCallback; -public abstract class AbstractRxTask implements Runnable -{ +public abstract class AbstractRxTask implements Runnable { public static final int OPTION_DIRECT_BUFFER = ReceiverBase.OPTION_DIRECT_BUFFER; diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java b/java/org/apache/catalina/tribes/transport/AbstractSender.java index ba17303123..f3b7a0a563 100644 --- a/java/org/apache/catalina/tribes/transport/AbstractSender.java +++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java @@ -37,7 +37,7 @@ public abstract class AbstractSender implements DataSender { private Member destination; private InetAddress address; private int port; -private int maxRetryAttempts = 1;//1 resends +private int maxRetryAttempts = 1;// 1 resends private int attempt; private boolean tcpNoDelay = true; private boolean soKeepAlive = false; @@ -52,8 +52,9 @@ public abstract class AbstractSender implements DataSender { /** * transfers sender properties from one sender to another + * * @param from AbstractSender - * @param to AbstractSender + * @param to AbstractSender */ public static void transferProperties(AbstractSender from, AbstractSender to) { to.rxBufSize = from.rxBufSize; @@ -87,19 +88,19 @@ public abstract class AbstractSender implements DataSender { public boolean keepalive() { boolean disconnect = false; if (isUdpBased()) { -disconnect = true; //always disconnect UDP, TODO optimize the keepalive handling -} else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) { +disconnect = true; // always disconnect UDP, TODO optimize the keepalive handling +} else if (keepAliveCount >= 0 && requestCount > keepAliveCount) { disconnect = true; -} else if ( keepAliveTime >= 0 && (System.currentTimeMillis()-connectTime)>keepAliveTime ) { +} else if (keepAliveTime >= 0 && (System.currentTimeMillis() - connectTime) > keepAliveTime) { disconnect = true; } -if ( disconnect ) { +if (disconnect) { disconnect(); } return disconnect; } -protected void setConnected(boolean connected){ +protected void setConnected(boolean connected) { this.connected = connected; } diff --git a/java/org/apache/catalina/tribes/transport/Constants.java b/java/org/apache/catalina/tribes/transport/Constants.java index 07946d826e..46983a493d 100644 --- a/java/org/apache/catalina/tribes/transport/Constants.java +++ b/java/org/apache/catalina/tribes/transport/Constant
(tomcat) branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new cef002f0c0 Code clean-up. Formatting. No functional change. cef002f0c0 is described below commit cef002f0c0d46657978ed7f44b78df62ac7f4bdc Author: Mark Thomas AuthorDate: Mon Jan 15 13:23:15 2024 + Code clean-up. Formatting. No functional change. --- .../catalina/ssi/ByteArrayServletOutputStream.java | 4 +- .../apache/catalina/ssi/ExpressionParseTree.java | 75 + .../apache/catalina/ssi/ExpressionTokenizer.java | 39 +++-- .../catalina/ssi/ResponseIncludeWrapper.java | 45 +++--- 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| 15 +- java/org/apache/catalina/ssi/SSIEcho.java | 15 +- java/org/apache/catalina/ssi/SSIExec.java | 16 +- .../apache/catalina/ssi/SSIExternalResolver.java | 26 ++-- java/org/apache/catalina/ssi/SSIFilter.java| 42 ++--- java/org/apache/catalina/ssi/SSIFlastmod.java | 14 +- java/org/apache/catalina/ssi/SSIFsize.java | 22 ++- java/org/apache/catalina/ssi/SSIInclude.java | 18 +-- java/org/apache/catalina/ssi/SSIMediator.java | 80 -- 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 | 171 + .../apache/catalina/ssi/SSIServletRequestUtil.java | 18 +-- java/org/apache/catalina/ssi/SSISet.java | 13 +- .../catalina/ssi/SSIStopProcessingException.java | 5 +- 23 files changed, 379 insertions(+), 511 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 ce535d268e..af181050e3 100644 --- a/java/org/apache/catalina/ssi/ExpressionParseTree.java +++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java @@ -26,6 +26,7 @@ import java.util.regex.PatternSyntaxException; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; + /** * Represents a parsed expression. * @@ -34,13 +35,13 @@ import org.apache.tomcat.util.res.StringManager; public class ExpressionParseTree { private static final StringManager sm = StringManager.getManager(ExpressionParseTree.class); /** - * 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<>(); /** @@ -55,20 +56,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 SSIMediat
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new c303148225 Code clean-up - formatting. No functional change. c303148225 is described below commit c30314822526db2456dbfc10352899bd6188d1e9 Author: Mark Thomas AuthorDate: Tue Jul 4 12:31:50 2023 +0100 Code clean-up - formatting. No functional change. --- java/org/apache/catalina/filters/Constants.java| 3 +- java/org/apache/catalina/filters/CorsFilter.java | 12 .../catalina/filters/CsrfPreventionFilter.java | 10 +++ .../catalina/filters/CsrfPreventionFilterBase.java | 4 +-- .../org/apache/catalina/filters/ExpiresFilter.java | 34 +- .../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++- .../apache/catalina/filters/RateLimitFilter.java | 4 +-- .../apache/catalina/filters/RemoteIpFilter.java| 22 +++--- .../catalina/filters/RestCsrfPreventionFilter.java | 15 +- 9 files changed, 59 insertions(+), 49 deletions(-) diff --git a/java/org/apache/catalina/filters/Constants.java b/java/org/apache/catalina/filters/Constants.java index 25693aef56..dbec2a72cc 100644 --- a/java/org/apache/catalina/filters/Constants.java +++ b/java/org/apache/catalina/filters/Constants.java @@ -60,5 +60,6 @@ public final class Constants { /** * The servlet context attribute key under which the CSRF REST header name can be found. */ -public static final String CSRF_REST_NONCE_HEADER_NAME_KEY = "org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME"; +public static final String CSRF_REST_NONCE_HEADER_NAME_KEY = +"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME"; } diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java index ef9705510c..1994bcc6b3 100644 --- a/java/org/apache/catalina/filters/CorsFilter.java +++ b/java/org/apache/catalina/filters/CorsFilter.java @@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter { } // Section 6.2.4 -String accessControlRequestHeadersHeader = request - .getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS); +String accessControlRequestHeadersHeader = + request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS); List accessControlRequestHeaders = new ArrayList<>(); if (accessControlRequestHeadersHeader != null && !accessControlRequestHeadersHeader.trim().isEmpty()) { String[] headers = accessControlRequestHeadersHeader.trim().split(","); @@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter { String method = request.getMethod(); if (method != null) { if ("OPTIONS".equals(method)) { -String accessControlRequestMethodHeader = request - .getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD); +String accessControlRequestMethodHeader = + request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD); if (accessControlRequestMethodHeader != null && !accessControlRequestMethodHeader.isEmpty()) { requestType = CORSRequestType.PRE_FLIGHT; } else if (accessControlRequestMethodHeader != null && @@ -924,8 +924,8 @@ public class CorsFilter extends GenericFilter { /** * Request headers sent as 'Access-Control-Request-Headers' header, for pre-flight request. */ -public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS = HTTP_REQUEST_ATTRIBUTE_PREFIX + -"request.headers"; +public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS = +HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers"; // -- Constants /** diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java b/java/org/apache/catalina/filters/CsrfPreventionFilter.java index 9bb2660a33..ef5e979126 100644 --- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java +++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java @@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends CsrfPreventionFilterBase { return null; } @SuppressWarnings("unchecked") -NonceCache nonceCache = (NonceCache) session -.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME); +NonceCache nonceCache = +(NonceCache) session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME); return nonceCache; } @@ -355,14 +355,14 @@ public class CsrfPreventionFilter extends CsrfPreventionFilterBase { //
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 0b2c5177d7 Code clean-up - formatting. No functional change. 0b2c5177d7 is described below commit 0b2c5177d71d1dc58e551877b88cb5b0b492f4e4 Author: Mark Thomas AuthorDate: Thu Jun 1 19:46:11 2023 +0100 Code clean-up - formatting. No functional change. --- java/org/apache/catalina/connector/Connector.java | 8 ++-- .../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 | 8 ++-- java/org/apache/catalina/connector/Response.java | 8 ++-- .../apache/catalina/connector/ResponseFacade.java | 4 +- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java index 7339f961b2..64440c5020 100644 --- a/java/org/apache/catalina/connector/Connector.java +++ b/java/org/apache/catalina/connector/Connector.java @@ -63,8 +63,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"; @@ -257,8 +257,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; /** diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 4fc929c85b..6693d9cee7 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -913,8 +913,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 5d3554c6d8..00a95a8620 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> encoders = new ConcurrentHashMap<>(); +private static final Map> encoders = new ConcurrentHashMap<>(); // - Instance Variables diff --git a/java/org/apache/catalina/connector/OutputBuffer.java b/java/org/apache/catalina/connector/OutputBuffer.java index 715da5a7d3..363bcf3de5 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 encoders = new HashMap<>(); +private final Map encoders = new HashMap<>(); /** diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 666c67ef4c..1b76bc5a7e 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -208,10 +208,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("EE, dd-MMM-yy HH:mm:ss zzz", Locale.US), -new SimpleDateFormat("EEE d HH:mm:ss yy
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 5f7a833a77 Code clean-up. Formatting. No functional change. 5f7a833a77 is described below commit 5f7a833a77d527f0c9d2c6d8052e5f319abbd643 Author: Mark Thomas AuthorDate: Tue May 23 11:23:32 2023 +0100 Code clean-up. Formatting. No functional change. --- .../catalina/authenticator/AuthenticatorBase.java | 12 +-- .../apache/catalina/authenticator/Constants.java | 4 +- .../authenticator/DigestAuthenticator.java | 27 +++--- .../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| 34 +++ .../jaspic/SimpleAuthConfigProvider.java | 18 ++-- .../jaspic/SimpleServerAuthConfig.java | 19 ++-- .../jaspic/SimpleServerAuthContext.java| 14 ++- 14 files changed, 120 insertions(+), 145 deletions(-) diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 2dbaa7c312..cecf8347e4 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -611,8 +611,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) { @@ -698,8 +698,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) { @@ -1170,8 +1170,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 983528a9d4..43d2de6a13 100644 --- a/java/org/apache/catalina/authenticator/Constants.java +++ b/java/org/apache/catalina/authenticator/Constants.java @@ -35,8 +35,8 @@ public class Constants { public static final String DEFAULT_LOGIN_MODULE_NAME = "com.sun.security.jgss.krb5.accept"; // 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"); +pub
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 31203aafe9 Code clean-up - formatting. No functional change. 31203aafe9 is described below commit 31203aafe9e4b2ba40463a1db71430b1ffef1edc Author: Mark Thomas AuthorDate: Wed May 10 17:05:54 2023 +0100 Code clean-up - formatting. No functional change. --- java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java index 4f8aa81b46..f0dd05f482 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java @@ -154,10 +154,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask { } continue; } -if (value == null) { -continue; -} -if ("modelerType".equals(attName)) { +if ((value == null) || "modelerType".equals(attName)) { continue; } createProperty(pname + attName, value); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 25eaba18db Code clean-up. Formatting. No functional change. 25eaba18db is described below commit 25eaba18dbced4a11bd072e534b9aac778bae651 Author: Mark Thomas AuthorDate: Wed Mar 15 14:11:07 2023 + Code clean-up. Formatting. No functional change. --- .../catalina/tribes/demos/ChannelCreator.java | 88 +++--- .../catalina/tribes/demos/CoordinationDemo.java| 238 .../apache/catalina/tribes/demos/EchoRpcTest.java | 232 .../catalina/tribes/demos/IntrospectionUtils.java | 67 ++--- .../org/apache/catalina/tribes/demos/LoadTest.java | 217 +++ test/org/apache/catalina/tribes/demos/MapDemo.java | 302 ++--- .../tribes/demos/MembersWithProperties.java| 45 ++- 7 files changed, 581 insertions(+), 608 deletions(-) diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java b/test/org/apache/catalina/tribes/demos/ChannelCreator.java index 43cebc05ab..472cd6fe47 100644 --- a/test/org/apache/catalina/tribes/demos/ChannelCreator.java +++ b/test/org/apache/catalina/tribes/demos/ChannelCreator.java @@ -42,31 +42,20 @@ public class ChannelCreator { public static StringBuilder usage() { StringBuilder buf = new StringBuilder(); -buf.append("\n\t\t[-bind tcpbindaddress]") - .append("\n\t\t[-tcpselto tcpselectortimeout]") - .append("\n\t\t[-tcpthreads tcpthreadcount]") - .append("\n\t\t[-port tcplistenport]") - .append("\n\t\t[-autobind tcpbindtryrange]") - .append("\n\t\t[-ackto acktimeout]") - .append("\n\t\t[-receiver org.apache.catalina.tribes.transport.nio.NioReceiver|org.apache.catalina.tribes.transport.bio.BioReceiver|]") - .append("\n\t\t[-transport org.apache.catalina.tribes.transport.nio.PooledParallelSender|org.apache.catalina.tribes.transport.bio.PooledMultiSender]") - .append("\n\t\t[-transport.xxx transport specific property]") - .append("\n\t\t[-maddr multicastaddr]") - .append("\n\t\t[-mport multicastport]") - .append("\n\t\t[-mbind multicastbindaddr]") - .append("\n\t\t[-mfreq multicastfrequency]") - .append("\n\t\t[-mdrop multicastdroptime]") - .append("\n\t\t[-gzip]") - .append("\n\t\t[-static hostname:port (-static localhost: -static 127.0.0.1: can be repeated)]") - .append("\n\t\t[-order]") - .append("\n\t\t[-ordersize maxorderqueuesize]") - .append("\n\t\t[-frag]") - .append("\n\t\t[-fragsize maxmsgsize]") - .append("\n\t\t[-throughput]") - .append("\n\t\t[-failuredetect]") - .append("\n\t\t[-async]") - .append("\n\t\t[-asyncsize maxqueuesizeinkilobytes]"); - return buf; +buf.append("\n\t\t[-bind tcpbindaddress]").append("\n\t\t[-tcpselto tcpselectortimeout]") +.append("\n\t\t[-tcpthreads tcpthreadcount]").append("\n\t\t[-port tcplistenport]") +.append("\n\t\t[-autobind tcpbindtryrange]").append("\n\t\t[-ackto acktimeout]") +.append("\n\t\t[-receiver org.apache.catalina.tribes.transport.nio.NioReceiver|org.apache.catalina.tribes.transport.bio.BioReceiver|]") +.append("\n\t\t[-transport org.apache.catalina.tribes.transport.nio.PooledParallelSender|org.apache.catalina.tribes.transport.bio.PooledMultiSender]") +.append("\n\t\t[-transport.xxx transport specific property]").append("\n\t\t[-maddr multicastaddr]") +.append("\n\t\t[-mport multicastport]").append("\n\t\t[-mbind multicastbindaddr]") +.append("\n\t\t[-mfreq multicastfrequency]").append("\n\t\t[-mdrop multicastdroptime]") +.append("\n\t\t[-gzip]") +.append("\n\t\t[-static hostname:port (-static localhost: -static 127.0.0.1: can be repeated)]") +.append("\n\t\t[-order]").append("\n\t\t[-ordersize maxorderqueuesize]").append("\n\t\t[-frag]") +.append("\n\t\t[-fragsize maxmsgsize]").append("\n\t\t[-throughput]").append("\n\t\t[-failuredetect]") +.append("\n\t\t[-async]").append("\n\t\t[-asyncsize maxqueuesizeinkilobytes]"); +return buf; } @@ -92,7 +81,7 @@ public class ChannelCreator { String transport = "org.apache.catalina.tribes.transport.nio.PooledParallelSender"; String receiver = "org.apache.catalina.tribes.transport.nio.NioReceiver"; boolean async = false; -int asyncsize = 1024*1024*50; //50MB +int asyncsize = 1024 * 1024 * 50; // 50MB boolean throughput = false; boolean failuredetect = false; @@ -115,12 +104,12 @@ public class Channe
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 787b688203 Code clean-up. Formatting. No functional change. 787b688203 is described below commit 787b688203c0e5d86a87a2f7818943a8eabf918f Author: Mark Thomas AuthorDate: Wed Mar 8 18:29:53 2023 + Code clean-up. Formatting. No functional change. --- .../apache/tomcat/websocket/pojo/Constants.java| 3 +- .../tomcat/websocket/pojo/PojoEndpointBase.java| 49 ++- .../tomcat/websocket/pojo/PojoEndpointClient.java | 13 +- .../tomcat/websocket/pojo/PojoEndpointServer.java | 12 +- .../websocket/pojo/PojoMessageHandlerBase.java | 15 +- .../pojo/PojoMessageHandlerPartialBase.java| 22 +- .../pojo/PojoMessageHandlerPartialBinary.java | 11 +- .../pojo/PojoMessageHandlerPartialText.java| 11 +- .../pojo/PojoMessageHandlerWholeBase.java | 21 +- .../pojo/PojoMessageHandlerWholeBinary.java| 23 +- .../pojo/PojoMessageHandlerWholePong.java | 11 +- .../pojo/PojoMessageHandlerWholeText.java | 23 +- .../tomcat/websocket/pojo/PojoMethodMapping.java | 328 - .../tomcat/websocket/pojo/PojoPathParam.java | 12 +- .../apache/tomcat/websocket/pojo/package-info.java | 4 +- 15 files changed, 222 insertions(+), 336 deletions(-) diff --git a/java/org/apache/tomcat/websocket/pojo/Constants.java b/java/org/apache/tomcat/websocket/pojo/Constants.java index 762ac9fe3f..1eba53131a 100644 --- a/java/org/apache/tomcat/websocket/pojo/Constants.java +++ b/java/org/apache/tomcat/websocket/pojo/Constants.java @@ -21,8 +21,7 @@ package org.apache.tomcat.websocket.pojo; */ public class Constants { -public static final String POJO_METHOD_MAPPING_KEY = -"org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping"; +public static final String POJO_METHOD_MAPPING_KEY = "org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping"; private Constants() { // Hide default constructor diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java index fa71489acd..bebfc6b67a 100644 --- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java +++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java @@ -33,9 +33,8 @@ import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; /** - * Base implementation (client and server have different concrete - * implementations) of the wrapper that converts a POJO instance into a - * WebSocket endpoint instance. + * Base implementation (client and server have different concrete implementations) of the wrapper that converts a POJO + * instance into a WebSocket endpoint instance. */ public abstract class PojoEndpointBase extends Endpoint { @@ -43,11 +42,11 @@ public abstract class PojoEndpointBase extends Endpoint { private static final StringManager sm = StringManager.getManager(PojoEndpointBase.class); private Object pojo; -private final Map pathParameters; +private final Map pathParameters; private PojoMethodMapping methodMapping; -protected PojoEndpointBase(Map pathParameters) { +protected PojoEndpointBase(Map pathParameters) { this.pathParameters = pathParameters; } @@ -59,22 +58,17 @@ public abstract class PojoEndpointBase extends Endpoint { // Add message handlers before calling onOpen since that may trigger a // message which in turn could trigger a response and/or close the // session -for (MessageHandler mh : methodMapping.getMessageHandlers(pojo, -pathParameters, session, config)) { +for (MessageHandler mh : methodMapping.getMessageHandlers(pojo, pathParameters, session, config)) { session.addMessageHandler(mh); } if (methodMapping.getOnOpen() != null) { try { -methodMapping.getOnOpen().invoke(pojo, -methodMapping.getOnOpenArgs( -pathParameters, session, config)); +methodMapping.getOnOpen().invoke(pojo, methodMapping.getOnOpenArgs(pathParameters, session, config)); } catch (IllegalAccessException e) { // Reflection related problems -log.error(sm.getString( -"pojoEndpointBase.onOpenFail", -pojo.getClass().getName()), e); +log.error(sm.getString("pojoEndpointBase.onOpenFail", pojo.getClass().getName()), e); handleOnOpenOrCloseError(session, e); } catch (InvocationTargetException e) { Throwable cause = e.getCause(); @@ -107,8 +101,7 @@ public abstract class PojoEndpoi
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new 0c7815ddb2 Code clean-up. Formatting. No functional change. 0c7815ddb2 is described below commit 0c7815ddb244eb3899b30e88cc75402d1eb63143 Author: Mark Thomas AuthorDate: Wed Mar 8 18:30:29 2023 + Code clean-up. Formatting. No functional change. --- .../tomcat/websocket/TestConnectionLimit.java | 9 +- .../tomcat/websocket/TestPerMessageDeflate.java| 18 ++- test/org/apache/tomcat/websocket/TestUtil.java | 82 --- .../tomcat/websocket/TestWebSocketFrameClient.java | 41 +++--- .../websocket/TestWebSocketFrameClientSSL.java | 47 +++ test/org/apache/tomcat/websocket/TestWsFrame.java | 6 +- .../tomcat/websocket/TestWsPingPongMessages.java | 19 +-- .../tomcat/websocket/TestWsRemoteEndpoint.java | 18 +-- .../websocket/TestWsSessionSuspendResume.java | 6 +- .../tomcat/websocket/TestWsSubprotocols.java | 28 ++-- .../tomcat/websocket/TestWsWebSocketContainer.java | 150 - .../TestWsWebSocketContainerGetOpenSessions.java | 23 ++-- ...WsWebSocketContainerSessionExpiryContainer.java | 19 +-- ...stWsWebSocketContainerSessionExpirySession.java | 16 +-- .../TestWsWebSocketContainerTimeoutClient.java | 16 +-- .../TestWsWebSocketContainerTimeoutServer.java | 38 ++ .../TestWsWebSocketContainerWithProxy.java | 2 +- .../apache/tomcat/websocket/TesterAsyncTiming.java | 4 +- .../tomcat/websocket/TesterBlockWebSocketSCI.java | 13 +- .../apache/tomcat/websocket/TesterEchoServer.java | 8 +- .../tomcat/websocket/TesterFirehoseServer.java | 7 +- .../tomcat/websocket/TesterMessageCountClient.java | 13 +- .../websocket/TesterWebSocketClientProxy.java | 7 +- .../tomcat/websocket/TesterWsClientAutobahn.java | 24 ++-- .../apache/tomcat/websocket/WebSocketBaseTest.java | 4 +- .../websocket/WsWebSocketContainerBaseTest.java| 7 +- .../websocket/pojo/TestEncodingDecoding.java | 128 +- .../websocket/pojo/TestPojoEndpointBase.java | 11 +- .../websocket/pojo/TestPojoMethodMapping.java | 23 ++-- .../apache/tomcat/websocket/pojo/TesterUtil.java | 3 +- .../tomcat/websocket/server/TestAsyncMessages.java | 21 +-- .../tomcat/websocket/server/TestClassLoader.java | 7 +- .../apache/tomcat/websocket/server/TestClose.java | 2 +- .../tomcat/websocket/server/TestCloseBug58624.java | 13 +- .../tomcat/websocket/server/TestShutdown.java | 14 +- .../tomcat/websocket/server/TestSlowClient.java| 3 +- .../tomcat/websocket/server/TestUriTemplate.java | 54 .../server/TestWsRemoteEndpointImplServer.java | 28 ++-- .../websocket/server/TestWsServerContainer.java| 75 --- .../websocket/server/TesterEndpointConfig.java | 4 +- .../tomcat/websocket/server/TesterWsClient.java| 17 +-- 41 files changed, 407 insertions(+), 621 deletions(-) diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java b/test/org/apache/tomcat/websocket/TestConnectionLimit.java index e4eb14d57e..f1ec95dcdb 100644 --- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java +++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java @@ -38,8 +38,7 @@ import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEn public class TestConnectionLimit extends TomcatBaseTest { /* - * Simple test to see how many outgoing connections can be created on a - * single machine. + * Simple test to see how many outgoing connections can be created on a single machine. */ @Test public void testSingleMachine() throws Exception { @@ -54,8 +53,7 @@ public class TestConnectionLimit extends TomcatBaseTest { tomcat.start(); -URI uri = new URI("ws://localhost:" + getPort() + -TesterEchoServer.Config.PATH_ASYNC); +URI uri = new URI("ws://localhost:" + getPort() + TesterEchoServer.Config.PATH_ASYNC); AtomicInteger counter = new AtomicInteger(0); int threadCount = 50; @@ -87,8 +85,7 @@ public class TestConnectionLimit extends TomcatBaseTest { @Override public void run() { -WebSocketContainer wsContainer = -ContainerProvider.getWebSocketContainer(); +WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); int count = 0; diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java index 4538eba976..d1676b6c96 100644 --- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java +++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java @@ -93,17 +93,16 @@ public class TestPerMes
[tomcat] branch 9.0.x updated: 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 The following commit(s) were added to refs/heads/9.0.x by this push: new cd4e9c7124 Code clean-up. Formatting. No functional change. cd4e9c7124 is described below commit cd4e9c7124684ce5284cbab2dcfce22539c07ccc Author: Mark Thomas AuthorDate: Wed Mar 8 18:30:02 2023 + Code clean-up. Formatting. No functional change. --- .../apache/tomcat/websocket/server/Constants.java | 18 +- .../server/DefaultServerEndpointConfigurator.java | 17 +- .../tomcat/websocket/server/UpgradeUtil.java | 130 +--- .../tomcat/websocket/server/UriTemplate.java | 26 +-- .../tomcat/websocket/server/WsContextListener.java | 10 +- .../apache/tomcat/websocket/server/WsFilter.java | 13 +- .../tomcat/websocket/server/WsFrameServer.java | 63 +++--- .../websocket/server/WsHandshakeRequest.java | 49 ++--- .../websocket/server/WsHttpUpgradeHandler.java | 58 ++ .../tomcat/websocket/server/WsMappingResult.java | 7 +- .../server/WsPerSessionServerEndpointConfig.java | 12 +- .../server/WsRemoteEndpointImplServer.java | 33 ++- java/org/apache/tomcat/websocket/server/WsSci.java | 36 ++-- .../tomcat/websocket/server/WsServerContainer.java | 226 - .../tomcat/websocket/server/WsSessionListener.java | 2 +- .../tomcat/websocket/server/WsWriteTimeout.java| 18 +- .../tomcat/websocket/server/package-info.java | 4 +- 17 files changed, 284 insertions(+), 438 deletions(-) diff --git a/java/org/apache/tomcat/websocket/server/Constants.java b/java/org/apache/tomcat/websocket/server/Constants.java index de5041a527..94b52849ca 100644 --- a/java/org/apache/tomcat/websocket/server/Constants.java +++ b/java/org/apache/tomcat/websocket/server/Constants.java @@ -21,24 +21,18 @@ package org.apache.tomcat.websocket.server; */ public class Constants { -public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM = -"org.apache.tomcat.websocket.binaryBufferSize"; -public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM = -"org.apache.tomcat.websocket.textBufferSize"; +public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM = "org.apache.tomcat.websocket.binaryBufferSize"; +public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM = "org.apache.tomcat.websocket.textBufferSize"; /** - * Allows the deployment restriction defined in section 6.4 of the Jakarta - * WebSocket specification to be ignored. + * Allows the deployment restriction defined in section 6.4 of the Jakarta WebSocket specification to be ignored. * - * @deprecated This is no longer required in Jakarta EE 10 onwards and will - * be removed in Tomcat 10.1. + * @deprecated This is no longer required in Jakarta EE 10 onwards and will be removed in Tomcat 10.1. */ @Deprecated -public static final String ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM = -"org.apache.tomcat.websocket.noAddAfterHandshake"; +public static final String ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM = "org.apache.tomcat.websocket.noAddAfterHandshake"; -public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE = -"javax.websocket.server.ServerContainer"; +public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE = "javax.websocket.server.ServerContainer"; private Constants() { diff --git a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java index 5c385ed7ad..00f492ec4a 100644 --- a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java +++ b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java @@ -26,13 +26,11 @@ import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; import javax.websocket.server.ServerEndpointConfig; -@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class) -public class DefaultServerEndpointConfigurator -extends ServerEndpointConfig.Configurator { +@aQute.bnd.annotation.spi.ServiceProvider(value = ServerEndpointConfig.Configurator.class) +public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator { @Override -public T getEndpointInstance(Class clazz) -throws InstantiationException { +public T getEndpointInstance(Class clazz) throws InstantiationException { try { return clazz.getConstructor().newInstance(); } catch (InstantiationException e) { @@ -46,8 +44,7 @@ public class DefaultServerEndpointConfigurator @Override -public Strin