Cleanup tests

Author: rainboyan

grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java

@@ -15,45 +15,153 @@
  */
 package org.grails.orm.hibernate.proxy;
 
+import java.io.Serializable;
+
+import org.hibernate.Hibernate;
 import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.HibernateProxyHelper;
+
+import org.grails.datastore.mapping.core.Session;
+import org.grails.datastore.mapping.engine.AssociationQueryExecutor;
+import org.grails.datastore.mapping.proxy.ProxyFactory;
+import org.grails.datastore.mapping.proxy.ProxyHandler;
+import org.grails.datastore.mapping.reflect.ClassPropertyFetcher;
 
 /**
- * Implementation of the ProxyHandler interface for Hibernate.
+ * Implementation of the ProxyHandler interface for Hibernate using org.hibernate.Hibernate
+ * and HibernateProxyHelper where possible.
  *
  * @author Graeme Rocher
  * @since 1.2.2
  */
-public class HibernateProxyHandler extends SimpleHibernateProxyHandler {
+public class HibernateProxyHandler implements ProxyHandler, ProxyFactory {
 
+    /**
+     * Check if the proxy or persistent collection is initialized.
+     * {@inheritDoc}
+     */
+    @Override
     public boolean isInitialized(Object o) {
-        if (o instanceof PersistentCollection) {
-            return ((PersistentCollection) o).wasInitialized();
+        return Hibernate.isInitialized(o);
+    }
+
+    /**
+     * Check if an association proxy or persistent collection is initialized.
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isInitialized(Object obj, String associationName) {
+        try {
+            Object proxy = ClassPropertyFetcher.getInstancePropertyValue(obj, associationName);
+            return isInitialized(proxy);
+        }
+        catch (RuntimeException e) {
+            return false;
         }
+    }
 
-        return super.isInitialized(o);
+    /**
+     * Unproxies a HibernateProxy. If the proxy is uninitialized, it automatically triggers an initialization.
+     * In case the supplied object is null or not a proxy, the object will be returned as-is.
+     * {@inheritDoc}
+     * @see Hibernate#unproxy
+     */
+    @Override
+    public Object unwrap(Object object) {
+        if (object instanceof PersistentCollection) {
+            initialize(object);
+            return object;
+        }
+        return Hibernate.unproxy(object);
     }
 
-    public Object unwrapIfProxy(Object instance) {
-        if (instance instanceof PersistentCollection) {
-            initialize(instance);
-            return instance;
+    /**
+     * {@inheritDoc}
+     * @see org.hibernate.proxy.AbstractLazyInitializer#getIdentifier
+     */
+    @Override
+    public Serializable getIdentifier(Object o) {
+        if (o instanceof HibernateProxy) {
+            return ((HibernateProxy) o).getHibernateLazyInitializer().getIdentifier();
+        }
+        else {
+            //TODO seems we can get the id here if its has normal getId
+            // PersistentEntity persistentEntity = GormEnhancer.findStaticApi(o.getClass()).getGormPersistentEntity();
+            // return persistentEntity.getMappingContext().getEntityReflector(persistentEntity).getIdentifier(o);
+            return null;
         }
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see HibernateProxyHelper#getClassWithoutInitializingProxy
+     */
+    @Override
+    public Class<?> getProxiedClass(Object o) {
+        return HibernateProxyHelper.getClassWithoutInitializingProxy(o);
+    }
 
-        return super.unwrapIfProxy(instance);
+    /**
+     * calls unwrap which calls unproxy
+     * @see #unwrap(Object)
+     * @deprecated use unwrap
+     */
+    @Deprecated
+    public Object unwrapIfProxy(Object instance) {
+        return unwrap(instance);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public boolean isProxy(Object o) {
-        return super.isProxy(o) || (o instanceof PersistentCollection);
+        return (o instanceof HibernateProxy) || (o instanceof PersistentCollection);
     }
 
+    /**
+     * Force initialization of a proxy or persistent collection.
+     * {@inheritDoc}
+     */
+    @Override
     public void initialize(Object o) {
-        if (o instanceof PersistentCollection) {
-            final PersistentCollection col = (PersistentCollection) o;
-            if (!col.wasInitialized()) {
-                col.forceInitialization();
+        Hibernate.initialize(o);
+    }
+
+    @Override
+    public <T> T createProxy(Session session, Class<T> type, Serializable key) {
+        throw new UnsupportedOperationException("createProxy not supported in HibernateProxyHandler");
+    }
+
+    @Override
+    public <T, K extends Serializable> T createProxy(Session session, AssociationQueryExecutor<K, T> executor, K associationKey) {
+        throw new UnsupportedOperationException("createProxy not supported in HibernateProxyHandler");
+    }
+
+    /**
+     * @deprecated use unwrap
+     */
+    @Deprecated
+    public Object unwrapProxy(Object proxy) {
+        return unwrap(proxy);
+    }
+
+    /**
+     * returns the proxy for an association. returns null if its not a proxy.
+     * Note: Only used in a test. Deprecate?
+     */
+    public HibernateProxy getAssociationProxy(Object obj, String associationName) {
+        try {
+            Object proxy = ClassPropertyFetcher.getInstancePropertyValue(obj, associationName);
+            if (proxy instanceof HibernateProxy) {
+                return (HibernateProxy) proxy;
             }
+            return null;
+        }
+        catch (RuntimeException e) {
+            return null;
         }
-        super.initialize(o);
     }
 
 }

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy

@@ -36,19 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue
  */
 class HibernateMappingBuilderTests {
 
-//    void testWildcardApplyToAllProperties() {
-//        def builder = new HibernateMappingBuilder("Foo")
-//        def mapping = builder.evaluate {
-//            '*'(column:"foo")
-//            '*-1'(column:"foo")
-//            '1-1'(column:"foo")
-//            '1-*'(column:"foo")
-//            '*-*'(column:"foo")
-//            one cache:true
-//            two ignoreNoteFound:false
-//        }
-//    }
-
     @Test
     void testIncludes() {
         def callable = {

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy

@@ -106,6 +106,7 @@ class MappingBuilderSpec extends Specification {
         Mapping mapping = define {
             sort('foo', 'desc')
         }.build()
+
         then:
         mapping.sort.name == 'foo'
         mapping.sort.direction == 'desc'
@@ -174,6 +175,7 @@ class MappingBuilderSpec extends Specification {
             }
         }.build()
         PropertyConfig pc = mapping.getPropertyConfig(GormProperties.VERSION)
+
         expect:
         pc != null
         pc.columns.size() == 1

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy

@@ -31,6 +31,7 @@ class CountByWithEmbeddedSpec extends GormSpec {
         given:
         new CountByPerson(name: 'Fred', bornInCountry: new CountByCountry(name: 'England')).save(flush: true)
         new CountByPerson(bornInCountry: new CountByCountry(name: 'Scotland')).save(flush: true)
+
         expect:
         CountByPerson.countByNameIsNotNull() == 1
     }

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy

@@ -56,6 +56,7 @@ class DetachedCriteriaJoinSpec extends GormSpec {
 
         DynamicFinder.applyDetachedCriteria(query, dc)
         def joinType = query.hibernateCriteria.subcriteriaList.first().joinType
+
         expect:
         joinType == org.hibernate.sql.JoinType.INNER_JOIN
     }
@@ -70,6 +71,7 @@ class DetachedCriteriaJoinSpec extends GormSpec {
 
         DynamicFinder.applyDetachedCriteria(query, dc)
         def joinType = query.hibernateCriteria.subcriteriaList.first().joinType
+
         expect:
         joinType == org.hibernate.sql.JoinType.LEFT_OUTER_JOIN
     }
@@ -84,6 +86,7 @@ class DetachedCriteriaJoinSpec extends GormSpec {
 
         DynamicFinder.applyDetachedCriteria(query, dc)
         def joinType = query.hibernateCriteria.subcriteriaList.first().joinType
+
         expect:
         joinType == org.hibernate.sql.JoinType.RIGHT_OUTER_JOIN
     }

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy

@@ -68,11 +68,13 @@ class DetachedCriteriaProjectionSpec extends Specification {
             }
             eq 'field', 'abc'
         }
+
         when:
         // will fail
         def results = Entity1.withCriteria {
             inList 'id', detachedCriteria
         }
+
         then:
         results.size() == 1
     }
@@ -84,6 +86,7 @@ class DetachedCriteriaProjectionSpec extends Specification {
             eq 'field', 'abc'
         }
         detachedCriteria.projections << new Query.DistinctPropertyProjection('entityId')
+
         expect:
         assert Entity1.withCriteria {
             inList 'id', detachedCriteria
@@ -100,10 +103,12 @@ class DetachedCriteriaProjectionSpec extends Specification {
             }
         }
         detachedCriteria.projections << new Query.DistinctPropertyProjection('entityId')
+
         when:
         def results = Entity1.withCriteria {
             inList 'id', detachedCriteria
         }
+
         then:
         results.size() == 1
     }
@@ -122,7 +127,7 @@ class Entity1 {
 @Entity
 class Entity2 {
 
-    static belongsTo = { parent: Entity1 }
+    static belongsTo = [parent: Entity1]
 
     String field
 

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy

@@ -30,9 +30,16 @@ import org.grails.orm.hibernate.HibernateDatastore
 /**
  * Created by graemerocher on 01/03/2017.
  */
-@Ignore('https://issues.apache.org/jira/browse/GROOVY-5106')
+@Ignore
 class SubclassMultipleListCollectionSpec extends Specification {
 
+    @Shared
+    Map config = [
+            'dataSource.url'     : 'jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000',
+            'dataSource.dbCreate': 'create-drop',
+            'dataSource.dialect' : 'org.hibernate.dialect.H2Dialect'
+    ]
+
     @AutoCleanup
     @Shared
     HibernateDatastore hibernateDatastore
@@ -41,14 +48,13 @@ class SubclassMultipleListCollectionSpec extends Specification {
     PlatformTransactionManager transactionManager
 
     void setupSpec() {
-        hibernateDatastore = new HibernateDatastore(
+        hibernateDatastore = new HibernateDatastore(config,
                 SuperProduct, Product, Iteration
         )
         transactionManager = hibernateDatastore.getTransactionManager()
     }
 
-    @Ignore
-    // not yet implemented
+    @Ignore('not yet implemented')
     @Rollback
     @Issue('https://github.com/grails/grails-data-mapping/issues/882')
     void 'test inheritance with multiple list collections'() {
@@ -82,7 +88,7 @@ class Product extends SuperProduct {
 
 }
 
-//@Entity
+@Entity
 class SuperProduct {
 
     static constraints = {

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy

@@ -33,6 +33,7 @@ class ToOneProxySpec extends GormDatastoreSpec {
         session.flush()
 
         def proxyHandler = new HibernateProxyHandler()
+
         then: 'The association was not initialized'
         proxyHandler.getAssociationProxy(t, 'club') != null
         !proxyHandler.isInitialized(t, 'club')

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy

@@ -28,8 +28,6 @@ import org.grails.orm.hibernate.HibernateDatastore
 
 /**
  * Tests the unique constraint
- */
-/**
  *
  *  NOTE: This test is disabled because in order for the test suite to run quickly we need to run each test in a transaction.
  *  This makes it not possible to test the scenario outlined here, however tests for this use case exist in the hibernate plugin itself

grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy

@@ -74,6 +74,7 @@ class GlobalConstraintWithCompositeIdSpec extends Specification {
         PersistentEntity entity = hibernateDatastore.mappingContext.getPersistentEntity(DomainB.name)
         PropertyConfig nameProp = entity.getPropertyByName('name').mapping.mappedForm
         PropertyConfig someOtherConfig = entity.getPropertyByName('someOther').mapping.mappedForm
+
         expect:
         nameProp.unique
         someOtherConfig.unique