[tomcat] branch 7.0.x updated: Fix various Javadoc warnings/errors with Java 9
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 0359131 Fix various Javadoc warnings/errors with Java 9
0359131 is described below
commit 0359131707e6cb86ee9b7abac8db78eb71a194cb
Author: Mark Thomas
AuthorDate: Sun Sep 8 23:34:18 2019 +0100
Fix various Javadoc warnings/errors with Java 9
Aligning with 8.5.x where posisble
---
java/javax/servlet/jsp/JspWriter.java | 4 +-
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 4 +-
java/javax/servlet/jsp/tagext/TagExtraInfo.java| 2 +-
java/org/apache/catalina/Executor.java | 9 +-
java/org/apache/catalina/startup/TldConfig.java| 4 +-
java/org/apache/jasper/compiler/JspUtil.java | 62
java/org/apache/jasper/compiler/PageDataImpl.java | 7 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 11 ++-
java/org/apache/jasper/compiler/SmapStratum.java | 38
.../org/apache/jasper/runtime/BodyContentImpl.java | 74 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 13 ++-
java/org/apache/jasper/tagplugins/jstl/Util.java | 42 +---
java/org/apache/jasper/xmlparser/ASCIIReader.java | 2 +-
java/org/apache/jasper/xmlparser/UCSReader.java| 2 +-
java/org/apache/jasper/xmlparser/UTF8Reader.java | 2 +-
java/org/apache/juli/FileHandler.java | 16 ++-
.../tomcat/dbcp/dbcp/DelegatingConnection.java | 8 +-
.../dbcp/dbcp/DelegatingDatabaseMetaData.java | 8 +-
.../tomcat/dbcp/dbcp/DelegatingResultSet.java | 8 +-
.../tomcat/dbcp/dbcp/DelegatingStatement.java | 8 +-
.../dbcp/dbcp/PoolableConnectionFactory.java | 108 ++---
.../apache/tomcat/dbcp/dbcp/PoolingConnection.java | 2 +-
.../dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../dbcp/cpdsadapter/PooledConnectionImpl.java | 2 +-
.../dbcp/datasources/CPDSConnectionFactory.java| 8 +-
.../dbcp/datasources/InstanceKeyDataSource.java| 14 +--
.../datasources/KeyedCPDSConnectionFactory.java| 8 +-
.../apache/tomcat/dbcp/jocl/ConstructorUtil.java | 20 ++--
.../dbcp/pool/BaseKeyedPoolableObjectFactory.java | 2 +-
.../dbcp/pool/BasePoolableObjectFactory.java | 4 +-
.../dbcp/pool/impl/CursorableLinkedList.java | 74 +++---
.../apache/tomcat/util/codec/binary/Base64.java| 8 +-
.../apache/tomcat/util/digester/CallParamRule.java | 17 +---
.../tomcat/util/digester/ObjectParamRule.java | 8 +-
.../util/digester/WithDefaultsRulesWrapper.java| 3 +-
java/org/apache/tomcat/util/http/ServerCookie.java | 2 +-
java/org/apache/tomcat/util/net/NioChannel.java| 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 2 +-
java/org/apache/tomcat/util/net/URL.java | 7 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java| 2 +-
.../tomcat/util/threads/ThreadPoolExecutor.java| 2 +-
41 files changed, 333 insertions(+), 290 deletions(-)
diff --git a/java/javax/servlet/jsp/JspWriter.java
b/java/javax/servlet/jsp/JspWriter.java
index 691f354..9d0be8b 100644
--- a/java/javax/servlet/jsp/JspWriter.java
+++ b/java/javax/servlet/jsp/JspWriter.java
@@ -111,8 +111,8 @@ public abstract class JspWriter extends java.io.Writer {
/**
* Write a line separator. The line separator string is defined by the
- * system property line.separator, and is not necessarily a single
- * newline ('\n') character.
+ * system property line.separator, and is not necessarily a
+ * single newline ('\n') character.
*
* @exception IOException
*If an I/O error occurs
diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
index 496ba95..9d9c88f 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
@@ -149,8 +149,8 @@ public class SimpleTagSupport implements SimpleTag {
*
* For every instance of TagAdapter
* encountered while traversing the ancestors, the tag handler returned by
- * TagAdapter.getAdaptee() - instead of the TagAdapter itself -
- * is compared to klass. If the tag handler matches, it - and
+ * TagAdapter.getAdaptee() - instead of the TagAdapter itself
-
+ * is compared to klass. If the tag handler matches, it - and
* not its TagAdapter - is returned.
*
*
diff --git a/java/javax/servlet/jsp/tagext/TagExtraInfo.java
b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
index 027e7c2..1fff9f2 100644
--- a/java/javax/servlet/jsp/tagext/TagExtraInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
@@ -46,7 +46,7 @@ package javax.servlet.jsp.tagext;
* getVariableInfo().
*
*
- * NOTE: It is a
[tomcat] branch 7.0.x updated: Fix various Javadoc warnings/errors with Java 9
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 09af10c Fix various Javadoc warnings/errors with Java 9
09af10c is described below
commit 09af10cc02fb10fc359fe20df58381bd4b79fde2
Author: Mark Thomas
AuthorDate: Sun Sep 8 12:24:15 2019 +0100
Fix various Javadoc warnings/errors with Java 9
Aligning with 8.5.x where posisble
---
java/org/apache/el/ValueExpressionImpl.java| 6 +-
java/org/apache/juli/logging/Log.java | 26 ++-
java/org/apache/naming/JndiPermission.java | 4 +-
.../naming/resources/DirContextURLConnection.java | 2 +-
.../apache/naming/resources/VirtualDirContext.java | 2 +-
.../tomcat/dbcp/jocl/JOCLContentHandler.java | 90 +++---
.../apache/tomcat/dbcp/pool/KeyedObjectPool.java | 1 -
java/org/apache/tomcat/dbcp/pool/ObjectPool.java | 1 -
.../tomcat/dbcp/pool/PoolableObjectFactory.java| 1 -
.../dbcp/pool/impl/GenericKeyedObjectPool.java | 12 +--
.../tomcat/dbcp/pool/impl/GenericObjectPool.java | 83 ++--
.../tomcat/dbcp/pool/impl/StackObjectPool.java | 8 +-
12 files changed, 124 insertions(+), 112 deletions(-)
diff --git a/java/org/apache/el/ValueExpressionImpl.java
b/java/org/apache/el/ValueExpressionImpl.java
index a676943..80614e3 100644
--- a/java/org/apache/el/ValueExpressionImpl.java
+++ b/java/org/apache/el/ValueExpressionImpl.java
@@ -55,7 +55,7 @@ import org.apache.el.util.ReflectionUtil;
*
*
*
- * The {@link javax.el.ExpressionFactory#createValueExpression} method
+ * The {@link javax.el.ExpressionFactory#createValueExpression} method
* can be used to parse an expression string and return a concrete instance
* of ValueExpression that encapsulates the parsed expression.
* The {@link FunctionMapper} is used at parse time, not evaluation time,
@@ -103,9 +103,6 @@ public final class ValueExpressionImpl extends
ValueExpression implements
super();
}
-/**
- *
- */
public ValueExpressionImpl(String expr, Node node, FunctionMapper fnMapper,
VariableMapper varMapper, Class expectedType) {
this.expr = expr;
@@ -281,5 +278,4 @@ public final class ValueExpressionImpl extends
ValueExpression implements
this.varMapper);
return this.getNode().getValueReference(ctx);
}
-
}
diff --git a/java/org/apache/juli/logging/Log.java
b/java/org/apache/juli/logging/Log.java
index ec977b0..e016676 100644
--- a/java/org/apache/juli/logging/Log.java
+++ b/java/org/apache/juli/logging/Log.java
@@ -24,7 +24,7 @@ package org.apache.juli.logging;
* this interface must have a constructor that takes a single String
* parameter representing the "name" of this Log.
*
- * The six logging levels used by Log are (in order):
+ * The six logging levels used by Log are (in order):
*
* trace (the least serious)
* debug
@@ -33,7 +33,7 @@ package org.apache.juli.logging;
* error
* fatal (the most serious)
*
- * The mapping of these log levels to the concepts used by the underlying
+ * The mapping of these log levels to the concepts used by the underlying
* logging system is implementation dependent.
* The implementation should ensure, though, that this ordering behaves
* as expected.
@@ -44,12 +44,12 @@ package org.apache.juli.logging;
* to be logged).
*
* For example,
- *
+ *
*if (log.isDebugEnabled()) {
*... do something expensive ...
*log.debug(theResult);
*}
- *
+ *
*
*
* Configuration of the underlying logging system will generally be done
@@ -71,6 +71,9 @@ public interface Log {
* Call this method to prevent having to perform expensive operations
* (for example, String concatenation)
* when the log level is more than debug.
+ *
+ * @return true if debug level logging is enabled, otherwise
+ * false
*/
public boolean isDebugEnabled();
@@ -81,6 +84,9 @@ public interface Log {
* Call this method to prevent having to perform expensive operations
* (for example, String concatenation)
* when the log level is more than error.
+ *
+ * @return true if error level logging is enabled, otherwise
+ * false
*/
public boolean isErrorEnabled();
@@ -91,6 +97,9 @@ public interface Log {
* Call this method to prevent having to perform expensive operations
* (for example, String concatenation)
* when the log level is more than fatal.
+ *
+ * @return true if fatal level logging is enabled, otherwise
+ * false
*/
public boolean isFatalEnabled();
@@ -101,6 +110,9 @@ public interface Log {
* Call this method to prevent having to perform expensive operations
* (for example, String
[tomcat] branch 7.0.x updated: Fix various Javadoc warnings/errors with Java 9 by aligning with 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 17a24bf Fix various Javadoc warnings/errors with Java 9 by aligning
with 8.5.x
17a24bf is described below
commit 17a24bf9b1b3f5fc45e75c1f2727a5f198fc2621
Author: Mark Thomas
AuthorDate: Sat Sep 7 23:23:06 2019 +0100
Fix various Javadoc warnings/errors with Java 9 by aligning with 8.5.x
---
.../catalina/tribes/group/AbsoluteOrder.java | 7 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 31 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 1 -
java/org/apache/coyote/AsyncStateMachine.java | 6 +-
java/org/apache/el/MethodExpressionImpl.java | 12 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 24 +-
.../apache/jasper/compiler/TldLocationsCache.java | 6 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 510 ++---
8 files changed, 295 insertions(+), 302 deletions(-)
diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 9dfb66b..d26c0e0 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -31,15 +31,14 @@ import org.apache.catalina.tribes.Member;
*Ordering members can serve as a basis for electing a leader or
coordinating efforts.
*This is stinky simple, it works on the basis of the Member
interface
*and orders members in the following format:
- *
- *
+ *
+ *
* IP comparison - byte by byte, lower byte higher rank
* IPv4 addresses rank higher than IPv6, ie the lesser number of
bytes, the higher rank
* Port comparison - lower port, higher rank
* UniqueId comparison- byte by byte, lower byte higher rank
- *
+ *
*
- *
*
* @author Filip Hanik
* @version 1.0
diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 1860fc5..58554c1 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -41,6 +41,7 @@ import org.apache.tomcat.util.ExceptionUtils;
* AccessLogValve.
* To use, copy into the server/classes directory of the Tomcat installation
* and configure in server.xml as:
+ *
*
* Valve className="org.apache.catalina.valves.JDBCAccessLogValve"
* driverName="your_jdbc_driver"
@@ -48,7 +49,6 @@ import org.apache.tomcat.util.ExceptionUtils;
* pattern="combined" resolveHosts="false"
* /
*
- *
*
* Many parameters can be configured, such as the database connection (with
* driverName and connectionURL),
@@ -166,7 +166,7 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
* Use long contentLength as you have more 4 GB output.
* @since 6.0.15
*/
-boolean useLongContentLength = false ;
+boolean useLongContentLength = false;
/**
* The connection username to use when trying to connect to the database.
@@ -243,8 +243,7 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
/**
- * Return the username to use to connect to the database.
- *
+ * @return the username to use to connect to the database.
*/
public String getConnectionName() {
return connectionName;
@@ -268,9 +267,8 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
this.driverName = driverName;
}
- /**
- * Return the password to use to connect to the database.
- *
+/**
+ * @return the password to use to connect to the database.
*/
public String getConnectionPassword() {
return connectionPassword;
@@ -367,11 +365,11 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
- /**
- * Sets the name of the field containing the HTTP response status code.
- *
- * @param statusField The name of the HTTP response status code field.
- */
+/**
+ * Sets the name of the field containing the HTTP response status code.
+ *
+ * @param statusField The name of the HTTP response status code field.
+ */
public void setStatusField(String statusField) {
this.statusField = statusField;
}
@@ -431,10 +429,11 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
/**
- * get useLongContentLength
+ * @return true if content length should be considered a long
+ * rather than an int, defaults to false
*/
-public boolean getUseLongContentLength() {
-return this.useLongContentLength ;
+public boolean getUseLongContentLength() {
+return
[tomcat] branch 7.0.x updated: Fix various Javadoc warnings/errors with Java 9 by aligning with 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 3a62eee Fix various Javadoc warnings/errors with Java 9 by aligning
with 8.5.x
3a62eee is described below
commit 3a62eee3a47d0adcd012969f51068060d4a75da1
Author: Mark Thomas
AuthorDate: Sat Sep 7 23:04:32 2019 +0100
Fix various Javadoc warnings/errors with Java 9 by aligning with 8.5.x
---
java/org/apache/catalina/core/ContainerBase.java | 34 +-
.../catalina/filters/AddDefaultCharsetFilter.java | 4 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
.../apache/catalina/filters/RemoteIpFilter.java| 1 -
java/org/apache/catalina/ha/deploy/WarWatcher.java | 15 +-
.../catalina/loader/VirtualWebappLoader.java | 6 +-
.../apache/catalina/manager/ManagerServlet.java| 8 +-
.../catalina/manager/host/HostManagerServlet.java | 42 +-
.../apache/catalina/session/PersistentManager.java | 3 +-
java/org/apache/catalina/startup/Catalina.java | 14 +-
.../apache/catalina/startup/HomesUserDatabase.java | 14 +-
.../catalina/startup/PasswdUserDatabase.java | 2 +-
java/org/apache/catalina/startup/Tool.java | 2 +-
.../catalina/startup/WebappServiceLoader.java | 8 +-
.../interceptors/FragmentationInterceptor.java | 7 +-
.../group/interceptors/OrderInterceptor.java | 18 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 20 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 18 +-
.../apache/catalina/tribes/tipis/Streamable.java | 6 +-
.../catalina/tribes/transport/nio/NioSender.java | 22 +-
java/org/apache/catalina/util/MIME2Java.java | 514 ++---
21 files changed, 378 insertions(+), 382 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 69d6ba4..f22f4f6 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -16,7 +16,6 @@
*/
package org.apache.catalina.core;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
@@ -88,39 +87,40 @@ import org.apache.tomcat.util.res.StringManager;
* following ContainerEvent events to listeners who register
* themselves with addContainerListener():
*
+ * ContainerEvents fired by this implementation
*
* Type
* Data
* Description
*
*
- * addChild
- * Container
+ * addChild
+ * Container
* Child container added to this Container.
*
*
- * {@link #getPipeline()
pipeline}.addValve
- * Valve
+ * {@link #getPipeline() pipeline}.addValve
+ * Valve
* Valve added to this Container.
*
*
- * removeChild
- * Container
+ * removeChild
+ * Container
* Child container removed from this Container.
*
*
- * {@link #getPipeline()
pipeline}.removeValve
- * Valve
+ * {@link #getPipeline() pipeline}.removeValve
+ * Valve
* Valve removed from this Container.
*
*
- * start
- * null
+ * start
+ * null
* Container was started.
*
*
- * stop
- * null
+ * stop
+ * null
* Container was stopped.
*
*
@@ -134,8 +134,7 @@ import org.apache.tomcat.util.res.StringManager;
public abstract class ContainerBase extends LifecycleMBeanBase
implements Container {
-private static final org.apache.juli.logging.Log log=
-org.apache.juli.logging.LogFactory.getLog( ContainerBase.class );
+private static final Log log = LogFactory.getLog(ContainerBase.class);
/**
* Perform addChild with the permissions of this class.
@@ -143,10 +142,9 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
* this allows the XML parser to have fewer privileges than
* Tomcat.
*/
-protected class PrivilegedAddChild
-implements PrivilegedAction {
+protected class PrivilegedAddChild implements PrivilegedAction {
-private Container child;
+private final Container child;
PrivilegedAddChild(Container child) {
this.child = child;
diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index bb9519a..b146764 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -38,7 +38,7 @@ import org.apache.juli.logging.LogFactory;
* defined for media with subtype "text". However, browsers may attempt to
* auto-detect the character set. This may be exploited by an attacker to
* perform an XSS attack. Internet Explorer has this behaviour by default.
