Remove deprecated methods

Author: rainboyan

grace-datastore-gorm-mongodb/src/main/groovy/grails/mongodb/MongoEntity.groovy

@@ -34,12 +34,6 @@ import org.grails.datastore.gorm.GormEntity
 import org.grails.datastore.gorm.mongo.MongoCriteriaBuilder
 import org.grails.datastore.gorm.mongo.api.MongoStaticApi
 import org.grails.datastore.gorm.schemaless.DynamicAttributes
-import org.grails.datastore.mapping.core.AbstractDatastore
-import org.grails.datastore.mapping.core.SessionImplementor
-import org.grails.datastore.mapping.engine.EntityPersister
-import org.grails.datastore.mapping.mongo.AbstractMongoSession
-import org.grails.datastore.mapping.mongo.MongoDatastore
-import org.grails.datastore.mapping.mongo.engine.MongoEntityPersister
 
 /**
  * Enhances the default {@link GormEntity} class with MongoDB specific methods
@@ -72,43 +66,6 @@ trait MongoEntity<D> implements GormEntity<D>, DynamicAttributes {
         DynamicAttributes.super.putAt(name, val)
     }
 
-    /**
-     * Return the DBObject instance for the entity
-     *
-     * @deprecated use dynamic properties instead
-     * @param instance The instance
-     * @return The DBObject instance
-     */
-    @Deprecated
-    Document getDbo() {
-        AbstractMongoSession session = (AbstractMongoSession) AbstractDatastore.retrieveSession(MongoDatastore)
-        // check first for embedded cached entries
-        SessionImplementor<Document> si = (SessionImplementor<Document>) session
-        def persistentEntity = session.mappingContext.getPersistentEntity(getClass().name)
-        Document dbo = (Document) si.getCachedEntry(persistentEntity,
-                MongoEntityPersister.createEmbeddedCacheEntryKey(this))
-        if (dbo != null) {
-            return dbo
-        }
-        // otherwise check if instance is contained within session
-        if (!session.contains(this)) {
-            dbo = new Document()
-            si.cacheEntry(persistentEntity, MongoEntityPersister.createInstanceCacheEntryKey(this), dbo)
-            return dbo
-        }
-
-        EntityPersister persister = (EntityPersister) session.getPersister(this)
-        def id = persister.getObjectIdentifier(this)
-        dbo = (Document) ((SessionImplementor) session).getCachedEntry(persister.getPersistentEntity(), id)
-        if (dbo == null) {
-            MongoCollection<Document> coll = session.getCollection(persistentEntity)
-            dbo = coll.find((Bson) new Document(MongoEntityPersister.MONGO_ID_FIELD, id))
-                      .limit(1)
-                      .first()
-        }
-        return dbo
-    }
-
     /**
      * Finds all of the entities in the collection.
      *

grace-datastore-gorm-mongodb/src/main/groovy/grails/mongodb/api/MongoInstanceOperations.groovy

@@ -15,8 +15,6 @@
  */
 package grails.mongodb.api
 
-import org.bson.Document
-
 import grails.gorm.api.GormInstanceOperations
 
 /**
@@ -26,14 +24,4 @@ import grails.gorm.api.GormInstanceOperations
  */
 interface MongoInstanceOperations<D> extends GormInstanceOperations<D> {
 
-    /**
-     * Return the DBObject instance for the entity
-     *
-     * @deprecated use dynamic properties instead
-     * @param instance The instance
-     * @return The DBObject instance
-     */
-    @Deprecated
-    Document getDbo(D instance)
-
 }

grace-datastore-gorm-mongodb/src/main/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializer.groovy

@@ -51,9 +51,7 @@ class MongoDbDataStoreSpringInitializer extends AbstractDatastoreInitializer {
 
     public static final String DATASTORE_TYPE = 'mongo'
     protected String mongoBeanName = 'mongo'
-    protected String mongoOptionsBeanName = 'mongoOptions'
     protected String databaseName = DEFAULT_DATABASE_NAME
-    protected Closure defaultMapping
     protected MongoClientSettings mongoOptions
     protected MongoClient mongo
 
@@ -149,24 +147,6 @@ class MongoDbDataStoreSpringInitializer extends AbstractDatastoreInitializer {
         }
     }
 
-    /**
-     * Sets the name of the Mongo bean to use
-     */
-    @Deprecated
-    void setMongoBeanName(String mongoBeanName) {
-        this.mongoBeanName = mongoBeanName
-    }
-
-    /**
-     * The name of the MongoOptions bean
-     *
-     * @param mongoOptionsBeanName The mongo options bean name
-     */
-    @Deprecated
-    void setMongoOptionsBeanName(String mongoOptionsBeanName) {
-        this.mongoOptionsBeanName = mongoOptionsBeanName
-    }
-
     /**
      * Sets the MongoOptions instance to use when constructing the Mongo instance
      */
@@ -189,12 +169,4 @@ class MongoDbDataStoreSpringInitializer extends AbstractDatastoreInitializer {
         this.databaseName = databaseName
     }
 
-    /**
-     * Sets the default MongoDB GORM mapping configuration
-     */
-    @Deprecated
-    void setDefaultMapping(Closure defaultMapping) {
-        this.defaultMapping = defaultMapping
-    }
-
 }

grace-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy

@@ -34,7 +34,6 @@ import org.bson.conversions.Bson
 import org.springframework.transaction.PlatformTransactionManager
 
 import grails.gorm.multitenancy.Tenants
-import grails.mongodb.MongoEntity
 import grails.mongodb.api.MongoAllOperations
 
 import org.grails.datastore.gorm.GormStaticApi
@@ -293,12 +292,6 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D
         })
     }
 
-    @Override
-    @Deprecated
-    Document getDbo(D instance) {
-        return ((MongoEntity) instance).dbo
-    }
-
     protected Bson wrapFilterWithMultiTenancy(Bson filter) {
         if (multiTenancyMode == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR &&
                 persistentEntity.isMultiTenant()) {

grace-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java

@@ -634,6 +634,7 @@ public void setMessageSource(MessageSource messageSource) {
     /**
      * @return The transaction manager
      */
+    @Override
     public PlatformTransactionManager getTransactionManager() {
         return this.transactionManager;
     }

grace-datastore-gorm-mongodb/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy

@@ -56,12 +56,10 @@ class BasicArraySpec extends GormDatastoreSpec {
         Data data = new Data(str: 'baz', byteArray: 'hello'.bytes).save(flush: true, validate: false)
         session.clear()
         data = Data.findByStr('baz')
-        Document dbo = data.dbo
 
         then: 'The array is saved correct'
         data.str == 'baz'
         data.byteArray == 'hello'.bytes
-        dbo.byteArray.data == 'hello'.bytes
     }
 
     @Override

grace-datastore-gorm-mongodb/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy

@@ -29,8 +29,6 @@ class DisableVersionSpec extends GormDatastoreSpec {
         then: 'The version field is not persisted'
         nv.name == 'Bob'
         nv.version == null
-        nv.dbo.version == null
-        !nv.dbo.containsKey('version')
     }
 
     @Override

grace-datastore-gorm-mongodb/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy

@@ -32,7 +32,6 @@ class SchemalessSpec extends GormDatastoreSpec {
 
         then:
         p.name == 'Pineapple'
-        p.dbo.color == 'Yellow'
         p['color'] == 'Yellow'
 
         when:
@@ -43,7 +42,6 @@ class SchemalessSpec extends GormDatastoreSpec {
 
         then:
         p.name == 'Pineapple'
-        p.dbo.color == 'Yellow'
         p['color'] == 'Yellow'
         p['hasLeaves'] == true