Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-1308 - Load TransactionalProxy through the provided class loader.

Browse Source 
We now load TransactionalProxy through the configured class loader for a consistent class loader usage. Loading types reflectively through the same class loader prevents visibility issues. Previously, we did not specify any class loader which defaults to the Thread's ClassLoader and which can be a different one than the configured class loader. This can cause visibility issues when implementing proxy classes as the proxy factory checks for visibilit of the particularly implemented interfaces.
This commit is contained in:
Mark Paluch
2018-05-03 15:53:36 +02:00
parent 6348a3d7ee
commit 73415d0593
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2017 the original author or authors.
* Copyright 2008-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -59,12 +59,12 @@ import org.springframework.util.ObjectUtils;
* detection strategy can be configured by setting {@link QueryLookupStrategy.Key}.
*
* @author Oliver Gierke
* @author Mark Paluch
*/
public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, BeanFactoryAware {
private static final boolean IS_JAVA_8 = org.springframework.util.ClassUtils.isPresent("java.util.Optional",
RepositoryFactorySupport.class.getClassLoader());
private static final Class<?> TRANSACTION_PROXY_TYPE = getTransactionProxyType();
private final Map<RepositoryInformationCacheKey, RepositoryInformation> repositoryInformationCache = new HashMap<RepositoryInformationCacheKey, RepositoryInformation>();
private final List<RepositoryProxyPostProcessor> postProcessors = new ArrayList<RepositoryProxyPostProcessor>();
@@ -205,8 +205,9 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
result.addAdvice(SurroundingTransactionDetectorMethodInterceptor.INSTANCE);
result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
if (TRANSACTION_PROXY_TYPE != null) {
result.addInterface(TRANSACTION_PROXY_TYPE);
Class<?> transactionProxyType = getTransactionProxyType();
if (transactionProxyType != null) {
result.addInterface(transactionProxyType);
}
for (RepositoryProxyPostProcessor processor : postProcessors) {
@@ -383,15 +384,16 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
}
/**
* Returns the TransactionProxy type or {@literal null} if not on the classpath.
* Returns the TransactionProxy type or {@literal null} if not on the classpath. Use the provided classloader to avoid
* visibility issues.
*
* @return
*/
private static Class<?> getTransactionProxyType() {
private Class<?> getTransactionProxyType() {
try {
return org.springframework.util.ClassUtils
.forName("org.springframework.transaction.interceptor.TransactionalProxy", null);
.forName("org.springframework.transaction.interceptor.TransactionalProxy", classLoader);
} catch (ClassNotFoundException o_O) {
return null;
}