From 70b24ccffb5088b90575fa6b4ccfcd88693fae1b Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Thu, 12 Mar 2009 21:36:29 +0000 Subject: [PATCH] RESOLVED - BATCH-1141: Rename CompositeExecutionJobListener to CompositeJobExecutionListener --- .../org/springframework/batch/core/job/AbstractJob.java | 4 ++-- ...obListener.java => CompositeJobExecutionListener.java} | 2 +- .../batch/core/configuration/xml/JobParserTests.java | 4 ++-- .../core/listener/CompositeJobExecutionListenerTests.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/listener/{CompositeExecutionJobListener.java => CompositeJobExecutionListener.java} (97%) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index 75b4e8a89..13f1b333f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -33,7 +33,7 @@ import org.springframework.batch.core.JobParametersIncrementer; import org.springframework.batch.core.StartLimitExceededException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.listener.CompositeExecutionJobListener; +import org.springframework.batch.core.listener.CompositeJobExecutionListener; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.step.StepLocator; @@ -63,7 +63,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, In private JobRepository jobRepository; - private CompositeExecutionJobListener listener = new CompositeExecutionJobListener(); + private CompositeJobExecutionListener listener = new CompositeJobExecutionListener(); private JobParametersIncrementer jobParametersIncrementer; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java index 76e87ff68..7506b3689 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java @@ -26,7 +26,7 @@ import org.springframework.core.Ordered; * @author Dave Syer * */ -public class CompositeExecutionJobListener implements JobExecutionListener { +public class CompositeJobExecutionListener implements JobExecutionListener { private OrderedComposite listeners = new OrderedComposite(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserTests.java index cefafcd9a..3d0e3a9d8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserTests.java @@ -28,7 +28,7 @@ import org.springframework.aop.framework.Advised; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.job.AbstractJob; -import org.springframework.batch.core.listener.CompositeExecutionJobListener; +import org.springframework.batch.core.listener.CompositeJobExecutionListener; import org.springframework.batch.core.listener.JobExecutionListenerSupport; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -83,7 +83,7 @@ public class JobParserTests { listenerField.setAccessible(true); Object compositeListener = listenerField.get(job); - Field compositeField = CompositeExecutionJobListener.class.getDeclaredField("listeners"); + Field compositeField = CompositeJobExecutionListener.class.getDeclaredField("listeners"); compositeField.setAccessible(true); Object composite = compositeField.get(compositeListener); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java index efd133ebc..307ecca96 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java @@ -30,13 +30,13 @@ import org.springframework.batch.core.JobInstance; */ public class CompositeJobExecutionListenerTests extends TestCase { - private CompositeExecutionJobListener listener = new CompositeExecutionJobListener(); + private CompositeJobExecutionListener listener = new CompositeJobExecutionListener(); private List list = new ArrayList(); /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#setListeners(List)} + * {@link org.springframework.batch.core.listener.CompositeJobExecutionListener#setListeners(List)} */ public void testSetListeners() { listener.setListeners(Arrays.asList(new JobExecutionListenerSupport() { @@ -54,7 +54,7 @@ public class CompositeJobExecutionListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#register(org.springframework.batch.core.JobExecutionListener)} + * {@link org.springframework.batch.core.listener.CompositeJobExecutionListener#register(org.springframework.batch.core.JobExecutionListener)} * . */ public void testSetListener() { @@ -69,7 +69,7 @@ public class CompositeJobExecutionListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#beforeJob(JobExecution)} + * {@link org.springframework.batch.core.listener.CompositeJobExecutionListener#beforeJob(JobExecution)} * . */ public void testOpen() {