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 296d83cfa cleanup
296d83cfa is described below
commit 296d83cfa34be9a94e7ea50d61c92de83c9e24d8
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Jun 28 17:48:32 2026 -0400
cleanup
---
cayenne/src/main/java/org/apache/cayenne/DataRow.java | 12 ++++--------
.../org/apache/cayenne/access/jdbc/reader/FullRowReader.java | 4 ++--
.../apache/cayenne/access/jdbc/reader/OffsetRowReader.java | 8 ++++++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataRow.java
b/cayenne/src/main/java/org/apache/cayenne/DataRow.java
index b243832fe..d28250b25 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataRow.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataRow.java
@@ -19,14 +19,14 @@
package org.apache.cayenne;
+import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.util.ToStringBuilder;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.util.ToStringBuilder;
-
/**
* DataRow a map that holds values retrieved from the database for a given
query row.
* DataRows are used to cache raw database data and as a reference point for
tracking
@@ -76,11 +76,7 @@ public class DataRow extends HashMap<String, Object> {
*/
public DataRow applyDiff(DataRow diff) {
DataRow merged = new DataRow(this);
-
- for (Map.Entry<String, Object> entry : diff.entrySet()) {
- merged.put(entry.getKey(), entry.getValue());
- }
-
+ merged.putAll(diff);
return merged;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java
index ae4e863bf..a5adee027 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java
@@ -50,7 +50,7 @@ class FullRowReader implements RowReader<DataRow> {
return new FullRowReader(columns, entityName);
}
- public FullRowReader(RSColumn[] columns, String entityName) {
+ private FullRowReader(RSColumn[] columns, String entityName) {
this.columns = columns;
this.entityName = entityName;
this.mapCapacity = (int) Math.ceil(columns.length / 0.75);
@@ -88,7 +88,7 @@ class FullRowReader implements RowReader<DataRow> {
private final EntityInheritanceTree entityInheritanceTree;
- InheritanceAwareRowReader(RSColumn[] columns, String entityName,
EntityInheritanceTree entityInheritanceTree) {
+ private InheritanceAwareRowReader(RSColumn[] columns, String
entityName, EntityInheritanceTree entityInheritanceTree) {
super(columns, entityName);
this.entityInheritanceTree = entityInheritanceTree;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
index cc35bcdfc..3ba96adcd 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
@@ -94,8 +94,12 @@ class OffsetRowReader implements RowReader<DataRow> {
private final EntityInheritanceTree entityInheritanceTree;
- InheritanceAwareOffsetRowReader(RSColumn[] columns, int startIndex,
String entityName,
- EntityInheritanceTree
entityInheritanceTree) {
+ private InheritanceAwareOffsetRowReader(
+ RSColumn[] columns,
+ int startIndex,
+ String entityName,
+ EntityInheritanceTree entityInheritanceTree) {
+
super(columns, startIndex, entityName);
this.entityInheritanceTree = entityInheritanceTree;
}
