CAY-2896 Inserting two identical objects into two datamaps stores both objects in the last used datamap

 - release notes and minor cleaup

Author: stariy95

RELEASE-NOTES.txt

@@ -20,6 +20,7 @@ Bug Fixes:
 
 CAY-2883 License and notice templates are not processed by the Gradle build
 CAY-2885 Modeler: DbImport fails to load DB schema view
+CAY-2896 Inserting two identical objects into two datamaps stores both objects in the last used datamap
 
 ----------------------------------
 Release: 4.2.2

cayenne-server/src/main/java/org/apache/cayenne/access/flush/operation/BaseDbRowOp.java

@@ -77,15 +77,13 @@ public String toString() {
         return entity.getName() + " " + changeId;
     }
 
+    /**
+     * Internal check used in the batching ops logic
+     * @param rowOp to compare with
+     * @return true if another op has the same entity name and datamap
+     */
     protected boolean entitiesHaveSameNameAndDataMap(DbRowOp rowOp) {
-        return entitiesHaveSameName(rowOp) && entitiesHaveSameDataMap(rowOp);
-    }
-
-    boolean entitiesHaveSameName(DbRowOp rowOp) {
-        return rowOp.getEntity().getName().equals(getEntity().getName());
-    }
-
-    private boolean entitiesHaveSameDataMap(DbRowOp rowOp) {
-        return rowOp.getEntity().getDataMap().getName().equals(getEntity().getDataMap().getName());
+        return getEntity().getName().equals(rowOp.getEntity().getName())
+                && getEntity().getDataMap().getName().equals(rowOp.getEntity().getDataMap().getName());
     }
 }