BATCH-1483: resolve cycle by moving interface to parent package

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;
 

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

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

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,

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;

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;

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;
 

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;
 

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;

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;

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;