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

BATCH-1213: Moved reusable BeanFactoryPostProcessor functionality into a new utility class CoreNamespaceBeanDefinitionUtils

Browse Source
This commit is contained in:
dhgarrette
2009-05-21 22:02:50 +00:00
parent 2514f32860
commit d6844b6d23
2 changed files with 120 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceBeanDefinitionUtils.java Normal file
View File

@@ -0,0 +1,118 @@
/*
* Copyright 2006-2007 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.core.configuration.xml;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.PropertyValues;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
/**
* @author Dan Garrette
* @since 2.0.1
*/
public class CoreNamespaceBeanDefinitionUtils {
/**
* @param bd a {@link BeanDefinition}
* @param beanFactory a {@link BeanFactory}
* @return TRUE if the bean represents an {@link AbstractStep} (or
* {@link StepParserStepFactoryBean}).
*/
public static boolean isAbstractStep(BeanDefinition bd, ConfigurableListableBeanFactory beanFactory) {
return isBeanClassAssignable(bd, new Class<?>[] { StepParserStepFactoryBean.class, AbstractStep.class },
beanFactory);
}
/**
* @param bd a {@link BeanDefinition}
* @param types an array of {@link Class} objects.
* @param beanFactory a {@link BeanFactory}
* @return TRUE if the given {@link BeanDefinition}'s bean class is one of
* the given types (or a subtype thereof).
*/
public static boolean isBeanClassAssignable(BeanDefinition bd, Class<?>[] types,
ConfigurableListableBeanFactory beanFactory) {
Class<?> stepClass = getClass(bd, beanFactory);
for (Class<?> type : types) {
if (ClassUtils.isAssignable(type, stepClass)) {
return true;
}
}
return false;
}
/**
* @param bd a {@link BeanDefinition}
* @param beanFactory a {@link BeanFactory}
* @return The class of the bean. Search parent hierarchy if necessary.
* Return null if none is found.
*/
public static Class<?> getClass(BeanDefinition bd, ConfigurableListableBeanFactory beanFactory) {
// Get the declared class of the bean
String className = bd.getBeanClassName();
if (StringUtils.hasText(className)) {
try {
return ClassUtils.forName(className);
}
catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
else {
// Search the parent until you find it
String parentName = bd.getParentName();
if (StringUtils.hasText(parentName)) {
return getClass(beanFactory.getBeanDefinition(parentName), beanFactory);
}
else {
return null;
}
}
}
/**
* @param bd a {@link BeanDefinition}
* @param propertyName the name of the property
* @param beanFactory a {@link BeanFactory}
* @return The {@link PropertyValue} for the {@link JobRepository} of the
* bean. Search parent hierarchy if necessary. Return null if none
* is found.
*/
public static PropertyValue getPropertyValue(BeanDefinition bd, String propertyName,
ConfigurableListableBeanFactory beanFactory) {
PropertyValues jobDefPvs = bd.getPropertyValues();
if (jobDefPvs.contains(propertyName)) {
// return the property
return jobDefPvs.getPropertyValue(propertyName);
}
else {
// Search the parent until you find it
String parentName = bd.getParentName();
if (StringUtils.hasText(parentName)) {
return getPropertyValue(beanFactory.getBeanDefinition(parentName), propertyName, beanFactory);
}
else {
return null;
}
}
}
}

62
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java
View File

@@ -16,11 +16,9 @@
package org.springframework.batch.core.configuration.xml;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.PropertyValues;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -29,7 +27,6 @@ import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.util.StringUtils;
/**
* Post-process jobs and steps defined using the batch namespace to inject
@@ -61,7 +58,7 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor
BeanDefinition bd = beanFactory.getBeanDefinition(beanName);
MutablePropertyValues pvs = (MutablePropertyValues) bd.getPropertyValues();
if (pvs.contains(JOB_FACTORY_PROPERTY_NAME)) {
if (isAbstractStep(bd, beanFactory)) {
if (CoreNamespaceBeanDefinitionUtils.isAbstractStep(bd, beanFactory)) {
String jobName = (String) pvs.getPropertyValue(JOB_FACTORY_PROPERTY_NAME).getValue();
PropertyValue jobRepository = getJobRepository(jobName, beanFactory);
if (jobRepository != null) {
@@ -80,47 +77,6 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor
}
}
/**
* @param bd
* @param beanFactory
* @return TRUE if the bean represents an AbstractStep (or
* StepParserStepFactoryBean).
*/
private boolean isAbstractStep(BeanDefinition bd, ConfigurableListableBeanFactory beanFactory) {
Class<?> stepClass = getClass(bd, beanFactory);
return StepParserStepFactoryBean.class.isAssignableFrom(stepClass)
|| AbstractStep.class.isAssignableFrom(stepClass);
}
/**
* @param bd
* @param beanFactory
* @return The class of the bean. Search parent hierarchy if necessary.
* Return null if none is found.
*/
private Class<?> getClass(BeanDefinition bd, ConfigurableListableBeanFactory beanFactory) {
// Get the declared class of the bean
String className = bd.getBeanClassName();
if (StringUtils.hasText(className)) {
try {
return Class.forName(className);
}
catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
else {
// Search the parent until you find it
String parentName = bd.getParentName();
if (StringUtils.hasText(parentName)) {
return getClass(beanFactory.getBeanDefinition(parentName), beanFactory);
}
else {
return null;
}
}
}
/**
* @param jobName
* @param beanFactory
@@ -130,21 +86,7 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor
*/
private PropertyValue getJobRepository(String jobName, ConfigurableListableBeanFactory beanFactory) {
BeanDefinition jobDef = beanFactory.getBeanDefinition(jobName);
PropertyValues jobDefPvs = jobDef.getPropertyValues();
if (jobDefPvs.contains(JOB_REPOSITORY_PROPERTY_NAME)) {
// return the job repository property
return jobDefPvs.getPropertyValue(JOB_REPOSITORY_PROPERTY_NAME);
}
else {
// Search the parent until you find it
String parentName = jobDef.getParentName();
if (StringUtils.hasText(parentName)) {
return getJobRepository(parentName, beanFactory);
}
else {
return null;
}
}
return CoreNamespaceBeanDefinitionUtils.getPropertyValue(jobDef, JOB_REPOSITORY_PROPERTY_NAME, beanFactory);
}
/**