Merge pull request #1371 from zyro23/grails-data-mapping-1368

#1368 - respect FactoryBean.getObjectType contract, use context…
grails · Aug 18, 2020 · 540915f · 540915f
2 parents 752d153 + 37bc862
commit 540915f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...oovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy b/...oovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy
@@ -22,7 +22,10 @@ class DatastoreServiceMethodInvokingFactoryBean extends MethodInvokingFactoryBea
 
  @Override
  Class<?> getObjectType() {
- arguments[0] as Class<?>
+ if (arguments != null && arguments.size() == 1) {
+ return arguments[0] as Class<?>
+ }
+ return super.getObjectType()
  }
 
  @Override

diff --git a/...tastore-core/src/main/groovy/org/grails/datastore/mapping/services/SoftServiceLoader.java b/...tastore-core/src/main/groovy/org/grails/datastore/mapping/services/SoftServiceLoader.java
@@ -88,7 +88,7 @@ public static Logger getLogger(Class type) {
  * @return A new service loader
  */
  public static <S> SoftServiceLoader<S> load(Class<S> service) {
- return SoftServiceLoader.load(service, SoftServiceLoader.class.getClassLoader());
+ return SoftServiceLoader.load(service, Thread.currentThread().getContextClassLoader());
  }
 
  /**

diff --git a/...m/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy b/...m/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy
@@ -333,8 +333,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
 
  private Class<?> loadServiceClass(Class<Service> clazz) {
  final String serviceClassName = clazz.package.getName() + '.' + clazz.simpleName[1..-15]
- final ClassLoader cl = org.grails.datastore.mapping.reflect.ClassUtils.classLoader
- final Class<?> serviceClass = cl.loadClass(serviceClassName)
+ final Class<?> serviceClass = classLoader.loadClass(serviceClassName)
  serviceClass
  }