diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/support/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java similarity index 94% rename from spring-batch-core/src/main/java/org/springframework/batch/core/support/DefaultJobParametersConverter.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java index 0f1be2a68..84c8c3caa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/support/DefaultJobParametersConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.support; +package org.springframework.batch.core.converter; import java.text.DateFormat; import java.text.DecimalFormat; @@ -64,7 +64,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter { * @throws IllegalArgumentException if a number or date is passed in that cannot be parsed, or cast to the correct * type. * - * @see org.springframework.batch.core.support.JobParametersConverter#getJobParameters(java.util.Properties) + * @see org.springframework.batch.core.converter.JobParametersConverter#getJobParameters(java.util.Properties) */ public JobParameters getJobParameters(Properties props) { @@ -114,7 +114,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter { /** * Use the same suffixes to create properties (omitting the string suffix because it is the default). * - * @see org.springframework.batch.core.support.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) + * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) */ public Properties getProperties(JobParameters params) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/support/JobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/support/JobParametersConverter.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java index 01a091b49..ad1aadf5f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/support/JobParametersConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.support; +package org.springframework.batch.core.converter; import java.util.Properties; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/support/StepExecutionResourceProxy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java similarity index 99% rename from spring-batch-core/src/main/java/org/springframework/batch/core/support/StepExecutionResourceProxy.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java index 3689cae67..67a98d401 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/support/StepExecutionResourceProxy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.support; +package org.springframework.batch.core.converter; import java.io.File; import java.io.IOException; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/package.html similarity index 100% rename from spring-batch-core/src/main/java/org/springframework/batch/core/support/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/converter/package.html diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java index 9ef8ab4ed..bf1ded2e4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java @@ -23,9 +23,9 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobLocator; +import org.springframework.batch.core.converter.DefaultJobParametersConverter; +import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.batch.core.support.DefaultJobParametersConverter; -import org.springframework.batch.core.support.JobParametersConverter; import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java index d5865b711..7f646ebb0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java @@ -26,7 +26,7 @@ import java.util.Map.Entry; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; -import org.springframework.batch.core.support.JobParametersConverter; +import org.springframework.batch.core.converter.JobParametersConverter; /** * @author Lucas Ward @@ -72,7 +72,7 @@ public class ScheduledJobParametersFactory implements JobParametersConverter { /** * Convert schedule date to Date, and assume all other parameters can be represented by their default string value. * - * @see org.springframework.batch.core.support.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) + * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) */ public Properties getProperties(JobParameters params) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java index 24a2ce1d3..28f81bddb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java @@ -25,12 +25,12 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.configuration.JobLocator; +import org.springframework.batch.core.converter.DefaultJobParametersConverter; +import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.NoSuchJobException; -import org.springframework.batch.core.support.DefaultJobParametersConverter; -import org.springframework.batch.core.support.JobParametersConverter; import org.springframework.batch.support.PropertiesConverter; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/support/DefaultJobParametersConverterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java similarity index 97% rename from spring-batch-core/src/test/java/org/springframework/batch/core/support/DefaultJobParametersConverterTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java index 02aea5a6d..0df38d630 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/support/DefaultJobParametersConverterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.support; +package org.springframework.batch.core.converter; import java.text.DateFormat; import java.text.DecimalFormat; @@ -25,7 +25,7 @@ import junit.framework.TestCase; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; -import org.springframework.batch.core.support.DefaultJobParametersConverter; +import org.springframework.batch.core.converter.DefaultJobParametersConverter; import org.springframework.util.StringUtils; /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/support/StepExecutionResourceProxyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java similarity index 96% rename from spring-batch-core/src/test/java/org/springframework/batch/core/support/StepExecutionResourceProxyTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java index c48a7a075..d5987ed25 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/support/StepExecutionResourceProxyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.support; +package org.springframework.batch.core.converter; import java.io.File; import java.io.IOException; @@ -27,9 +27,9 @@ import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.converter.StepExecutionResourceProxy; import org.springframework.batch.core.job.JobSupport; import org.springframework.batch.core.step.StepSupport; -import org.springframework.batch.core.support.StepExecutionResourceProxy; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncherTests.java index d97ff815e..3c35fc9af 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncherTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncherTests.java @@ -28,12 +28,12 @@ import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.configuration.support.MapJobRegistry; import org.springframework.batch.core.configuration.support.ReferenceJobFactory; +import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.job.JobSupport; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.support.SimpleExportedJobLauncher; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.step.StepSupport; -import org.springframework.batch.core.support.JobParametersConverter; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.support.PropertiesConverter;