This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 87c291f7a6 Remove unnecessary uses of {@inheritDoc}
87c291f7a6 is described below
commit 87c291f7a6b23a85cf1c0f4d6809d2831d706d92
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 16 13:46:11 2023 +0100
Remove unnecessary uses of {@inheritDoc}
---
java/org/apache/catalina/connector/Request.java | 15 -
java/org/apache/catalina/core/StandardWrapper.java | 6 -
.../apache/catalina/ha/session/DeltaSession.java | 3 -
.../catalina/loader/WebappClassLoaderBase.java | 3 -
.../apache/catalina/session/StandardSession.java | 3 -
.../catalina/tribes/membership/McastService.java | 9 -
java/org/apache/catalina/util/LifecycleBase.java | 21 --
.../catalina/valves/AbstractAccessLogValve.java | 3 -
.../apache/catalina/valves/JDBCAccessLogValve.java | 3 -
java/org/apache/catalina/valves/RemoteIpValve.java | 3 -
.../catalina/valves/StuckThreadDetectionValve.java | 3 -
java/org/apache/jasper/JspC.java | 63 ----
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 6 -
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 42 ---
.../dbcp/pool2/impl/PooledSoftReference.java | 3 -
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 3 -
.../http/fileupload/util/FileItemHeadersImpl.java | 9 -
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 318 --------------------
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 33 ---
.../jdbc/pool/MultiLockFairBlockingQueue.java | 33 ---
.../apache/tomcat/jdbc/pool/PoolProperties.java | 321 ---------------------
.../AbstractCreateStatementInterceptor.java | 3 -
.../jdbc/pool/interceptor/SlowQueryReport.java | 6 -
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 84 ------
24 files changed, 996 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 41f8573f1f..cebd50640c 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2725,9 +2725,6 @@ public class Request implements HttpServletRequest {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean authenticate(HttpServletResponse response) throws
IOException, ServletException {
if (response.isCommitted()) {
@@ -2737,9 +2734,6 @@ public class Request implements HttpServletRequest {
return getContext().getAuthenticator().authenticate(this, response);
}
- /**
- * {@inheritDoc}
- */
@Override
public void login(String username, String password) throws
ServletException {
if (getAuthType() != null || getRemoteUser() != null ||
getUserPrincipal() != null) {
@@ -2749,17 +2743,11 @@ public class Request implements HttpServletRequest {
getContext().getAuthenticator().login(username, password, this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void logout() throws ServletException {
getContext().getAuthenticator().logout(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Part> getParts() throws IOException,
IllegalStateException, ServletException {
@@ -2924,9 +2912,6 @@ public class Request implements HttpServletRequest {
}
- /**
- * {@inheritDoc}
- */
@Override
public Part getPart(String name) throws IOException,
IllegalStateException, ServletException {
for (Part part : getParts()) {
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index cb3dbcd596..8d7b342aca 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -587,9 +587,6 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
}
- /**
- * {@inheritDoc}
- */
@Override
public void setServletSecurityAnnotationScanRequired(boolean b) {
// NO-OP
@@ -1082,9 +1079,6 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
}
- /**
- * {@inheritDoc}
- */
@Override
public void servletSecurityAnnotationScan() throws ServletException {
// NO-OP
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index d890a64c28..720b194479 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -315,9 +315,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
- /**
- * {@inheritDoc}
- */
@Override
public void setId(String id, boolean notify) {
super.setId(id, notify);
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index aa747a5873..79d1b07ff9 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1551,9 +1551,6 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
}
- /**
- * {@inheritDoc}
- */
@Override
public String getStateName() {
return getState().toString();
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index 7a0e975424..92d255a85f 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -329,9 +329,6 @@ public class StandardSession implements HttpSession,
Session, Serializable {
}
- /**
- * {@inheritDoc}
- */
@Override
public void setId(String id, boolean notify) {
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java
b/java/org/apache/catalina/tribes/membership/McastService.java
index f5e2480276..322046d11c 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -121,9 +121,6 @@ public class McastService
this.properties = properties;
}
- /**
- * {@inheritDoc}
- */
@Override
public Properties getProperties() {
return properties;
@@ -137,9 +134,6 @@ public class McastService
return localMember.toString() ;
}
- /**
- * {@inheritDoc}
- */
@Override
public Member getLocalMember(boolean alive) {
if ( alive && localMember != null && impl != null) {
@@ -148,9 +142,6 @@ public class McastService
return localMember;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLocalMemberProperties(String listenHost, int listenPort,
int securePort, int udpPort) {
properties.setProperty("tcpListenHost",listenHost);
diff --git a/java/org/apache/catalina/util/LifecycleBase.java
b/java/org/apache/catalina/util/LifecycleBase.java
index 870cb9a68a..5618bbbce5 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -84,27 +84,18 @@ public abstract class LifecycleBase implements Lifecycle {
}
- /**
- * {@inheritDoc}
- */
@Override
public void addLifecycleListener(LifecycleListener listener) {
lifecycleListeners.add(listener);
}
- /**
- * {@inheritDoc}
- */
@Override
public LifecycleListener[] findLifecycleListeners() {
return lifecycleListeners.toArray(new LifecycleListener[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeLifecycleListener(LifecycleListener listener) {
lifecycleListeners.remove(listener);
@@ -150,9 +141,6 @@ public abstract class LifecycleBase implements Lifecycle {
protected abstract void initInternal() throws LifecycleException;
- /**
- * {@inheritDoc}
- */
@Override
public final synchronized void start() throws LifecycleException {
@@ -216,9 +204,6 @@ public abstract class LifecycleBase implements Lifecycle {
protected abstract void startInternal() throws LifecycleException;
- /**
- * {@inheritDoc}
- */
@Override
public final synchronized void stop() throws LifecycleException {
@@ -335,18 +320,12 @@ public abstract class LifecycleBase implements Lifecycle {
protected abstract void destroyInternal() throws LifecycleException;
- /**
- * {@inheritDoc}
- */
@Override
public LifecycleState getState() {
return state;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getStateName() {
return getState().toString();
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 7b49fc6bbd..f9079db1c7 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -520,9 +520,6 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getRequestAttributesEnabled() {
return requestAttributesEnabled;
diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index f56d1bba55..c1ce3fd561 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -221,9 +221,6 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
this.requestAttributesEnabled = requestAttributesEnabled;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getRequestAttributesEnabled() {
return requestAttributesEnabled;
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 9513a96319..add35f3df9 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -611,9 +611,6 @@ public class RemoteIpValve extends ValveBase {
return trustedProxies.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
final String originalRemoteAddr = request.getRemoteAddr();
diff --git a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
index 7fe9982d71..95033557c0 100644
--- a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
+++ b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
@@ -157,9 +157,6 @@ public class StuckThreadDetectionValve extends ValveBase {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index c80d1e6224..b15be65481 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -459,9 +459,6 @@ public class JspC extends Task implements Options {
this.trimSpaces = ts;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPoolingEnabled() {
return poolingEnabled;
@@ -475,9 +472,6 @@ public class JspC extends Task implements Options {
this.poolingEnabled = poolingEnabled;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isXpoweredBy() {
return xpoweredBy;
@@ -510,9 +504,6 @@ public class JspC extends Task implements Options {
return -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getErrorOnUseBeanInvalidClassAttribute() {
return errorOnUseBeanInvalidClassAttribute;
@@ -527,9 +518,6 @@ public class JspC extends Task implements Options {
errorOnUseBeanInvalidClassAttribute = b;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getMappedFile() {
return mappedFile;
@@ -547,18 +535,12 @@ public class JspC extends Task implements Options {
classDebugInfo=b;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getClassDebugInfo() {
// compile with debug info
return classDebugInfo;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCaching() {
return caching;
@@ -574,9 +556,6 @@ public class JspC extends Task implements Options {
this.caching = caching;
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<String, TagLibraryInfo> getCache() {
return cache;
@@ -620,9 +599,6 @@ public class JspC extends Task implements Options {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isSmapSuppressed() {
return smapSuppressed;
@@ -636,9 +612,6 @@ public class JspC extends Task implements Options {
this.smapSuppressed = smapSuppressed;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isSmapDumped() {
return smapDumped;
@@ -666,9 +639,6 @@ public class JspC extends Task implements Options {
this.genStringAsCharArray = genStringAsCharArray;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean genStringAsCharArray() {
return genStringAsCharArray;
@@ -685,25 +655,16 @@ public class JspC extends Task implements Options {
this.ieClassId = ieClassId;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIeClassId() {
return ieClassId;
}
- /**
- * {@inheritDoc}
- */
@Override
public File getScratchDir() {
return scratchDir;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getCompiler() {
return compiler;
@@ -719,17 +680,11 @@ public class JspC extends Task implements Options {
compiler=c;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getCompilerClassName() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getCompilerTargetVM() {
return compilerTargetVM;
@@ -745,9 +700,6 @@ public class JspC extends Task implements Options {
compilerTargetVM = vm;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getCompilerSourceVM() {
return compilerSourceVM;
@@ -763,9 +715,6 @@ public class JspC extends Task implements Options {
compilerSourceVM = vm;
}
- /**
- * {@inheritDoc}
- */
@Override
public TldCache getTldCache() {
return tldCache;
@@ -792,9 +741,6 @@ public class JspC extends Task implements Options {
javaEncoding = encodingName;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getFork() {
return fork;
@@ -804,9 +750,6 @@ public class JspC extends Task implements Options {
this.fork = fork;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getClassPath() {
if( classPath != null ) {
@@ -1094,17 +1037,11 @@ public class JspC extends Task implements Options {
return failOnError;
}
- /**
- * {@inheritDoc}
- */
@Override
public JspConfig getJspConfig() {
return jspConfig;
}
- /**
- * {@inheritDoc}
- */
@Override
public TagPluginManager getTagPluginManager() {
return tagPluginManager;
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
index 3bef44f724..63607850a1 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -118,9 +118,6 @@ class PooledConnectionImpl
pooledObject.getObject().activate();
}
- /**
- * {@inheritDoc}
- */
@Override
public void addConnectionEventListener(final ConnectionEventListener
listener) {
if (!eventListeners.contains(listener)) {
@@ -692,9 +689,6 @@ class PooledConnectionImpl
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeConnectionEventListener(final ConnectionEventListener
listener) {
eventListeners.remove(listener);
diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
b/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
index 4e27dfd94e..e9171cc8bd 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
@@ -366,9 +366,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
// BlockingDeque methods
- /**
- * {@inheritDoc}
- */
@Override
public void addFirst(final E e) {
if (!offerFirst(e)) {
@@ -376,9 +373,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addLast(final E e) {
if (!offerLast(e)) {
@@ -386,9 +380,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean offerFirst(final E e) {
Objects.requireNonNull(e, "e");
@@ -400,9 +391,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean offerLast(final E e) {
Objects.requireNonNull(e, "e");
@@ -522,9 +510,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@Override
public E removeFirst() {
final E x = pollFirst();
@@ -534,9 +519,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
return x;
}
- /**
- * {@inheritDoc}
- */
@Override
public E removeLast() {
final E x = pollLast();
@@ -662,9 +644,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@Override
public E getFirst() {
final E x = peekFirst();
@@ -674,9 +653,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
return x;
}
- /**
- * {@inheritDoc}
- */
@Override
public E getLast() {
final E x = peekLast();
@@ -746,18 +722,12 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
// BlockingQueue methods
- /**
- * {@inheritDoc}
- */
@Override
public boolean add(final E e) {
addLast(e);
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean offer(final E e) {
return offerLast(e);
@@ -946,17 +916,11 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
// Stack methods
- /**
- * {@inheritDoc}
- */
@Override
public void push(final E e) {
addFirst(e);
}
- /**
- * {@inheritDoc}
- */
@Override
public E pop() {
return removeFirst();
@@ -1093,9 +1057,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
}
}
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
@Override
public <T> T[] toArray(T[] a) {
@@ -1168,9 +1129,6 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
return new Itr();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<E> descendingIterator() {
return new DescendingItr();
diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
b/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
index 785ceb6678..ffb4e5c573 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
@@ -56,9 +56,6 @@ public class PooledSoftReference<T> extends
DefaultPooledObject<T> {
return reference.get();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
final StringBuilder result = new StringBuilder();
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
index 6d653e3da3..e2760ccb77 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
@@ -229,9 +229,6 @@ public class SoftReferenceObjectPool<T> extends
BaseObjectPool<T> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public synchronized void invalidateObject(final T obj) throws Exception {
final PooledSoftReference<T> ref = findReference(obj);
diff --git
a/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
b/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
index 1047dc38ce..6817d8b5a8 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
@@ -45,9 +45,6 @@ public class FileItemHeadersImpl implements FileItemHeaders,
Serializable {
*/
private final Map<String, List<String>> headerNameToValueListMap = new
LinkedHashMap<>();
- /**
- * {@inheritDoc}
- */
@Override
public String getHeader(final String name) {
final String nameLower = name.toLowerCase(Locale.ENGLISH);
@@ -58,17 +55,11 @@ public class FileItemHeadersImpl implements
FileItemHeaders, Serializable {
return headerValueList.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<String> getHeaderNames() {
return headerNameToValueListMap.keySet().iterator();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<String> getHeaders(final String name) {
final String nameLower = name.toLowerCase(Locale.ENGLISH);
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index 1dc1de02c2..8ad7ebf710 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -258,9 +258,6 @@ public class DataSourceProxy implements PoolConfiguration {
// PROPERTIES WHEN NOT USED WITH FACTORY
/*------------------------------------------------------------------------*/
- /**
- * {@inheritDoc}
- */
@Override
public String getPoolName() {
@@ -272,99 +269,66 @@ public class DataSourceProxy implements PoolConfiguration
{
this.poolProperties = poolProperties;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDriverClassName(String driverClassName) {
this.poolProperties.setDriverClassName(driverClassName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setInitialSize(int initialSize) {
this.poolProperties.setInitialSize(initialSize);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setInitSQL(String initSQL) {
this.poolProperties.setInitSQL(initSQL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLogAbandoned(boolean logAbandoned) {
this.poolProperties.setLogAbandoned(logAbandoned);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxActive(int maxActive) {
this.poolProperties.setMaxActive(maxActive);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxIdle(int maxIdle) {
this.poolProperties.setMaxIdle(maxIdle);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxWait(int maxWait) {
this.poolProperties.setMaxWait(maxWait);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
this.poolProperties.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMinIdle(int minIdle) {
this.poolProperties.setMinIdle(minIdle);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
this.poolProperties.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setPassword(String password) {
@@ -372,81 +336,54 @@ public class DataSourceProxy implements PoolConfiguration
{
this.poolProperties.getDbProperties().setProperty("password",this.poolProperties.getPassword());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRemoveAbandoned(boolean removeAbandoned) {
this.poolProperties.setRemoveAbandoned(removeAbandoned);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
this.poolProperties.setRemoveAbandonedTimeout(removeAbandonedTimeout);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnBorrow(boolean testOnBorrow) {
this.poolProperties.setTestOnBorrow(testOnBorrow);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnConnect(boolean testOnConnect) {
this.poolProperties.setTestOnConnect(testOnConnect);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnReturn(boolean testOnReturn) {
this.poolProperties.setTestOnReturn(testOnReturn);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestWhileIdle(boolean testWhileIdle) {
this.poolProperties.setTestWhileIdle(testWhileIdle);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTimeBetweenEvictionRunsMillis(int
timeBetweenEvictionRunsMillis) {
this.poolProperties.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUrl(String url) {
this.poolProperties.setUrl(url);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUsername(String username) {
@@ -454,108 +391,72 @@ public class DataSourceProxy implements
PoolConfiguration {
this.poolProperties.getDbProperties().setProperty("user",getPoolProperties().getUsername());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationInterval(long validationInterval) {
this.poolProperties.setValidationInterval(validationInterval);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationQuery(String validationQuery) {
this.poolProperties.setValidationQuery(validationQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidatorClassName(String className) {
this.poolProperties.setValidatorClassName(className);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationQueryTimeout(int validationQueryTimeout) {
this.poolProperties.setValidationQueryTimeout(validationQueryTimeout);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setJdbcInterceptors(String interceptors) {
this.getPoolProperties().setJdbcInterceptors(interceptors);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setJmxEnabled(boolean enabled) {
this.getPoolProperties().setJmxEnabled(enabled);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setFairQueue(boolean fairQueue) {
this.getPoolProperties().setFairQueue(fairQueue);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseLock(boolean useLock) {
this.getPoolProperties().setUseLock(useLock);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultCatalog(String catalog) {
this.getPoolProperties().setDefaultCatalog(catalog);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultAutoCommit(Boolean autocommit) {
this.getPoolProperties().setDefaultAutoCommit(autocommit);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultTransactionIsolation(int
defaultTransactionIsolation) {
this.getPoolProperties().setDefaultTransactionIsolation(defaultTransactionIsolation);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setConnectionProperties(String properties) {
@@ -575,9 +476,6 @@ public class DataSourceProxy implements PoolConfiguration {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseEquals(boolean useEquals) {
@@ -642,18 +540,12 @@ public class DataSourceProxy implements PoolConfiguration
{
}
- /**
- * {@inheritDoc}
- */
@Override
public int getSuspectTimeout() {
return getPoolProperties().getSuspectTimeout();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setSuspectTimeout(int seconds) {
@@ -857,45 +749,30 @@ public class DataSourceProxy implements PoolConfiguration
{
// PROPERTIES / CONFIGURATION
//=========================================================
- /**
- * {@inheritDoc}
- */
@Override
public String getConnectionProperties() {
return getPoolProperties().getConnectionProperties();
}
- /**
- * {@inheritDoc}
- */
@Override
public Properties getDbProperties() {
return getPoolProperties().getDbProperties();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDefaultCatalog() {
return getPoolProperties().getDefaultCatalog();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getDefaultTransactionIsolation() {
return getPoolProperties().getDefaultTransactionIsolation();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDriverClassName() {
@@ -903,99 +780,66 @@ public class DataSourceProxy implements PoolConfiguration
{
}
- /**
- * {@inheritDoc}
- */
@Override
public int getInitialSize() {
return getPoolProperties().getInitialSize();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getInitSQL() {
return getPoolProperties().getInitSQL();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getJdbcInterceptors() {
return getPoolProperties().getJdbcInterceptors();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxActive() {
return getPoolProperties().getMaxActive();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxIdle() {
return getPoolProperties().getMaxIdle();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxWait() {
return getPoolProperties().getMaxWait();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMinEvictableIdleTimeMillis() {
return getPoolProperties().getMinEvictableIdleTimeMillis();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMinIdle() {
return getPoolProperties().getMinIdle();
}
- /**
- * {@inheritDoc}
- */
@Override
public long getMaxAge() {
return getPoolProperties().getMaxAge();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getName() {
return getPoolProperties().getName();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getNumTestsPerEvictionRun() {
@@ -1010,9 +854,6 @@ public class DataSourceProxy implements PoolConfiguration {
return "Password not available as DataSource/JMX operation.";
}
- /**
- * {@inheritDoc}
- */
@Override
public int getRemoveAbandonedTimeout() {
@@ -1020,180 +861,120 @@ public class DataSourceProxy implements
PoolConfiguration {
}
- /**
- * {@inheritDoc}
- */
@Override
public int getTimeBetweenEvictionRunsMillis() {
return getPoolProperties().getTimeBetweenEvictionRunsMillis();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getUrl() {
return getPoolProperties().getUrl();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getUsername() {
return getPoolProperties().getUsername();
}
- /**
- * {@inheritDoc}
- */
@Override
public long getValidationInterval() {
return getPoolProperties().getValidationInterval();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getValidationQuery() {
return getPoolProperties().getValidationQuery();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getValidationQueryTimeout() {
return getPoolProperties().getValidationQueryTimeout();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getValidatorClassName() {
return getPoolProperties().getValidatorClassName();
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
return getPoolProperties().getValidator();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidator(Validator validator) {
getPoolProperties().setValidator(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAccessToUnderlyingConnectionAllowed() {
return getPoolProperties().isAccessToUnderlyingConnectionAllowed();
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean isDefaultAutoCommit() {
return getPoolProperties().isDefaultAutoCommit();
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean isDefaultReadOnly() {
return getPoolProperties().isDefaultReadOnly();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isLogAbandoned() {
return getPoolProperties().isLogAbandoned();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPoolSweeperEnabled() {
return getPoolProperties().isPoolSweeperEnabled();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRemoveAbandoned() {
return getPoolProperties().isRemoveAbandoned();
}
- /**
- * {@inheritDoc}
- */
@Override
public int getAbandonWhenPercentageFull() {
return getPoolProperties().getAbandonWhenPercentageFull();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnBorrow() {
return getPoolProperties().isTestOnBorrow();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnConnect() {
return getPoolProperties().isTestOnConnect();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnReturn() {
return getPoolProperties().isTestOnReturn();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestWhileIdle() {
@@ -1201,279 +982,180 @@ public class DataSourceProxy implements
PoolConfiguration {
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean getDefaultAutoCommit() {
return getPoolProperties().getDefaultAutoCommit();
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean getDefaultReadOnly() {
return getPoolProperties().getDefaultReadOnly();
}
- /**
- * {@inheritDoc}
- */
@Override
public InterceptorDefinition[] getJdbcInterceptorsAsArray() {
return getPoolProperties().getJdbcInterceptorsAsArray();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseLock() {
return getPoolProperties().getUseLock();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isFairQueue() {
return getPoolProperties().isFairQueue();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isJmxEnabled() {
return getPoolProperties().isJmxEnabled();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isUseEquals() {
return getPoolProperties().isUseEquals();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAbandonWhenPercentageFull(int percentage) {
getPoolProperties().setAbandonWhenPercentageFull(percentage);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAccessToUnderlyingConnectionAllowed(boolean
accessToUnderlyingConnectionAllowed) {
getPoolProperties().setAccessToUnderlyingConnectionAllowed(accessToUnderlyingConnectionAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDbProperties(Properties dbProperties) {
getPoolProperties().setDbProperties(dbProperties);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultReadOnly(Boolean defaultReadOnly) {
getPoolProperties().setDefaultReadOnly(defaultReadOnly);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxAge(long maxAge) {
getPoolProperties().setMaxAge(maxAge);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setName(String name) {
getPoolProperties().setName(name);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSource(Object ds) {
getPoolProperties().setDataSource(ds);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getDataSource() {
return getPoolProperties().getDataSource();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSourceJNDI(String jndiDS) {
getPoolProperties().setDataSourceJNDI(jndiDS);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDataSourceJNDI() {
return getPoolProperties().getDataSourceJNDI();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAlternateUsernameAllowed() {
return getPoolProperties().isAlternateUsernameAllowed();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAlternateUsernameAllowed(boolean alternateUsernameAllowed) {
getPoolProperties().setAlternateUsernameAllowed(alternateUsernameAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setCommitOnReturn(boolean commitOnReturn) {
getPoolProperties().setCommitOnReturn(commitOnReturn);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getCommitOnReturn() {
return getPoolProperties().getCommitOnReturn();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRollbackOnReturn(boolean rollbackOnReturn) {
getPoolProperties().setRollbackOnReturn(rollbackOnReturn);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getRollbackOnReturn() {
return getPoolProperties().getRollbackOnReturn();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseDisposableConnectionFacade(boolean
useDisposableConnectionFacade) {
getPoolProperties().setUseDisposableConnectionFacade(useDisposableConnectionFacade);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseDisposableConnectionFacade() {
return getPoolProperties().getUseDisposableConnectionFacade();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLogValidationErrors(boolean logValidationErrors) {
getPoolProperties().setLogValidationErrors(logValidationErrors);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getLogValidationErrors() {
return getPoolProperties().getLogValidationErrors();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getPropagateInterruptState() {
return getPoolProperties().getPropagateInterruptState();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setPropagateInterruptState(boolean propagateInterruptState) {
getPoolProperties().setPropagateInterruptState(propagateInterruptState);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIgnoreExceptionOnPreLoad() {
return getPoolProperties().isIgnoreExceptionOnPreLoad();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
getPoolProperties().setIgnoreExceptionOnPreLoad(ignoreExceptionOnPreLoad);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseStatementFacade() {
return getPoolProperties().getUseStatementFacade();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseStatementFacade(boolean useStatementFacade) {
getPoolProperties().setUseStatementFacade(useStatementFacade);
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
index c4addeb7b5..80d90c2b69 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
@@ -219,9 +219,6 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean remove(Object e) {
final ReentrantLock lock = this.lock;
@@ -233,25 +230,16 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int size() {
return items.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<E> iterator() {
return new FairIterator();
}
- /**
- * {@inheritDoc}
- */
@Override
public E poll() {
final ReentrantLock lock = this.lock;
@@ -263,9 +251,6 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean contains(Object e) {
final ReentrantLock lock = this.lock;
@@ -281,9 +266,6 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
//------------------------------------------------------------------
// NOT USED BY CONPOOL IMPLEMENTATION
//------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
@Override
public boolean add(E e) {
return offer(e);
@@ -308,33 +290,21 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
return drainTo(c,Integer.MAX_VALUE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void put(E e) throws InterruptedException {
offer(e);
}
- /**
- * {@inheritDoc}
- */
@Override
public int remainingCapacity() {
return Integer.MAX_VALUE - size();
}
- /**
- * {@inheritDoc}
- */
@Override
public E take() throws InterruptedException {
return this.poll(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean addAll(Collection<? extends E> c) {
Iterator<? extends E> i = c.iterator();
@@ -364,9 +334,6 @@ public class FairBlockingQueue<E> implements
BlockingQueue<E> {
throw new UnsupportedOperationException("boolean
containsAll(Collection<?> c)");
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEmpty() {
return size() == 0;
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
index addcd9dfe6..30e94c67f4 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
@@ -209,9 +209,6 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean remove(Object e) {
for (int idx=0; idx<LOCK_COUNT; idx++) {
@@ -229,9 +226,6 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public int size() {
int size = 0;
@@ -241,17 +235,11 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
return size;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<E> iterator() {
return new FairIterator();
}
- /**
- * {@inheritDoc}
- */
@Override
public E poll() {
int idx = getNextPoll();
@@ -264,9 +252,6 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean contains(Object e) {
for (int idx=0; idx<LOCK_COUNT; idx++) {
@@ -282,9 +267,6 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
//------------------------------------------------------------------
// NOT USED BY CONPOOL IMPLEMENTATION
//------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
@Override
public boolean add(E e) {
return offer(e);
@@ -308,33 +290,21 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
return drainTo(c,Integer.MAX_VALUE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void put(E e) throws InterruptedException {
offer(e);
}
- /**
- * {@inheritDoc}
- */
@Override
public int remainingCapacity() {
return Integer.MAX_VALUE - size();
}
- /**
- * {@inheritDoc}
- */
@Override
public E take() throws InterruptedException {
return this.poll(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean addAll(Collection<? extends E> c) {
Iterator<? extends E> i = c.iterator();
@@ -364,9 +334,6 @@ public class MultiLockFairBlockingQueue<E> implements
BlockingQueue<E> {
throw new UnsupportedOperationException("boolean
containsAll(Collection<?> c)");
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEmpty() {
return size() == 0;
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index 73479e250c..4588449cf5 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -91,9 +91,6 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
private volatile boolean ignoreExceptionOnPreLoad = false;
private volatile boolean useStatementFacade = true;
- /**
- * {@inheritDoc}
- */
@Override
public void setAbandonWhenPercentageFull(int percentage) {
if (percentage<0) {
@@ -105,318 +102,210 @@ public class PoolProperties implements
PoolConfiguration, Cloneable, Serializabl
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int getAbandonWhenPercentageFull() {
return abandonWhenPercentageFull;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isFairQueue() {
return fairQueue;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setFairQueue(boolean fairQueue) {
this.fairQueue = fairQueue;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAccessToUnderlyingConnectionAllowed() {
return accessToUnderlyingConnectionAllowed;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getConnectionProperties() {
return connectionProperties;
}
- /**
- * {@inheritDoc}
- */
@Override
public Properties getDbProperties() {
return dbProperties;
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean isDefaultAutoCommit() {
return defaultAutoCommit;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDefaultCatalog() {
return defaultCatalog;
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean isDefaultReadOnly() {
return defaultReadOnly;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getDefaultTransactionIsolation() {
return defaultTransactionIsolation;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDriverClassName() {
return driverClassName;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getInitialSize() {
return initialSize;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isLogAbandoned() {
return logAbandoned;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxActive() {
return maxActive;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxIdle() {
return maxIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMaxWait() {
return maxWait;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMinEvictableIdleTimeMillis() {
return minEvictableIdleTimeMillis;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMinIdle() {
return minIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getNumTestsPerEvictionRun() {
return numTestsPerEvictionRun;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getPassword() {
return password;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getPoolName() {
return getName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRemoveAbandoned() {
return removeAbandoned;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getRemoveAbandonedTimeout() {
return removeAbandonedTimeout;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnBorrow() {
return testOnBorrow;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnReturn() {
return testOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestWhileIdle() {
return testWhileIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getTimeBetweenEvictionRunsMillis() {
return timeBetweenEvictionRunsMillis;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getUrl() {
return url;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getUsername() {
return username;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getValidationQuery() {
return validationQuery;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getValidationQueryTimeout() {
return validationQueryTimeout;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationQueryTimeout(int validationQueryTimeout) {
this.validationQueryTimeout = validationQueryTimeout;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getValidatorClassName() {
return validatorClassName;
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
return validator;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidator(Validator validator) {
this.validator = validator;
@@ -428,45 +317,30 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
}
- /**
- * {@inheritDoc}
- */
@Override
public long getValidationInterval() {
return validationInterval;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getInitSQL() {
return initSQL;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTestOnConnect() {
return testOnConnect;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getJdbcInterceptors() {
return jdbcInterceptors;
}
- /**
- * {@inheritDoc}
- */
@Override
public InterceptorDefinition[] getJdbcInterceptorsAsArray() {
@@ -502,18 +376,12 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
return interceptors;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAccessToUnderlyingConnectionAllowed(boolean
accessToUnderlyingConnectionAllowed) {
// NOOP
}
- /**
- * {@inheritDoc}
- */
@Override
public void setConnectionProperties(String connectionProperties) {
@@ -521,198 +389,132 @@ public class PoolProperties implements
PoolConfiguration, Cloneable, Serializabl
getProperties(connectionProperties, getDbProperties());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDbProperties(Properties dbProperties) {
this.dbProperties = dbProperties;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultAutoCommit(Boolean defaultAutoCommit) {
this.defaultAutoCommit = defaultAutoCommit;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultCatalog(String defaultCatalog) {
this.defaultCatalog = defaultCatalog;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultReadOnly(Boolean defaultReadOnly) {
this.defaultReadOnly = defaultReadOnly;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDefaultTransactionIsolation(int
defaultTransactionIsolation) {
this.defaultTransactionIsolation = defaultTransactionIsolation;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDriverClassName(String driverClassName) {
this.driverClassName = driverClassName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setInitialSize(int initialSize) {
this.initialSize = initialSize;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLogAbandoned(boolean logAbandoned) {
this.logAbandoned = logAbandoned;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxActive(int maxActive) {
this.maxActive = maxActive;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxIdle(int maxIdle) {
this.maxIdle = maxIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxWait(int maxWait) {
this.maxWait = maxWait;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMinIdle(int minIdle) {
this.minIdle = minIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setName(String name) {
this.name = name;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
this.numTestsPerEvictionRun = numTestsPerEvictionRun;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setPassword(String password) {
this.password = password;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRemoveAbandoned(boolean removeAbandoned) {
this.removeAbandoned = removeAbandoned;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
this.removeAbandonedTimeout = removeAbandonedTimeout;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnBorrow(boolean testOnBorrow) {
this.testOnBorrow = testOnBorrow;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestWhileIdle(boolean testWhileIdle) {
this.testWhileIdle = testWhileIdle;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnReturn(boolean testOnReturn) {
this.testOnReturn = testOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTimeBetweenEvictionRunsMillis(int
@@ -720,45 +522,30 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUrl(String url) {
this.url = url;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUsername(String username) {
this.username = username;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationInterval(long validationInterval) {
this.validationInterval = validationInterval;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationQuery(String validationQuery) {
this.validationQuery = validationQuery;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidatorClassName(String className) {
@@ -790,27 +577,18 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void setInitSQL(String initSQL) {
this.initSQL = initSQL!=null && initSQL.trim().length()>0 ? initSQL :
null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setTestOnConnect(boolean testOnConnect) {
this.testOnConnect = testOnConnect;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setJdbcInterceptors(String jdbcInterceptors) {
@@ -860,36 +638,24 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
return poolCounter.get();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isJmxEnabled() {
return jmxEnabled;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setJmxEnabled(boolean jmxEnabled) {
this.jmxEnabled = jmxEnabled;
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean getDefaultAutoCommit() {
return defaultAutoCommit;
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean getDefaultReadOnly() {
@@ -897,27 +663,18 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
}
- /**
- * {@inheritDoc}
- */
@Override
public int getSuspectTimeout() {
return this.suspectTimeout;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setSuspectTimeout(int seconds) {
this.suspectTimeout = seconds;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPoolSweeperEnabled() {
@@ -1112,54 +869,36 @@ public class PoolProperties implements
PoolConfiguration, Cloneable, Serializabl
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isUseEquals() {
return useEquals;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseEquals(boolean useEquals) {
this.useEquals = useEquals;
}
- /**
- * {@inheritDoc}
- */
@Override
public long getMaxAge() {
return maxAge;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setMaxAge(long maxAge) {
this.maxAge = maxAge;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseLock() {
return useLock;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseLock(boolean useLock) {
@@ -1167,9 +906,6 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSource(Object ds) {
if (ds instanceof DataSourceProxy) {
@@ -1178,26 +914,17 @@ public class PoolProperties implements
PoolConfiguration, Cloneable, Serializabl
this.dataSource = ds;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getDataSource() {
return dataSource;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSourceJNDI(String jndiDS) {
this.dataSourceJNDI = jndiDS;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDataSourceJNDI() {
return this.dataSourceJNDI;
@@ -1218,130 +945,82 @@ public class PoolProperties implements
PoolConfiguration, Cloneable, Serializabl
return props;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAlternateUsernameAllowed() {
return alternateUsernameAllowed;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAlternateUsernameAllowed(boolean alternateUsernameAllowed) {
this.alternateUsernameAllowed = alternateUsernameAllowed;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setCommitOnReturn(boolean commitOnReturn) {
this.commitOnReturn = commitOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getCommitOnReturn() {
return this.commitOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRollbackOnReturn(boolean rollbackOnReturn) {
this.rollbackOnReturn = rollbackOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getRollbackOnReturn() {
return this.rollbackOnReturn;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseDisposableConnectionFacade(boolean
useDisposableConnectionFacade) {
this.useDisposableConnectionFacade = useDisposableConnectionFacade;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseDisposableConnectionFacade() {
return useDisposableConnectionFacade;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLogValidationErrors(boolean logValidationErrors) {
this.logValidationErrors = logValidationErrors;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getLogValidationErrors() {
return this.logValidationErrors;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getPropagateInterruptState() {
return propagateInterruptState;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setPropagateInterruptState(boolean propagateInterruptState) {
this.propagateInterruptState = propagateInterruptState;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIgnoreExceptionOnPreLoad() {
return ignoreExceptionOnPreLoad;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
this.ignoreExceptionOnPreLoad = ignoreExceptionOnPreLoad;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseStatementFacade() {
return useStatementFacade;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseStatementFacade(boolean useStatementFacade) {
this.useStatementFacade = useStatementFacade;
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
index d2ef64784c..44866e0efd 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
@@ -58,9 +58,6 @@ public abstract class AbstractCreateStatementInterceptor
extends JdbcIntercepto
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
if (compare(CLOSE_VAL,method)) {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
index 4198d3759e..a3eccadb0b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
@@ -167,9 +167,6 @@ public class SlowQueryReport extends AbstractQueryReport {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void poolStarted(ConnectionPool pool) {
super.poolStarted(pool);
@@ -187,9 +184,6 @@ public class SlowQueryReport extends AbstractQueryReport {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void poolClosed(ConnectionPool pool) {
perPoolStats.remove(pool.getName());
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
index faf73f2391..dc2c40bc5f 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
@@ -394,18 +394,12 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
return getPoolProperties().getValidationQueryTimeout();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getValidatorClassName() {
return getPoolProperties().getValidatorClassName();
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
@@ -782,216 +776,138 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
getPoolProperties().setValidationQueryTimeout(validationQueryTimeout);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidatorClassName(String className) {
getPoolProperties().setValidatorClassName(className);
}
- /**
- * {@inheritDoc}
- */
@Override
public int getSuspectTimeout() {
return getPoolProperties().getSuspectTimeout();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setSuspectTimeout(int seconds) {
getPoolProperties().setSuspectTimeout(seconds);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSource(Object ds) {
getPoolProperties().setDataSource(ds);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getDataSource() {
return getPoolProperties().getDataSource();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setDataSourceJNDI(String jndiDS) {
getPoolProperties().setDataSourceJNDI(jndiDS);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDataSourceJNDI() {
return getPoolProperties().getDataSourceJNDI();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAlternateUsernameAllowed() {
return getPoolProperties().isAlternateUsernameAllowed();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setAlternateUsernameAllowed(boolean alternateUsernameAllowed) {
getPoolProperties().setAlternateUsernameAllowed(alternateUsernameAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidator(Validator validator) {
getPoolProperties().setValidator(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setCommitOnReturn(boolean commitOnReturn) {
getPoolProperties().setCommitOnReturn(commitOnReturn);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getCommitOnReturn() {
return getPoolProperties().getCommitOnReturn();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRollbackOnReturn(boolean rollbackOnReturn) {
getPoolProperties().setRollbackOnReturn(rollbackOnReturn);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getRollbackOnReturn() {
return getPoolProperties().getRollbackOnReturn();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseDisposableConnectionFacade(boolean
useDisposableConnectionFacade) {
getPoolProperties().setUseDisposableConnectionFacade(useDisposableConnectionFacade);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseDisposableConnectionFacade() {
return getPoolProperties().getUseDisposableConnectionFacade();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLogValidationErrors(boolean logValidationErrors) {
getPoolProperties().setLogValidationErrors(logValidationErrors);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getLogValidationErrors() {
return getPoolProperties().getLogValidationErrors();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getPropagateInterruptState() {
return getPoolProperties().getPropagateInterruptState();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setPropagateInterruptState(boolean propagateInterruptState) {
getPoolProperties().setPropagateInterruptState(propagateInterruptState);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIgnoreExceptionOnPreLoad() {
return getPoolProperties().isIgnoreExceptionOnPreLoad();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
// noop - this pool is already running
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean getUseStatementFacade() {
return getPoolProperties().getUseStatementFacade();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setUseStatementFacade(boolean useStatementFacade) {
getPoolProperties().setUseStatementFacade(useStatementFacade);
}
- /**
- * {@inheritDoc}
- */
@Override
public void purge() {
pool.purge();
}
- /**
- * {@inheritDoc}
- */
@Override
public void purgeOnReturn() {
pool.purgeOnReturn();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
