Merge pull request #1404 from grails/workaroundGroovyBug

Groovy 3.0.7 Use explicit type cast for Collection.emptyMap

Author: puneetbehl

grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/RxEntity.groovy

@@ -504,7 +504,7 @@ trait RxEntity<D> implements RxGormOperations<D>, GormValidateable, DirtyCheckab
      * @return An observable with all results
      */
     static Observable<D> findAll() {
-        findAll(Collections.emptyMap())
+        findAll(Collections.<String, Object> emptyMap())
     }
 
     /**
@@ -707,4 +707,4 @@ trait RxEntity<D> implements RxGormOperations<D>, GormValidateable, DirtyCheckab
     private static RxGormStaticApi<D> currentRxGormStaticApi() {
         (RxGormStaticApi<D>)RxGormEnhancer.findStaticApi(this)
     }
-}
+}

grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentList.groovy

@@ -23,7 +23,7 @@ import rx.Subscription
  * @author Graeme Rocher
  * @since 6.0
  */
-@CompileStatic
+//@CompileStatic
 @Slf4j
 class RxPersistentList extends PersistentList implements RxPersistentCollection, RxUnidirectionalCollection , RxCollection{
     final RxDatastoreClient datastoreClient