Remove deprecated calls.

Author: borinquenkid

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy

@@ -171,47 +171,6 @@ class GormEnhancer implements Closeable {
         return GormRegistry.instance
     }
 
-    /** @deprecated Delegate to {@link GormRegistry#findStaticApi(Class)} */
-    static <D> GormStaticApi<D> findStaticApi(Class entity) {
-        (GormStaticApi<D>) GormRegistry.findStaticApi(entity)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findStaticApi(Class, String)} */
-    static <D> GormStaticApi<D> findStaticApi(Class entity, String qualifier) {
-        (GormStaticApi<D>) GormRegistry.findStaticApi(entity, qualifier)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findInstanceApi(Class)} */
-    static <D> GormInstanceApi<D> findInstanceApi(Class entity) {
-        (GormInstanceApi<D>) GormRegistry.findInstanceApi(entity)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findInstanceApi(Class, String)} */
-    static <D> GormInstanceApi<D> findInstanceApi(Class entity, String qualifier) {
-        (GormInstanceApi<D>) GormRegistry.findInstanceApi(entity, qualifier)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findValidationApi(Class)} */
-    static <D> GormValidationApi<D> findValidationApi(Class entity) {
-        (GormValidationApi<D>) GormRegistry.findValidationApi(entity)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findValidationApi(Class, String)} */
-    static <D> GormValidationApi<D> findValidationApi(Class entity, String qualifier) {
-        (GormValidationApi<D>) GormRegistry.findValidationApi(entity, qualifier)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findDatastore(Class)} */
-    static Datastore findDatastore(Class entity) {
-        GormRegistry.findDatastore(entity)
-    }
-
-    /** @deprecated Delegate to {@link GormRegistry#findDatastore(Class, String)} */
-    static Datastore findDatastore(Class entity, String qualifier) {
-        GormRegistry.findDatastore(entity, qualifier)
-    }
-
-    /** @deprecated Use {@link GormRegistry} and {@link org.grails.datastore.mapping.model.MappingContext} directly */
     static PersistentEntity findEntity(Class entity) {
         GormApiResolver resolver = GormRegistry.instance.apiResolver
         Datastore ds = resolver.findDatastore(entity, null)

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormRegistry.groovy

@@ -92,63 +92,36 @@ class GormRegistry {
         allDatastores.clear()
     }
 
-    @Deprecated
     static <D> GormStaticApi<D> findStaticApi(Class<D> entity) {
         instance.resolveStaticApi(entity, (String) null)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().findStaticApi(entity, qualifier)}.
-     */
-    @Deprecated
+
     static <D> GormStaticApi<D> findStaticApi(Class<D> entity, String qualifier) {
         instance.resolveStaticApi(entity, qualifier)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().findInstanceApi(entity, qualifier)}.
-     */
-    @Deprecated
+
     static <D> GormInstanceApi<D> findInstanceApi(Class<D> entity) {
         instance.resolveInstanceApi(entity, (String) null)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().findInstanceApi(entity, qualifier)}.
-     */
-    @Deprecated
     static <D> GormInstanceApi<D> findInstanceApi(Class<D> entity, String qualifier) {
         instance.resolveInstanceApi(entity, qualifier)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().findValidationApi(entity, qualifier)}.
-     */
-    @Deprecated
     static <D> GormValidationApi<D> findValidationApi(Class<D> entity) {
         instance.resolveValidationApi(entity, (String) null)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().findValidationApi(entity, qualifier)}.
-     */
-    @Deprecated
     static <D> GormValidationApi<D> findValidationApi(Class<D> entity, String qualifier) {
         instance.resolveValidationApi(entity, qualifier)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().getApiResolver().findDatastore(entity, qualifier)}.
-     */
-    @Deprecated
     static Datastore findDatastore(Class entity) {
         instance.apiResolver.findDatastore(entity, (String) null)
     }
 
-    /**
-     * @deprecated Use {@code GormRegistry.getInstance().getApiResolver().findDatastore(entity, qualifier)}.
-     */
-    @Deprecated
     static Datastore findDatastore(Class entity, String qualifier) {
         instance.apiResolver.findDatastore(entity, qualifier)
     }

grails-scaffolding/src/main/groovy/grails/plugin/scaffolding/GormService.groovy

@@ -29,14 +29,15 @@ import grails.util.GrailsNameUtils
 import org.grails.datastore.gorm.GormEnhancer
 import org.grails.datastore.gorm.GormEntity
 import org.grails.datastore.gorm.GormEntityApi
+import org.grails.datastore.gorm.GormRegistry
 
 @Artefact('Service')
 @ReadOnly
 @CompileStatic
 class GormService<T extends GormEntity<T>> implements ScaffoldService<T, Serializable> {
 
     @Lazy
-    GormAllOperations<T> gormStaticApi = GormEnhancer.findStaticApi(resource) as GormAllOperations<T>
+    GormAllOperations<T> gormStaticApi = GormRegistry.findStaticApi(resource) as GormAllOperations<T>
     Class<T> resource
     String resourceName
     String resourceClassName

grails-test-examples/hibernate5/grails-multitenant-multi-datasource/grails-app/services/example/MetricService.groovy

@@ -22,6 +22,7 @@ package example
 import grails.gorm.services.Service
 import grails.gorm.transactions.Transactional
 import org.grails.datastore.gorm.GormEnhancer
+import org.grails.datastore.gorm.GormRegistry
 import org.grails.datastore.gorm.GormStaticApi
 
 /**
@@ -53,7 +54,7 @@ abstract class MetricService {
      * Statically compiled access to the secondary datasource via GormEnhancer.
      */
     private GormStaticApi<Metric> getSecondaryApi() {
-        GormEnhancer.findStaticApi(Metric, 'secondary')
+        GormRegistry.findStaticApi(Metric, 'secondary')
     }
 
     /**

grails-test-examples/hibernate7/grails-multitenant-multi-datasource/grails-app/services/example/MetricService.groovy

@@ -22,6 +22,7 @@ package example
 import grails.gorm.services.Service
 import grails.gorm.transactions.Transactional
 import org.grails.datastore.gorm.GormEnhancer
+import org.grails.datastore.gorm.GormRegistry
 import org.grails.datastore.gorm.GormStaticApi
 
 /**
@@ -53,7 +54,7 @@ abstract class MetricService {
      * Statically compiled access to the secondary datasource via GormEnhancer.
      */
     private GormStaticApi<Metric> getSecondaryApi() {
-        GormEnhancer.findStaticApi(Metric, 'secondary')
+        GormRegistry.findStaticApi(Metric, 'secondary')
     }
 
     /**

grails-views-gson/src/main/groovy/grails/plugin/json/view/api/internal/DefaultJsonViewHelper.groovy

@@ -98,7 +98,7 @@ class DefaultJsonViewHelper extends DefaultGrailsViewHelper {
         def clazz = object.getClass()
         try {
             return GormEnhancer.findEntity(clazz)
-        } catch (Throwable e) {
+        } catch (Exception ignored) {
             return ((JsonView) view)?.mappingContext?.getPersistentEntity(clazz.name)
         }
     }