From 09d852285f8bf3773b7e4afaf69b3dd85a93b104 Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 14 Jan 2010 11:05:30 +0000 Subject: [PATCH] BATCH-1483: resolve cycle by moving interface to parent package --- .../batch/core/test/repository/JobSupport.java | 2 +- .../src/main/java/org/springframework/batch/core/Job.java | 2 -- .../batch/core/{job => }/JobParametersValidator.java | 5 +---- .../batch/core/configuration/support/GroupAwareJob.java | 2 +- .../core/configuration/xml/JobParserJobFactoryBean.java | 2 +- .../java/org/springframework/batch/core/job/AbstractJob.java | 1 + .../batch/core/job/DefaultJobParametersValidator.java | 1 + .../core/configuration/support/DefaultJobLoaderTests.java | 2 +- .../core/configuration/xml/JobParserValidatorTests.java | 2 +- .../java/org/springframework/batch/core/job/JobSupport.java | 1 + .../batch/sample/quartz/JobLauncherDetailsTests.java | 2 +- 11 files changed, 10 insertions(+), 12 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/{job => }/JobParametersValidator.java (68%) diff --git a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/repository/JobSupport.java b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/repository/JobSupport.java index b885873b8..9183ce255 100644 --- a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/repository/JobSupport.java +++ b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/repository/JobSupport.java @@ -22,10 +22,10 @@ import java.util.List; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParametersIncrementer; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.Step; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.core.job.DefaultJobParametersValidator; -import org.springframework.batch.core.job.JobParametersValidator; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java index 4eda25b93..f6c5cafaf 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java @@ -15,8 +15,6 @@ */ package org.springframework.batch.core; -import org.springframework.batch.core.job.JobParametersValidator; - /** * Batch domain object representing a job. Job is an explicit abstraction * representing the configuration of a job specified by a developer. It should diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java similarity index 68% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/JobParametersValidator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java index 4b2cc10fc..8e21e2ada 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobParametersValidator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java @@ -1,8 +1,5 @@ -package org.springframework.batch.core.job; +package org.springframework.batch.core; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersInvalidException; /** * Strategy interface for a {@link Job} to use in validating its parameters for diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java index f470c996a..8b56cb913 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java @@ -18,7 +18,7 @@ package org.springframework.batch.core.configuration.support; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParametersIncrementer; -import org.springframework.batch.core.job.JobParametersValidator; +import org.springframework.batch.core.JobParametersValidator; /** * A {@link Job} that can optionally prepend a group name to another job's name, diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java index 43b5ebbd9..5e56019e8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.batch.core.configuration.xml; import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.JobParametersIncrementer; -import org.springframework.batch.core.job.JobParametersValidator; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.job.flow.Flow; import org.springframework.batch.core.job.flow.FlowJob; import org.springframework.batch.core.repository.JobRepository; 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 e61f82aff..b470d89e6 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 @@ -29,6 +29,7 @@ import org.springframework.batch.core.JobExecutionException; import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.JobParametersIncrementer; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.StartLimitExceededException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java index f91ce9b61..6a8ff8ffa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java @@ -7,6 +7,7 @@ import java.util.Set; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersInvalidException; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java index 8892594e2..afbfddb54 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParametersIncrementer; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.configuration.JobRegistry; -import org.springframework.batch.core.job.JobParametersValidator; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java index 0f5221f25..f0bd52524 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java @@ -26,9 +26,9 @@ import org.junit.runner.RunWith; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersInvalidException; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.job.AbstractJob; import org.springframework.batch.core.job.DefaultJobParametersValidator; -import org.springframework.batch.core.job.JobParametersValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java index bc440f604..a55bdde09 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java @@ -22,6 +22,7 @@ import java.util.List; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParametersIncrementer; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.Step; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.beans.factory.BeanNameAware; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java index 941ecc4b7..84d110a01 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java @@ -34,8 +34,8 @@ import org.quartz.spi.TriggerFiredBundle; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersIncrementer; +import org.springframework.batch.core.JobParametersValidator; import org.springframework.batch.core.configuration.JobLocator; -import org.springframework.batch.core.job.JobParametersValidator; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.NoSuchJobException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;