cleanup

Author: andrus

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 void setReplacesVersion(long replacesVersion) {
      */
     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;
     }
 

cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java

@@ -50,7 +50,7 @@ static RowReader<DataRow> of(RSColumn[] columns, QueryMetadata queryMetadata) {
         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 @@ private static class InheritanceAwareRowReader extends FullRowReader {
 
         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;
         }

cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java

@@ -94,8 +94,12 @@ private static class InheritanceAwareOffsetRowReader extends OffsetRowReader {
 
         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;
         }