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

DATACMNS-69 - Updated cache key to bean name rather than class.

Browse Source
This commit is contained in:
Phil Webb
2011-09-01 12:45:49 +01:00
committed by Oliver Gierke
parent 1646f85a53
commit 112127d35f
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java
View File

@@ -27,28 +27,22 @@ import org.springframework.beans.factory.config.InstantiationAwareBeanPostProces
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.util.ClassUtils;
/**
* A
* {@link org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor}
* implementing {@code #predictBeanType(Class, String)} to return the configured
* repository interface from {@link RepositoryFactoryBeanSupport}s. This is done
* as shortcut to prevent the need of instantiating
* {@link RepositoryFactoryBeanSupport}s just to find out what repository
* interface they actually create.
*
* A {@link org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor} implementing
* {@code #predictBeanType(Class, String)} to return the configured repository interface from
* {@link RepositoryFactoryBeanSupport}s. This is done as shortcut to prevent the need of instantiating
* {@link RepositoryFactoryBeanSupport}s just to find out what repository interface they actually create.
*
* @author Oliver Gierke
*/
class RepositoryInterfaceAwareBeanPostProcessor extends
InstantiationAwareBeanPostProcessorAdapter implements BeanFactoryAware {
class RepositoryInterfaceAwareBeanPostProcessor extends InstantiationAwareBeanPostProcessorAdapter implements
BeanFactoryAware {
private static final Class<?> REPOSITORY_TYPE =
RepositoryFactoryBeanSupport.class;
private static final Class<?> REPOSITORY_TYPE = RepositoryFactoryBeanSupport.class;
private final Map<Class<?>, Class<?>> cache = new ConcurrentHashMap<Class<?>, Class<?>>();
private final Map<String, Class<?>> cache = new ConcurrentHashMap<String, Class<?>>();
private ConfigurableListableBeanFactory context;
/*
* (non-Javadoc)
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
@@ -60,7 +54,6 @@ class RepositoryInterfaceAwareBeanPostProcessor extends
}
}
/*
* (non-Javadoc)
* @see org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter#predictBeanType(java.lang.Class, java.lang.String)
@@ -73,26 +66,24 @@ class RepositoryInterfaceAwareBeanPostProcessor extends
}
BeanDefinition definition = context.getBeanDefinition(beanName);
PropertyValue value =
definition.getPropertyValues().getPropertyValue(
"repositoryInterface");
if (cache.containsKey(beanClass)) {
return cache.get(beanClass);
PropertyValue value = definition.getPropertyValues().getPropertyValue("repositoryInterface");
Class<?> resolvedBeanClass = cache.get(beanName);
if (cache.containsKey(beanName)) {
return cache.get(beanName);
}
Class<?> resolvedBeanClass = getClassForPropertyValue(value);
cache.put(beanClass, resolvedBeanClass);
resolvedBeanClass = getClassForPropertyValue(value);
cache.put(beanName, resolvedBeanClass);
return resolvedBeanClass;
}
/**
* Returns the class which is configured in the given {@link PropertyValue}.
* In case it is not a {@link TypedStringValue} or the value contained
* cannot be interpreted as {@link Class} it will return null.
*
* Returns the class which is configured in the given {@link PropertyValue}. In case it is not a
* {@link TypedStringValue} or the value contained cannot be interpreted as {@link Class} it will return null.
*
* @param propertyValue
* @return
*/
@@ -112,9 +103,7 @@ class RepositoryInterfaceAwareBeanPostProcessor extends
}
try {
return ClassUtils.resolveClassName(className,
RepositoryInterfaceAwareBeanPostProcessor.class
.getClassLoader());
return ClassUtils.resolveClassName(className, RepositoryInterfaceAwareBeanPostProcessor.class.getClassLoader());
} catch (IllegalArgumentException ex) {
return null;
}