Fix updatable entity views issue regarding wrong initial state, suppo…

…rt different fetch types for updatable attributes, Fix mapped superclass issue

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/collection/CollectionAddAllAction.java

@@ -101,7 +101,13 @@ public Collection<Object> getRemovedObjects() {
 
     @Override
     public Collection<Object> getAddedObjects(C collection) {
-        return (Collection<Object>) elements;
+        List<Object> objects = new ArrayList<>(elements.size());
+        for (Object element : elements) {
+            if (!collection.contains(element)) {
+                objects.add(element);
+            }
+        }
+        return objects;
     }
 
     @Override

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/collection/ListAddAction.java

@@ -65,6 +65,9 @@ public Collection<Object> getRemovedObjects() {
 
     @Override
     public Collection<Object> getAddedObjects(C collection) {
+        if (collection.contains(element)) {
+            return Collections.emptyList();
+        }
         return Collections.<Object>singleton(element);
     }
 

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/collection/ListAddAllAction.java

@@ -77,7 +77,13 @@ public Collection<Object> getRemovedObjects() {
 
     @Override
     public Collection<Object> getAddedObjects(C collection) {
-        return (Collection<Object>) elements;
+        List<Object> objects = new ArrayList<>(elements.size());
+        for (Object element : elements) {
+            if (!collection.contains(element)) {
+                objects.add(element);
+            }
+        }
+        return objects;
     }
 
     @Override

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedCollectionBatchTupleListTransformer.java

@@ -64,7 +64,7 @@ protected void populateResult(Map<Object, TuplePromise> correlationValues, Objec
             }
 
             if (element[1] != null) {
-                result.add(element[1]);
+                add(result, element[1]);
             }
         }
 
@@ -73,6 +73,14 @@ protected void populateResult(Map<Object, TuplePromise> correlationValues, Objec
         }
     }
 
+    private void add(Collection<Object> result, Object o) {
+        if (recording) {
+            ((RecordingCollection<?, Object>) result).getDelegate().add(o);
+        } else {
+            result.add(o);
+        }
+    }
+
     @Override
     public Object copy(Object o) {
         return createCollection((Collection<? extends Object>) o);

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/transformer/correlation/CorrelatedCollectionSubselectTupleListTransformer.java

@@ -67,7 +67,7 @@ protected void populateResult(boolean usesViewRoot, Map<Object, Map<Object, Tupl
                 }
 
                 if (element[2] != null) {
-                    result.add(element[2]);
+                    add(result, element[2]);
                 }
             }
         } else {
@@ -82,7 +82,7 @@ protected void populateResult(boolean usesViewRoot, Map<Object, Map<Object, Tupl
                 }
 
                 if (element[1] != null) {
-                    result.add(element[1]);
+                    add(result, element[1]);
                 }
             }
         }
@@ -95,6 +95,14 @@ protected void populateResult(boolean usesViewRoot, Map<Object, Map<Object, Tupl
         }
     }
 
+    private void add(Collection<Object> result, Object o) {
+        if (recording) {
+            ((RecordingCollection<?, Object>) result).getDelegate().add(o);
+        } else {
+            result.add(o);
+        }
+    }
+
     @Override
     public Object copy(Object o) {
         return createCollection((Collection<? extends Object>) o);

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java

@@ -195,7 +195,10 @@ public FetchGraphNode<?> mergeWith(List<CollectionAttributeFlusher<E, V>> fetchG
             fetchChanged |= this.fetch != node.fetch;
             if (node.nestedGraphNode != null) {
                 if (node.nestedGraphNode instanceof CollectionElementFetchGraphNode) {
-                    nestedFlushers.add(((CollectionElementFetchGraphNode) node.nestedGraphNode).nestedGraphNode);
+                    CollectionElementFetchGraphNode collectionElementFetchGraphNode = (CollectionElementFetchGraphNode) node.nestedGraphNode;
+                    if (collectionElementFetchGraphNode.nestedGraphNode != null) {
+                        nestedFlushers.add(collectionElementFetchGraphNode.nestedGraphNode);
+                    }
                 } else {
                     nestedFlushers.add(node.nestedGraphNode);
                 }
@@ -238,7 +241,7 @@ public void flushQuery(UpdateContext context, String parameterPrefix, Query quer
             Map<Object, Object> removed;
 
             if (recordingCollection.hasActions()) {
-                Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(recordingCollection, (List<CollectionAction<Collection<?>>>) (List<?>) recordingCollection.resetActions(context));
+                Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(recordingCollection, context);
                 added = addedAndRemoved[0];
                 removed = addedAndRemoved[1];
             } else {
@@ -269,7 +272,7 @@ public boolean flushEntity(UpdateContext context, E entity, Object view, V value
                     Map<Object, Object> added;
                     Map<Object, Object> removed;
                     if (recordingCollection.hasActions()) {
-                        Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(recordingCollection, (List<CollectionAction<Collection<?>>>) (List<?>) recordingCollection.resetActions(context));
+                        Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(recordingCollection, context);
                         added = addedAndRemoved[0];
                         removed = addedAndRemoved[1];
                     } else {
@@ -920,12 +923,14 @@ protected DirtyAttributeFlusher<CollectionAttributeFlusher<E, V>, E, V> determin
         }
 
         if (inverseFlusher != null) {
+            Map<Object, Object>[] addedAndRemoved;
             // Always reset the actions as that indicates changes
             if (current instanceof RecordingCollection<?, ?>) {
-                ((RecordingCollection<?, ?>) current).resetActions(context);
+                addedAndRemoved = getAddedAndRemovedElements((RecordingCollection<?, ?>) current, context);
+            } else {
+                addedAndRemoved = getAddedAndRemovedElements(current, collectionActions);
             }
             // Inverse collections must convert collection actions to element flush actions
-            Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(current, collectionActions);
             Map<Object, Object> added = addedAndRemoved[0];
             Map<Object, Object> removed = addedAndRemoved[1];
             List<CollectionElementAttributeFlusher<E, V>> elementFlushers = getInverseElementFlushersForActions(context, current, added, removed);
@@ -1417,7 +1422,7 @@ protected DirtyAttributeFlusher<CollectionAttributeFlusher<E, V>, E, V> getDirty
                 }
             } else if (inverseFlusher != null) {
                 // Inverse collections must convert collection actions to element flush actions
-                Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(collection, (List<CollectionAction<Collection<?>>>) (List<?>) collection.resetActions(context));
+                Map<Object, Object>[] addedAndRemoved = getAddedAndRemovedElements(collection, context);
                 Map<Object, Object> added = addedAndRemoved[0];
                 Map<Object, Object> removed = addedAndRemoved[1];
                 List<CollectionElementAttributeFlusher<E, V>> elementFlushers = getInverseElementFlushersForActions(context, collection, added, removed);
@@ -1454,6 +1459,29 @@ protected DirtyAttributeFlusher<CollectionAttributeFlusher<E, V>, E, V> getDirty
         return null;
     }
 
+    @SuppressWarnings("unchecked")
+    private Map<Object, Object>[] getAddedAndRemovedElements(RecordingCollection<?, ?> collection, UpdateContext context) {
+        List<? extends CollectionAction<?>> collectionActions = collection.resetActions(context);
+        Map<Object, Object> added = new IdentityHashMap<>();
+        Map<Object, Object> removed = new IdentityHashMap<>();
+        for (CollectionAction<? extends Collection<?>> a : collectionActions) {
+            Collection<Object> addedObjects = a.getAddedObjects();
+            Collection<Object> removedObjects = a.getRemovedObjects();
+
+            for (Object addedObject : addedObjects) {
+                removed.remove(addedObject);
+            }
+            for (Object removedObject : removedObjects) {
+                added.remove(removedObject);
+                removed.put(removedObject, removedObject);
+            }
+            for (Object addedObject : addedObjects) {
+                added.put(addedObject, addedObject);
+            }
+        }
+        return new Map[]{ added, removed };
+    }
+
     @SuppressWarnings("unchecked")
     private Map<Object, Object>[] getAddedAndRemovedElements(Collection<?> collection, List<CollectionAction<Collection<?>>> collectionActions) {
         Map<Object, Object> added = new IdentityHashMap<>();

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CompositeAttributeFlusher.java

@@ -352,7 +352,7 @@ public void flushQuery(UpdateContext context, String parameterPrefix, Query quer
                     final DirtyAttributeFlusher<?, Object, Object> flusher = flushers[index];
                     Object newInitialValue = flusher.cloneDeep(value, initialState[index], state[index]);
                     flusher.flushQuery(context, parameterPrefix, query, value, state[index]);
-                    initialState[i] = flusher.getNewInitialValue(context, newInitialValue, state[index]);
+                    initialState[index] = flusher.getNewInitialValue(context, newInitialValue, state[index]);
                 }
             } else {
                 for (int i = 0; i < deferredFlushers.size(); i++) {
@@ -612,7 +612,7 @@ private void deferredFlushEntity(UpdateContext context, Object entity, MutableSt
                 final DirtyAttributeFlusher<?, Object, Object> flusher = flushers[index];
                 Object newInitialValue = flusher.cloneDeep(updatableProxy, initialState[index], state[index]);
                 flusher.flushEntity(context, entity, updatableProxy, state[index], null);
-                initialState[i] = flusher.getNewInitialValue(context, newInitialValue, state[index]);
+                initialState[index] = flusher.getNewInitialValue(context, newInitialValue, state[index]);
             }
         } else {
             for (int i = 0; i < deferredFlushers.size(); i++) {

integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/repository/EntityViewAwareRepositoryImpl.java

@@ -23,6 +23,8 @@
 import com.blazebit.persistence.criteria.BlazeCriteriaBuilder;
 import com.blazebit.persistence.criteria.BlazeCriteriaQuery;
 import com.blazebit.persistence.criteria.impl.BlazeCriteria;
+import com.blazebit.persistence.parser.EntityMetamodel;
+import com.blazebit.persistence.spi.ExtendedManagedType;
 import com.blazebit.persistence.spring.data.base.query.KeysetAwarePageImpl;
 import com.blazebit.persistence.spring.data.repository.EntityViewRepository;
 import com.blazebit.persistence.spring.data.repository.EntityViewSpecificationExecutor;
@@ -53,7 +55,6 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -81,6 +82,7 @@ public class EntityViewAwareRepositoryImpl<V, E, ID extends Serializable> implem
     private final CriteriaBuilderFactory cbf;
     private final EntityViewManager evm;
     private final Class<V> entityViewClass;
+    private final String idAttributeName;
 
     private EntityViewAwareCrudMethodMetadata metadata;
 
@@ -90,6 +92,7 @@ public EntityViewAwareRepositoryImpl(JpaEntityInformation<E, ?> entityInformatio
         this.cbf = cbf;
         this.evm = evm;
         this.entityViewClass = entityViewClass;
+        this.idAttributeName = getIdAttribute(getDomainClass());
     }
 
     public void setRepositoryMethodMetadata(EntityViewAwareCrudMethodMetadata crudMethodMetadata) {
@@ -308,7 +311,7 @@ public V findOne(ID id) {
         Assert.notNull(id, ID_MUST_NOT_BE_NULL);
 
         CriteriaBuilder<?> cb = cbf.create(entityManager, getDomainClass())
-                .where(getIdAttribute()).eq(id);
+                .where(idAttributeName).eq(id);
         String[] fetches = EMPTY;
         if (metadata != null && metadata.getEntityGraph() != null && (fetches = metadata.getEntityGraph().attributePaths()).length != 0) {
             cb.fetch(fetches);
@@ -323,7 +326,11 @@ public V findOne(ID id) {
 
         applyQueryHints(findOneQuery, fetches.length == 0);
 
-        return findOneQuery.getSingleResult();
+        try {
+            return findOneQuery.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
     }
 
     @Override
@@ -340,15 +347,21 @@ public boolean existsById(ID id) {
     public boolean exists(ID id) {
         Assert.notNull(id, ID_MUST_NOT_BE_NULL);
 
-        TypedQuery<Long> existsQuery = cbf.create(entityManager, Long.class)
+        TypedQuery<Object> existsQuery = cbf.create(entityManager, Object.class)
                 .from(getDomainClass())
-                .select("COUNT(*)")
-                .where(getIdAttribute()).eq(id)
+                // Empty string because SQLServer can't interpret a number properly when using TOP clause
+                .select("''")
+                .where(idAttributeName).eq(id)
+                .setMaxResults(1)
                 .getQuery();
 
         applyRepositoryMethodMetadata(existsQuery, true);
 
-        return existsQuery.getSingleResult() > 0;
+        try {
+            return !existsQuery.getResultList().isEmpty();
+        } catch (NoResultException e) {
+            return false;
+        }
     }
 
     @Override
@@ -369,7 +382,7 @@ public List<V> findAll(Iterable<ID> idIterable) {
             idList.add(id);
         }
         CriteriaBuilder<?> cb = cbf.create(entityManager, getDomainClass())
-                .where(getIdAttribute()).in(idList);
+                .where(idAttributeName).in(idList);
 
         String[] fetches = EMPTY;
         if (metadata != null && metadata.getEntityGraph() != null && (fetches = metadata.getEntityGraph().attributePaths()).length != 0) {
@@ -389,12 +402,10 @@ public List<V> findAll(Iterable<ID> idIterable) {
     }
 
     private String getIdAttribute(Class<?> entityClass) {
-        EntityType<?> entityType = entityManager.getMetamodel().entity(entityClass);
-        return entityType.getDeclaredId(entityType.getIdType().getJavaType()).getName();
-    }
-
-    private String getIdAttribute() {
-        return getIdAttribute(getDomainClass());
+        return cbf.getService(EntityMetamodel.class)
+                .getManagedType(ExtendedManagedType.class, entityClass)
+                .getIdAttribute()
+                .getName();
     }
 
     @Override

integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/AbstractSpringTest.java

@@ -16,6 +16,7 @@
 
 package com.blazebit.persistence.spring.data.testsuite;
 
+import com.blazebit.persistence.spring.data.testsuite.config.CustomLocalContainerEntityManagerFactoryBean;
 import com.blazebit.persistence.spring.data.testsuite.entity.Document;
 import com.blazebit.persistence.spring.data.testsuite.entity.Person;
 import com.blazebit.persistence.testsuite.base.AbstractPersistenceTest;
@@ -49,12 +50,23 @@ protected void configurePersistenceUnitInfo(MutablePersistenceUnitInfo persisten
 
     @Before
     public void setUpContext() throws Exception {
+        // We have to close the EM and EMF constructed by the abstraction
+        cleanDatabase();
+        this.em.getTransaction().rollback();
+        this.em.close();
+        this.emf.close();
+        this.emf = null;
+        this.em = null;
+        this.cbf = null;
+        this.jpaProvider = null;
+        this.dbmsDialect = null;
+
         //this is where the magic happens, we actually do "by hand" what the spring runner would do for us,
         // read the JavaDoc for the class bellow to know exactly what it does, the method names are quite accurate though
+        CustomLocalContainerEntityManagerFactoryBean.properties = createProperties("none");
         testContextManager = new TestContextManager(getClass());
         testContextManager.prepareTestInstance(this);
         testContextManager.registerTestExecutionListeners(new DirtiesContextTestExecutionListener());
-        cleanDatabase();
     }
 
     @After

integration/spring-data/testsuite/src/test/java/com/blazebit/persistence/spring/data/testsuite/DocumentRepositoryTest.java

@@ -34,7 +34,6 @@
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
-import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
@@ -266,8 +265,6 @@ public void testFindByNameIn() {
     }
 
     @Test
-    // Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
-    @Category({ NoMSSQL.class })
     public void testFindByNameInPaginated() {
         // ignored with EclipseLink due to IN collection rendering bug
         Assume.assumeFalse(isEntityRepository() && isEclipseLink());
@@ -297,8 +294,6 @@ public void testFindByNameInPaginated() {
     }
 
     @Test
-    // Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
-    @Category({ NoMSSQL.class })
     public void testFindByNameInKeysetPaginated() {
         // ignored with EclipseLink due to IN collection rendering bug
         Assume.assumeFalse(isEntityRepository() && isEclipseLink());
@@ -380,8 +375,6 @@ public void testFindByAgeGreaterThanEqual() {
     }
 
     @Test
-    // Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
-    @Category({ NoMSSQL.class })
     public void testFindSliceByAgeGreaterThanEqual() {
         // Given
         final Document d1 = createDocument("d1", null, 3L, null);
@@ -400,8 +393,6 @@ public void testFindSliceByAgeGreaterThanEqual() {
     }
 
     @Test
-    // Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
-    @Category({ NoMSSQL.class })
     public void testFindFirstByOrderByNameAsc() {
         // Given
         final Document d3 = createDocument("d3");
@@ -476,8 +467,6 @@ public Predicate toPredicate(Root<Document> root, CriteriaQuery<?> criteriaQuery
     }
 
     @Test
-    // Since only Hibernate 5.1 fixed a bug in the SQLServer dialect regarding pagination, we will skip this test for MSSQL
-    @Category({ NoMSSQL.class })
     public void testFindAllBySpecPageable() {
         // Given
         final Document d4 = createDocument("d4", null, 2L, null);