Put merged instance into second level cache on transaction commit.

kbss-cvut · Jun 19, 2017 · 1d7868a · 1d7868a
1 parent 5248267
commit 1d7868a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/MergeManagerImpl.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/MergeManagerImpl.java
@@ -56,6 +56,8 @@ public Object mergeChangesOnObject(ObjectChangeSet changeSet) {
             }
         } else {
             builder.mergeChanges(changeSet);
+            final Object identifier = EntityPropertiesUtils.getPrimaryKey(original, uow.getMetamodel());
+            uow.putObjectIntoCache(identifier, original, changeSet.getEntityDescriptor());
         }
         return clone;
     }
@@ -77,10 +79,11 @@ public void mergeNewObject(ObjectChangeSet changeSet) {
         }
         if (!changeSet.isNew()) {
             mergeChangesOnObject(changeSet);
+            return;
         }
         // Put the original object into the shared session cache
         Object newObject = changeSet.getChangedObject();
-        final Object primaryKey = EntityPropertiesUtils.getPrimaryKey(newObject, uow.getMetamodel());
-        uow.putObjectIntoCache(primaryKey, newObject, changeSet.getEntityDescriptor());
+        final Object identifier = EntityPropertiesUtils.getPrimaryKey(newObject, uow.getMetamodel());
+        uow.putObjectIntoCache(identifier, newObject, changeSet.getEntityDescriptor());
     }
 }
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkImpl.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkImpl.java
@@ -612,7 +612,7 @@ private <T> T mergeDetachedInternal(T entity, Descriptor descriptor) {
             if (chSet.hasChanges()) {
                 et.getLifecycleListenerManager().invokePostUpdateCallbacks(clone);
             }
-            getUowChangeSet().addObjectChangeSet(chSet);
+            getUowChangeSet().addObjectChangeSet(copyChangeSet(chSet, original, clone, descriptor));
         } catch (OWLEntityExistsException e) {
             unregisterObject(clone);
             throw e;
@@ -627,6 +627,13 @@ private <T> T mergeDetachedInternal(T entity, Descriptor descriptor) {
         return et.getJavaType().cast(clone);
     }
 
+    private ObjectChangeSet copyChangeSet(ObjectChangeSet changeSet, Object original, Object clone,
+                                          Descriptor descriptor) {
+        final ObjectChangeSet newChangeSet = ChangeSetFactory.createObjectChangeSet(original, clone, descriptor);
+        changeSet.getChanges().forEach(newChangeSet::addChangeRecord);
+        return newChangeSet;
+    }
+
     @Override
     void registerEntityWithPersistenceContext(Object entity, UnitOfWorkImpl uow) {
         parent.registerEntityWithPersistenceContext(entity, uow);
@@ -1062,8 +1069,8 @@ private void removeIndirectCollections(Object entity) {
         }
     }
 
-    void putObjectIntoCache(Object primaryKey, Object entity, Descriptor descriptor) {
-        cacheManager.add(primaryKey, entity, descriptor);
+    void putObjectIntoCache(Object identifier, Object entity, Descriptor descriptor) {
+        cacheManager.add(identifier, entity, descriptor);
     }
 
     private Object getIdentifier(Object entity) {

diff --git a/jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/MergeManagerTest.java b/jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/MergeManagerTest.java
@@ -98,22 +98,22 @@ public void testMergeChangesFromChangeSet() throws Exception {
         OWLClassB cloneTwo = new OWLClassB(objTwo.getUri());
         cloneOne.setStringAttribute("testAtt");
         uowChangeSet.addDeletedObjectChangeSet(createChangeSet(objTwo, cloneTwo));
-        final ObjectChangeSet ochs = createChangeSet(objOne, cloneOne);
-        ochs.addChangeRecord(
+        final ObjectChangeSet changeSet = createChangeSet(objOne, cloneOne);
+        changeSet.addChangeRecord(
                 new ChangeRecordImpl(metamodelMocks.forOwlClassB().stringAttribute(), cloneOne.getStringAttribute()));
-        uowChangeSet.addObjectChangeSet(ochs);
+        uowChangeSet.addObjectChangeSet(changeSet);
         mm.mergeChangesFromChangeSet(uowChangeSet);
         verify(uow).removeObjectFromCache(objTwo, defaultDescriptor.getContext());
-        verify(cloneBuilder).mergeChanges(ochs);
+        verify(cloneBuilder).mergeChanges(changeSet);
     }
 
     @Test
     public void mergeChangesFromChangeSetWithNewObjectPutsOriginalIntoCache() {
         final OWLClassB objOne = new OWLClassB(Generators.createIndividualIdentifier());
         objOne.setStringAttribute("ABeautifulAttribute");
         final OWLClassB clone = new OWLClassB(objOne.getUri());
-        final ObjectChangeSet ochs = createChangeSet(objOne, clone);
-        uowChangeSet.addNewObjectChangeSet(ochs);
+        final ObjectChangeSet changeSet = createChangeSet(objOne, clone);
+        uowChangeSet.addNewObjectChangeSet(changeSet);
         mm.mergeChangesFromChangeSet(uowChangeSet);
         verify(uow).putObjectIntoCache(objOne.getUri(), objOne, defaultDescriptor);
     }

diff --git a/jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkTest.java b/jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkTest.java
@@ -838,7 +838,7 @@ public void mergeRegistersChangesInUoWChangeSet() throws Exception {
 
         assertTrue(uow.hasChanges());
         final UnitOfWorkChangeSet changeSet = uow.getUowChangeSet();
-        final ObjectChangeSet objectChanges = changeSet.getExistingObjectChanges(result);
+        final ObjectChangeSet objectChanges = changeSet.getExistingObjectChanges(entityA);
         assertNotNull(objectChanges);
         assertEquals(2, objectChanges.getChanges().size());
         final String strAttName = OWLClassA.getStrAttField().getName();
@@ -935,4 +935,19 @@ public void registerReplacesAlsoInheritedCollectionInstancesWithIndirectVersions
         final OWLClassR clone = uow.readObject(OWLClassR.class, entityR.getUri(), descriptor);
         assertTrue(clone.getTypes() instanceof IndirectSet);
     }
+
+    @Test
+    public void commitPutsIntoCacheInstanceMergedAsDetachedDuringTransaction() {
+        final OWLClassA original = new OWLClassA(entityA.getUri());
+        original.setStringAttribute("originalStringAttribute");
+        when(storageMock.contains(entityA.getUri(), OWLClassA.class, descriptor)).thenReturn(true);
+        when(storageMock.find(new LoadingParameters<>(OWLClassA.class, entityA.getUri(), descriptor, true)))
+                .thenReturn(original);
+
+        final OWLClassA merged = uow.mergeDetached(entityA, descriptor);
+        assertNotNull(merged);
+        assertEquals(entityA.getStringAttribute(), merged.getStringAttribute());
+        uow.commit();
+        verify(cacheManagerMock).add(entityA.getUri(), original, descriptor);
+    }
 }