This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c1c4ee5d67980b2f8de28bb42932faf8d4ebb1c5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 11 10:10:27 2022 +0000
Revert "Cherry-pick DBCP2 Javadoc fix"
This reverts commit 0a9afdfa6a481b29a954a67cf6ea352043201ed0.
---
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 7 --
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 77 ----------------------
webapps/docs/changelog.xml | 5 ++
3 files changed, 5 insertions(+), 84 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index b0562e8..f260a53 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1063,7 +1063,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @return the maximum permitted duration of a connection.
* @since 2.10.0
*/
- @Override
public Duration getMaxConnDuration() {
return maxConnDuration;
}
@@ -1123,7 +1122,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @return the maxWaitDuration property value.
* @since 2.10.0
*/
- @Override
public synchronized Duration getMaxWaitDuration() {
return this.maxWaitDuration;
}
@@ -1148,7 +1146,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @see #setMinEvictableIdle(Duration)
* @since 2.10.0
*/
- @Override
public synchronized Duration getMinEvictableIdleDuration() {
return this.minEvictableIdleDuration;
}
@@ -1326,7 +1323,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @return Timeout before an abandoned connection can be removed.
* @since 2.10.0
*/
- @Override
public Duration getRemoveAbandonedTimeoutDuration() {
return abandonedConfig == null ? Duration.ofSeconds(300) :
abandonedConfig.getRemoveAbandonedTimeoutDuration();
}
@@ -1356,7 +1352,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* there are minIdle idle connections in the pool
* @since 2.10.0
*/
- @Override
public synchronized Duration getSoftMinEvictableIdleDuration() {
return softMinEvictableIdleDuration;
}
@@ -1433,7 +1428,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @see #setDurationBetweenEvictionRuns(Duration)
* @since 2.10.0
*/
- @Override
public synchronized Duration getDurationBetweenEvictionRuns() {
return this.durationBetweenEvictionRuns;
}
@@ -1487,7 +1481,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return the timeout in seconds before connection validation queries
fail.
*/
- @Override
public Duration getValidationQueryTimeoutDuration() {
return validationQueryTimeoutDuration;
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
b/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
index a6d522b..7315c58 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
@@ -17,7 +17,6 @@
package org.apache.tomcat.dbcp.dbcp2;
import java.sql.SQLException;
-import java.time.Duration;
/**
* Defines the methods that will be made available via
@@ -139,21 +138,10 @@ public interface DataSourceMXBean {
boolean getLogExpiredConnections();
/**
- * See {@link BasicDataSource#getMaxConnDuration()}.
- *
- * @return {@link BasicDataSource#getMaxConnDuration()}.
- * @since 2.10.0
- */
- Duration getMaxConnDuration();
-
- /**
* See {@link BasicDataSource#getMaxConnLifetimeMillis()}.
*
* @return {@link BasicDataSource#getMaxConnLifetimeMillis()}.
- *
- * @deprecated Use {@link #getMaxConnDuration()}.
*/
- @Deprecated
long getMaxConnLifetimeMillis();
/**
@@ -178,39 +166,17 @@ public interface DataSourceMXBean {
int getMaxTotal();
/**
- * See {@link BasicDataSource#getMaxWaitDuration()}.
- *
- * @return {@link BasicDataSource#getMaxWaitDuration()}.
- * @since 2.10.0
- */
- Duration getMaxWaitDuration();
-
- /**
* See {@link BasicDataSource#getMaxWaitMillis()}.
*
* @return {@link BasicDataSource#getMaxWaitMillis()}.
- *
- * @deprecated Use {@link #getMaxWaitDuration()}.
*/
- @Deprecated
long getMaxWaitMillis();
/**
- * See {@link BasicDataSource#getMinEvictableIdleDuration()}.
- *
- * @return {@link BasicDataSource#getMinEvictableIdleDuration()}.
- * @since 2.10.0
- */
- Duration getMinEvictableIdleDuration();
-
- /**
* See {@link BasicDataSource#getMinEvictableIdleTimeMillis()}.
*
* @return {@link BasicDataSource#getMinEvictableIdleTimeMillis()}.
- *
- * @deprecated Use {@link #getMinEvictableIdleDuration()}.
*/
- @Deprecated
long getMinEvictableIdleTimeMillis();
/**
@@ -256,39 +222,17 @@ public interface DataSourceMXBean {
boolean getRemoveAbandonedOnMaintenance();
/**
- * See {@link BasicDataSource#getRemoveAbandonedTimeoutDuration()}.
- *
- * @return {@link BasicDataSource#getRemoveAbandonedTimeoutDuration()}.
- * @since 2.10.0
- */
- Duration getRemoveAbandonedTimeoutDuration();
-
- /**
* See {@link BasicDataSource#getRemoveAbandonedTimeout()}.
*
* @return {@link BasicDataSource#getRemoveAbandonedTimeout()}.
- *
- * @deprecated Use {@link #getRemoveAbandonedTimeoutDuration()}.
*/
- @Deprecated
int getRemoveAbandonedTimeout();
/**
- * See {@link BasicDataSource#getSoftMinEvictableIdleDuration()}.
- *
- * @return {@link BasicDataSource#getSoftMinEvictableIdleDuration()}.
- * @since 2.10.0
- */
- Duration getSoftMinEvictableIdleDuration();
-
- /**
* See {@link BasicDataSource#getSoftMinEvictableIdleTimeMillis()}.
*
* @return {@link BasicDataSource#getSoftMinEvictableIdleTimeMillis()}.
- *
- * @deprecated Use {@link #getSoftMinEvictableIdleDuration()}.
*/
- @Deprecated
long getSoftMinEvictableIdleTimeMillis();
/**
@@ -313,20 +257,10 @@ public interface DataSourceMXBean {
boolean getTestWhileIdle();
/**
- * See {@link BasicDataSource#getDurationBetweenEvictionRuns()}.
- *
- * @return {@link BasicDataSource#getDurationBetweenEvictionRuns()}.
- * @since 2.10.0
- */
- Duration getDurationBetweenEvictionRuns();
-
- /**
* See {@link BasicDataSource#getTimeBetweenEvictionRunsMillis()}.
*
* @return {@link BasicDataSource#getTimeBetweenEvictionRunsMillis()}.
- * @deprecated Use {@link #getDurationBetweenEvictionRuns()}.
*/
- @Deprecated
long getTimeBetweenEvictionRunsMillis();
/**
@@ -351,21 +285,10 @@ public interface DataSourceMXBean {
String getValidationQuery();
/**
- * See {@link BasicDataSource#getValidationQueryTimeoutDuration()}.
- *
- * @return {@link BasicDataSource#getValidationQueryTimeoutDuration()}.
- * @since 2.10.0
- */
- Duration getValidationQueryTimeoutDuration();
-
- /**
* See {@link BasicDataSource#getValidationQueryTimeout()}.
*
* @return {@link BasicDataSource#getValidationQueryTimeout()}.
- *
- * @deprecated Use {@link #getValidationQueryTimeoutDuration()}.
*/
- @Deprecated
int getValidationQueryTimeout();
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4f4d576..9829b59 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -213,6 +213,11 @@
<update>
Update the OWB module to Apache OpenWebBeans 2.0.26. (remm)
</update>
+ <fix>
+ Revert the cherry-pick of JavaDoc fix from DBCP applied in 10.1.0.M9
+ that broke the <code>DataSourceMXBean</code> by using a type that isn't
+ supported by MXBeans. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
