Merged master

gaelyk · May 21, 2019 · 891ce09 · 891ce09
2 parents 08a2e27 + 0888615
commit 891ce09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/core/src/main/groovyx/gaelyk/datastore/EntityTransformation.groovy b/core/src/main/groovyx/gaelyk/datastore/EntityTransformation.groovy
@@ -436,7 +436,7 @@ class EntityTransformation extends AbstractASTTransformation {
             self
         }
 
-        parent.addField new FieldNode('DATASTORE_INDEXED_PROPERTIES_TYPES', Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL, getBoundListNode(classNodeForClass), parent, buildClassList(indexedTypes))
+        parent.addField new FieldNode('DATASTORE_INDEXED_PROPERTIES_TYPES', Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL, GenericsUtils.makeClassSafeWithGenerics(List, ClassHelper.OBJECT_TYPE), parent, buildClassList(indexedTypes))
 
         parent.addMethod new MethodNode(
                 'getDatastoreIndexedPropertiesTypes',
@@ -453,7 +453,7 @@ class EntityTransformation extends AbstractASTTransformation {
             self
         }
 
-        parent.addField new FieldNode('DATASTORE_UNINDEXED_PROPERTIES_TYPES', Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL, getBoundListNode(classNodeForClass), parent, buildClassList(unindexedTypes))
+        parent.addField new FieldNode('DATASTORE_UNINDEXED_PROPERTIES_TYPES', Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL, GenericsUtils.makeClassSafeWithGenerics(List, ClassHelper.OBJECT_TYPE), parent, buildClassList(unindexedTypes))
         parent.addMethod new MethodNode(
                 'getDatastoreUnindexedPropertiesTypes',
                 Modifier.PUBLIC,

diff --git a/core/src/test/groovyx/gaelyk/datastore/EntityTransformationSpec.groovy b/core/src/test/groovyx/gaelyk/datastore/EntityTransformationSpec.groovy
@@ -444,18 +444,17 @@ class EntityTransformationSpec extends Specification {
         def obj = newShell().evaluate '''
             import groovyx.gaelyk.datastore.Order
             import groovyx.gaelyk.datastore.Entity as GE
-            import groovyx.gaelyk.datastore.Indexed
             import groovyx.gaelyk.datastore.Ignore
             import groovy.transform.Canonical
             
             @GE @Canonical 
             class Person {
                 @Ignore Order order
             }
-            true
+            new Person()
         '''
         expect:
-        obj == true
+            obj.class.simpleName == 'Person'
     }
 
     /*@spock.lang.Ignore*/