This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit c45d98842966313b364b1d9353ec1a412a93d5fb Author: Andrus Adamchik <[email protected]> AuthorDate: Fri Jul 3 12:21:14 2026 -0400 cleanup --- .../access/flush/DefaultDataDomainFlushAction.java | 25 ++++++++-------- .../translator/sqltemplate/TranslatedSQL.java | 2 +- .../org/apache/cayenne/query/DeleteBatchQuery.java | 33 ++++++++-------------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java index d4c3de940..e973bea29 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java @@ -19,16 +19,6 @@ package org.apache.cayenne.access.flush; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.ObjectId; import org.apache.cayenne.access.DataContext; @@ -37,9 +27,9 @@ import org.apache.cayenne.access.ObjectDiff; import org.apache.cayenne.access.ObjectStore; import org.apache.cayenne.access.ObjectStoreGraphDiff; import org.apache.cayenne.access.OperationObserver; +import org.apache.cayenne.access.flush.operation.DbRowOp; import org.apache.cayenne.access.flush.operation.DbRowOpMerger; import org.apache.cayenne.access.flush.operation.DbRowOpSorter; -import org.apache.cayenne.access.flush.operation.DbRowOp; import org.apache.cayenne.access.flush.operation.DbRowOpVisitor; import org.apache.cayenne.access.flush.operation.DeleteDbRowOp; import org.apache.cayenne.access.flush.operation.DeleteDbRowOpFactory; @@ -52,6 +42,16 @@ import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.Query; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + /** * Default implementation of {@link DataDomainFlushAction}. * @@ -80,12 +80,11 @@ public class DefaultDataDomainFlushAction implements DataDomainFlushAction { if (changes == null) { return afterCommitDiff; } - if(!(changes instanceof ObjectStoreGraphDiff)) { + if(!(changes instanceof ObjectStoreGraphDiff objectStoreGraphDiff)) { throw new CayenneRuntimeException("Instance of ObjectStoreGraphDiff expected, got %s", changes.getClass()); } ObjectStore objectStore = context.getObjectStore(); - ObjectStoreGraphDiff objectStoreGraphDiff = (ObjectStoreGraphDiff) changes; List<DbRowOp> dbRowOps = createDbRowOps(objectStore, objectStoreGraphDiff); updateObjectIds(dbRowOps); diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java index 6e8bc8d56..7393debce 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java @@ -25,7 +25,7 @@ import org.apache.cayenne.access.jdbc.PSParameter; /** * A translated form of a Query used to generated PreparedStatements. * - * @since 1.1 + * @since 5.0 */ public record TranslatedSQL( String sql, diff --git a/cayenne/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java index db3f0b02d..ca857c6fc 100644 --- a/cayenne/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java +++ b/cayenne/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java @@ -19,17 +19,17 @@ package org.apache.cayenne.query; +import org.apache.cayenne.map.DbAttribute; +import org.apache.cayenne.map.DbEntity; + import java.util.Collection; import java.util.List; import java.util.Map; import java.util.function.Supplier; -import org.apache.cayenne.map.DbAttribute; -import org.apache.cayenne.map.DbEntity; - /** * Batched delete query. - * + * */ public class DeleteBatchQuery extends BatchQuery { @@ -37,20 +37,11 @@ public class DeleteBatchQuery extends BatchQuery { private Collection<String> nullQualifierNames; - /** - * Creates new DeleteBatchQuery. - * - * @param dbEntity - * Table or view to delete. - * @param qualifierAttributes - * DbAttributes used in the WHERE clause. - * @param nullQualifierNames - * DbAttribute names in the WHERE clause that have null values. - * @param batchCapacity - * Estimated size of the batch. - */ - public DeleteBatchQuery(DbEntity dbEntity, List<DbAttribute> qualifierAttributes, - Collection<String> nullQualifierNames, int batchCapacity) { + public DeleteBatchQuery( + DbEntity dbEntity, + List<DbAttribute> qualifierAttributes, + Collection<String> nullQualifierNames, + int batchCapacity) { super(dbEntity, qualifierAttributes, batchCapacity); @@ -63,7 +54,7 @@ public class DeleteBatchQuery extends BatchQuery { /** * Returns true if a given attribute always has a null value in the batch. - * + * * @since 1.2 */ public boolean isNull(DbAttribute attribute) { @@ -72,7 +63,7 @@ public class DeleteBatchQuery extends BatchQuery { /** * Returns true if the batch query uses optimistic locking. - * + * * @since 1.2 */ @Override @@ -93,7 +84,7 @@ public class DeleteBatchQuery extends BatchQuery { @Override public Object getValue(int i) { Object value = qualifier.get(dbAttributes.get(i).getName()); - if(value instanceof Supplier) { + if (value instanceof Supplier) { return ((Supplier) value).get(); } return value;
