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 8ebe2df68 minor cleanup
8ebe2df68 is described below
commit 8ebe2df68e5e6af370c3f6ddea1b7907b3578cb4
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Aug 30 11:25:32 2026 -0400
minor cleanup
---
.../access/TransactionResultIteratorDecorator.java | 4 ++--
.../access/jdbc/ConnectionAwareResultIterator.java | 11 ++++++-----
.../access/jdbc/DistinctResultIterator.java | 23 +++++++++++-----------
.../cayenne/access/jdbc/LimitResultIterator.java | 3 +--
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
b/cayenne/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
index fcdc52804..028e4de38 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
@@ -35,8 +35,8 @@ import java.util.List;
*/
final class TransactionResultIteratorDecorator<T> implements ResultIterator<T>
{
- private ResultIterator<T> result;
- private Transaction tx;
+ private final ResultIterator<T> result;
+ private final Transaction tx;
public TransactionResultIteratorDecorator(ResultIterator<T> result,
Transaction tx) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
index 4be2310cd..a0cd270d1 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.cayenne.access.jdbc;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.ResultIterator;
+
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.ResultIterator;
-
/**
* A {@link ResultIterator} wrapper that handles closing a connection. Also
* internally counts processed rows, mostly for the benefit of subclasses.
@@ -36,8 +36,9 @@ import org.apache.cayenne.ResultIterator;
*/
public class ConnectionAwareResultIterator<T> implements ResultIterator<T> {
- private ResultIterator<T> delegate;
- private Connection connection;
+ private final ResultIterator<T> delegate;
+ private final Connection connection;
+
private boolean closed;
protected int rowCounter;
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
index 370b43e07..3ee2ff82d 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
@@ -38,24 +38,23 @@ import java.util.Set;
* distinct rows. Distinct comparison is done by comparing ObjectIds created
* from each row. Internally DistinctResultIterator wraps another
ResultIterator
* that provides the actual rows.
- *
+ *
* @since 3.0
*/
public class DistinctResultIterator<T> implements ResultIterator<T> {
- protected ResultIterator<T> delegate;
- protected Set<Object> fetchedIds;
- protected T nextDataRow;
- protected DbEntity defaultEntity;
- protected boolean compareFullRows;
+ private final ResultIterator<T> delegate;
+ private final Set<Object> fetchedIds;
+ private final DbEntity defaultEntity;
+ private final boolean compareFullRows;
+
+ private T nextDataRow;
/**
* Creates new DistinctResultIterator wrapping another ResultIterator.
- *
- * @param delegate
- * actual result iterator, that will be decorated by this
DistinctResultIterator
- * @param defaultEntity
- * an entity needed to build ObjectIds for distinct comparison.
+ *
+ * @param delegate actual result iterator, that will be decorated by
this DistinctResultIterator
+ * @param defaultEntity an entity needed to build ObjectIds for distinct
comparison.
*/
public DistinctResultIterator(ResultIterator<T> delegate, DbEntity
defaultEntity, boolean compareFullRows) {
if (delegate == null) {
@@ -162,7 +161,7 @@ public class DistinctResultIterator<T> implements
ResultIterator<T> {
Map<String, Object> id = new HashMap<>();
for (final DbAttribute pk : defaultEntity.getPrimaryKeys()) {
- id.put(pk.getName(), ((DataRow)next).get(pk.getName()));
+ id.put(pk.getName(), ((DataRow) next).get(pk.getName()));
}
if (fetchedIds.add(id)) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
index 453f9f297..fd808590c 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.util.ResultIteratorIterator;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.NoSuchElementException;
/**
@@ -59,7 +58,7 @@ public class LimitResultIterator<T> implements
ResultIterator<T> {
*/
@Override
public Iterator<T> iterator() {
- return new ResultIteratorIterator<T>(this);
+ return new ResultIteratorIterator<>(this);
}
private void checkOffset() {
