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
The following commit(s) were added to refs/heads/master by this push:
new 6b01d66fb cleanup
6b01d66fb is described below
commit 6b01d66fbba3c4b00df99b11cae175cab8d8114c
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat May 30 18:22:05 2026 -0400
cleanup
---
.../cayenne/access/DataContextDeleteAction.java | 12 +++------
.../cayenne/access/DataDomainQueryAction.java | 30 ++++++++++------------
.../org/apache/cayenne/access/OperationHints.java | 5 ++--
.../apache/cayenne/access/OperationObserver.java | 5 ++--
4 files changed, 21 insertions(+), 31 deletions(-)
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
index b14126f37..9d0a7d9b0 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
@@ -53,7 +53,7 @@ class DataContextDeleteAction {
this.context = context;
}
- boolean performDelete(Persistent object) throws DeleteDenyException {
+ void performDelete(Persistent object) throws DeleteDenyException {
int oldState = object.getPersistenceState();
@@ -63,7 +63,7 @@ class DataContextDeleteAction {
// into a horrible recursive loop due to CASCADE delete rules.
// Assume that everything must have been done correctly already
// and *don't* do it again
- return false;
+ return;
}
if (object.getObjectContext() == null) {
@@ -88,8 +88,6 @@ class DataContextDeleteAction {
} else {
deletePersistent(object);
}
-
- return true;
}
private void deleteNew(Persistent object) throws DeleteDenyException {
@@ -117,13 +115,11 @@ class DataContextDeleteAction {
return switch (object) {
case null -> Collections.emptyList();
-
// create copies of collections to avoid iterator exceptions
- case Collection ignored -> new
ArrayList<>((Collection<Persistent>) object);
- case Map ignored -> new ArrayList<>(((Map<?, Persistent>)
object).values());
+ case Collection<?> ignored -> new
ArrayList<>((Collection<Persistent>) object);
+ case Map<?, ?> ignored -> new ArrayList<>(((Map<?, Persistent>)
object).values());
default -> Collections.singleton((Persistent) object);
};
-
}
private void processDeleteRules(final Persistent object, int oldState)
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
index 7434da3d8..0978c1a73 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
@@ -210,9 +210,8 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
}
private boolean interceptOIDQuery() {
- if (query instanceof ObjectIdQuery) {
+ if (query instanceof ObjectIdQuery oidQuery) {
- ObjectIdQuery oidQuery = (ObjectIdQuery) query;
ObjectId oid = oidQuery.getObjectId();
// special handling of temp ids...
@@ -280,9 +279,8 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
private boolean interceptRelationshipQuery() {
- if (query instanceof RelationshipQuery) {
+ if (query instanceof RelationshipQuery relationshipQuery) {
- RelationshipQuery relationshipQuery = (RelationshipQuery) query;
if (relationshipQuery.isRefreshing()) {
return !DONE;
}
@@ -296,7 +294,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
// we can assume that there is one and only one DbRelationship as
// we previously checked that
"!isSourceIndependentFromTargetChange"
- DbRelationship dbRelationship =
relationship.getDbRelationships().get(0);
+ DbRelationship dbRelationship =
relationship.getDbRelationships().getFirst();
// FK pointing to a unique field that is a 'fake' PK (CAY-1755)...
// It is not sufficient to generate target ObjectId.
@@ -398,7 +396,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
return DONE;
}
- // 3. refresh query - this shouldn't normally happen as child
datacontext
+ // 3. refresh query - this shouldn't normally happen as child
context
// usually does a cascading refresh
if (refreshQuery.getQuery() != null) {
Query cachedQuery = refreshQuery.getQuery();
@@ -582,9 +580,9 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
converter = new SingleObjectConversionStrategy();
} else {
if (metadata.isSingleResultSetMapping()) {
- if (rsMapping.get(0) instanceof EntityResultSegment) {
+ if (rsMapping.getFirst() instanceof EntityResultSegment) {
converter = new SingleObjectConversionStrategy();
- } else if (rsMapping.get(0) instanceof
EmbeddableResultSegment) {
+ } else if (rsMapping.getFirst() instanceof
EmbeddableResultSegment) {
converter = new SingleEmbeddableConversionStrategy();
} else {
converter = new SingleScalarConversionStrategy();
@@ -669,8 +667,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
@Override
public void nextRows(Query query, List<?> dataRows) {
// exclude prefetched rows in the main result
- if (prefetchResultsByPath != null && query instanceof
PrefetchSelectQuery) {
- PrefetchSelectQuery<?> prefetchQuery = (PrefetchSelectQuery<?>)
query;
+ if (prefetchResultsByPath != null && query instanceof
PrefetchSelectQuery<?> prefetchQuery) {
prefetchResultsByPath.put(prefetchQuery.getPrefetchPath(),
dataRows);
} else {
fullResponse.addResultList(dataRows);
@@ -680,8 +677,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
@Override
public void nextRows(Query q, ResultIterator<?> it) {
// exclude prefetched rows in the main result
- if (prefetchResultsByPath != null && query instanceof
PrefetchSelectQuery) {
- PrefetchSelectQuery<?> prefetchQuery = (PrefetchSelectQuery<?>)
query;
+ if (prefetchResultsByPath != null && query instanceof
PrefetchSelectQuery<?> prefetchQuery) {
prefetchResultsByPath.put(prefetchQuery.getPrefetchPath(),
(List<?>) it);
} else {
this.fullResponse.addResultIterator(it);
@@ -790,7 +786,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
@Override
Persistent convert(DataRow dataRow) {
PrefetchProcessorNode node =
getPrefetchProcessorNode(Collections.singletonList(dataRow));
- return node.getObjects().get(0);
+ return node.getObjects().getFirst();
}
private PrefetchProcessorNode getPrefetchProcessorNode(List<DataRow>
mainRows) {
@@ -799,7 +795,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
List<Object> rsMapping = metadata.getResultSetMapping();
EntityResultSegment resultSegment = null;
if (rsMapping != null && !rsMapping.isEmpty()) {
- resultSegment = (EntityResultSegment) rsMapping.get(0);
+ resultSegment = (EntityResultSegment) rsMapping.getFirst();
}
ClassDescriptor descriptor = resultSegment == null
@@ -829,7 +825,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
@Override
List<EmbeddableObject> convert(List<DataRow> mainRows) {
- EmbeddableResultSegment resultSegment = (EmbeddableResultSegment)
metadata.getResultSetMapping().get(0);
+ EmbeddableResultSegment resultSegment = (EmbeddableResultSegment)
metadata.getResultSetMapping().getFirst();
Embeddable embeddable = resultSegment.getEmbeddable();
Class<? extends EmbeddableObject> embeddableClass =
objectFactory.getJavaClass(embeddable.getClassName());
List<EmbeddableObject> result = new ArrayList<>(mainRows.size());
@@ -849,7 +845,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
@Override
EmbeddableObject convert(DataRow dataRow) {
- return convert(Collections.singletonList(dataRow)).get(0);
+ return convert(Collections.singletonList(dataRow)).getFirst();
}
}
@@ -895,7 +891,7 @@ class DataDomainQueryAction implements QueryRouter,
OperationObserver {
Object[] convert(Object[] objectsArray) {
List<Object[]> objects = new ArrayList<>(1);
objects.add(objectsArray);
- return convert(objects).get(0);
+ return convert(objects).getFirst();
}
private List<Object[]> createResultList(List<Object[]> mainRows,
boolean needConversion) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/OperationHints.java
b/cayenne/src/main/java/org/apache/cayenne/access/OperationHints.java
index a69370a6b..8d8003a6e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/OperationHints.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/OperationHints.java
@@ -20,8 +20,7 @@
package org.apache.cayenne.access;
/**
- * Defines API that allows QueryEngine to obtain information about query
execution
- * strategy.
+ * Defines API that allows QueryEngine to obtain information about query
execution strategy.
*
*/
public interface OperationHints {
@@ -31,5 +30,5 @@ public interface OperationHints {
* should be returned as a ResultIterator. <code>false</code> is returned
when the
* results are expected as a list.
*/
- public boolean isIteratedResult();
+ boolean isIteratedResult();
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/OperationObserver.java
b/cayenne/src/main/java/org/apache/cayenne/access/OperationObserver.java
index 721a6de11..036f3aaa8 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/OperationObserver.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/OperationObserver.java
@@ -19,13 +19,12 @@
package org.apache.cayenne.access;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.query.Query;
+import java.util.List;
+
/**
* Defines a set of callback methods that allow {@link QueryEngine} to pass
back query
* results and notify caller about exceptions.
