This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push: new 48380c068 fix JavaDoc warnings and minor code cleanup 48380c068 is described below commit 48380c06867a185aa66febf4a8e8908257d16bc5 Author: Nikita Timofeev <stari...@gmail.com> AuthorDate: Fri Nov 11 17:03:59 2022 +0300 fix JavaDoc warnings and minor code cleanup --- .../datasource/ManagedPoolingDataSource.java | 6 ++-- .../cayenne/exp/property/ComparableProperty.java | 34 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/ManagedPoolingDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/ManagedPoolingDataSource.java index 7d60a511a..800819dc9 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/ManagedPoolingDataSource.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/ManagedPoolingDataSource.java @@ -36,7 +36,7 @@ import org.apache.cayenne.di.ScopeEventListener; */ public class ManagedPoolingDataSource implements PoolingDataSource, ScopeEventListener { - private PoolingDataSourceManager dataSourceManager; + private final PoolingDataSourceManager dataSourceManager; private DataSource dataSource; public ManagedPoolingDataSource(UnmanagedPoolingDataSource dataSource) { @@ -68,7 +68,7 @@ public class ManagedPoolingDataSource implements PoolingDataSource, ScopeEventLi } /** - * Calls {@link #shutdown()} to drain the underlying pool, close open + * Calls {@link #close()} to drain the underlying pool, close open * connections and block the DataSource from creating any new connections. */ @Override @@ -109,7 +109,7 @@ public class ManagedPoolingDataSource implements PoolingDataSource, ScopeEventLi @Override public boolean isWrapperFor(Class<?> iface) throws SQLException { - return (ManagedPoolingDataSource.class.equals(iface)) ? true : dataSource.isWrapperFor(iface); + return ManagedPoolingDataSource.class.equals(iface) || dataSource.isWrapperFor(iface); } @Override diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java index 752f19959..ef218f998 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/ComparableProperty.java @@ -127,85 +127,85 @@ public interface ComparableProperty<E> extends Property<E> { /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "< ALL (subquery)" SQL + * @return {@link Expression} that translates to a "< ALL (subquery)" SQL * @since 5.0 */ default Expression ltAll(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.lessExp(getExpression(), ExpressionFactory.all(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "<= ALL (subquery)" SQL + * @return {@link Expression} that translates to a "<= ALL (subquery)" SQL * @since 5.0 */ default Expression lteAll(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.lessOrEqualExp(getExpression(), ExpressionFactory.all(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "> ALL (subquery)" SQL + * @return {@link Expression} that translates to a "> ALL (subquery)" SQL * @since 5.0 */ default Expression gtAll(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.greaterExp(getExpression(), ExpressionFactory.all(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a ">= ALL (subquery)" SQL + * @return {@link Expression} that translates to a ">= ALL (subquery)" SQL * @since 5.0 */ default Expression gteAll(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.greaterOrEqualExp(getExpression(), ExpressionFactory.all(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "< ANY (subquery)" SQL + * @return {@link Expression} that translates to a "< ANY (subquery)" SQL * @since 5.0 */ default Expression ltAny(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.lessExp(getExpression(), ExpressionFactory.any(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "<= ANY (subquery)" SQL + * @return {@link Expression} that translates to a "<= ANY (subquery)" SQL * @since 5.0 */ default Expression lteAny(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.lessOrEqualExp(getExpression(), ExpressionFactory.any(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a "> ANY (subquery)" SQL + * @return {@link Expression} that translates to a "> ANY (subquery)" SQL * @since 5.0 */ default Expression gtAny(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.greaterExp(getExpression(), ExpressionFactory.any(subquery)); } /** * @param subquery to use, must be a single column query. - * @return {@link Expression} that translates to a ">= ANY (subquery)" SQL + * @return {@link Expression} that translates to a ">= ANY (subquery)" SQL * @since 5.0 */ default Expression gteAny(ColumnSelect<E> subquery) { - assertValidateSubqueryForComparison(subquery); + assertSubqueryIsValidForComparison(subquery); return ExpressionFactory.greaterOrEqualExp(getExpression(), ExpressionFactory.any(subquery)); } - private static <E> void assertValidateSubqueryForComparison(ColumnSelect<E> subquery) { + private static <E> void assertSubqueryIsValidForComparison(ColumnSelect<E> subquery) { if(subquery.getColumns().size() != 1) { throw new CayenneRuntimeException("Only single-column query could be used in the comparison."); }