From b2a0d0343e4c3dbf1b9ac4734a9af97c2f6f0a33 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Wed, 11 Oct 2023 20:28:42 +0200 Subject: [PATCH] Rename samples base package to org.springframework.batch.samples --- pom.xml | 2 +- .../modules/ROOT/pages/processor.adoc | 4 +- .../pages/readers-and-writers/database.adoc | 8 +- .../flat-files/file-item-reader.adoc | 2 +- .../process-indicator.adoc | 2 +- .../xml-reading-writing.adoc | 12 +-- .../modules/ROOT/pages/step/tasklet.adoc | 2 +- spring-batch-samples/README.md | 70 +++++++++--------- .../adapter/readerwriter/README.md | 0 .../adapter/tasklet/README.md | 0 .../adapter/tasklet/Task.java | 2 +- .../amqp/AmqpJobConfiguration.java | 2 +- .../amqp/AmqpMessageProducer.java | 4 +- .../amqp/MessageProcessor.java | 2 +- .../batch/{sample => samples}/amqp/README.md | 0 .../{sample => samples}/beanwrapper/README.md | 0 .../chunking/DataSourceConfiguration.java | 2 +- .../chunking/ManagerConfiguration.java | 4 +- .../chunking/WorkerConfiguration.java | 4 +- .../common/ColumnRangePartitioner.java | 2 +- .../common/ErrorLogTasklet.java | 2 +- .../{sample => samples}/common/LogAdvice.java | 2 +- .../common/OutputFileListener.java | 2 +- .../common/OutputFileNameListener.java | 2 +- .../common/ProcessIndicatorItemWrapper.java | 2 +- .../common/SkipCheckingDecider.java | 2 +- .../common/SkipCheckingListener.java | 4 +- .../common/StagingItemListener.java | 2 +- .../common/StagingItemProcessor.java | 2 +- .../common/StagingItemReader.java | 2 +- .../common/StagingItemWriter.java | 2 +- .../StepExecutionApplicationEventAdvice.java | 4 +- .../compositewriter/README.md | 0 .../config/DataSourceConfiguration.java | 2 +- .../domain/person/Child.java | 2 +- .../domain/person/Person.java | 4 +- .../domain/person/PersonService.java | 4 +- .../domain/person/internal/PersonWriter.java | 4 +- .../CompositeCustomerUpdateLineTokenizer.java | 2 +- .../domain/trade/CustomerCredit.java | 2 +- .../domain/trade/CustomerCreditDao.java | 2 +- .../domain/trade/CustomerDao.java | 2 +- .../domain/trade/CustomerDebit.java | 2 +- .../domain/trade/CustomerDebitDao.java | 2 +- .../domain/trade/CustomerOperation.java | 2 +- .../domain/trade/CustomerUpdate.java | 2 +- .../trade/CustomerUpdateFieldSetMapper.java | 2 +- .../domain/trade/CustomerUpdateProcessor.java | 4 +- .../domain/trade/CustomerUpdateWriter.java | 2 +- .../domain/trade/InvalidCustomerLogger.java | 2 +- .../domain/trade/Trade.java | 2 +- .../domain/trade/TradeDao.java | 2 +- .../CommonsLoggingInvalidCustomerLogger.java | 8 +- .../CustomerCreditFieldSetMapper.java | 4 +- .../CustomerCreditIncreaseProcessor.java | 4 +- .../internal/CustomerCreditItemWriter.java | 6 +- .../internal/CustomerCreditRowMapper.java | 4 +- ...erCreditUpdatePreparedStatementSetter.java | 4 +- .../internal/CustomerCreditUpdateWriter.java | 6 +- .../internal/CustomerDebitRowMapper.java | 4 +- .../trade/internal/CustomerUpdateWriter.java | 8 +- .../internal/FlatFileCustomerCreditDao.java | 6 +- .../internal/GeneratingTradeItemReader.java | 4 +- ...ibernateAwareCustomerCreditItemWriter.java | 6 +- .../trade/internal/HibernateCreditDao.java | 10 +-- .../internal/ItemTrackingTradeItemWriter.java | 4 +- .../trade/internal/JdbcCustomerDao.java | 6 +- .../trade/internal/JdbcCustomerDebitDao.java | 6 +- .../domain/trade/internal/JdbcTradeDao.java | 6 +- .../trade/internal/TradeFieldSetMapper.java | 4 +- .../domain/trade/internal/TradeProcessor.java | 4 +- .../domain/trade/internal/TradeRowMapper.java | 4 +- .../domain/trade/internal/TradeWriter.java | 6 +- .../internal/validator/TradeValidator.java | 4 +- .../delimited/DelimitedJobConfiguration.java | 6 +- .../file/delimited/README.md | 0 .../fixed/FixedLengthJobConfiguration.java | 6 +- .../{sample => samples}/file/fixed/README.md | 2 +- .../file/json/JsonJobConfiguration.java | 4 +- .../{sample => samples}/file/json/README.md | 0 .../multiline/MultiLineJobConfiguration.java | 2 +- .../multiline/MultiLineTradeItemReader.java | 2 +- .../multiline/MultiLineTradeItemWriter.java | 2 +- .../file/multiline/README.md | 0 .../file/multiline/Trade.java | 2 +- .../multilineaggregate/AggregateItem.java | 2 +- .../AggregateItemFieldSetMapper.java | 2 +- .../AggregateItemReader.java | 2 +- .../file/multilineaggregate/README.md | 0 .../DelegatingTradeLineAggregator.java | 6 +- .../MultiRecordTypeJobConfiguration.java | 10 +-- .../file/multirecordtype/README.md | 0 .../MultiResourceJobConfiguration.java | 6 +- .../file/multiresource/README.md | 0 .../file/patternmatching/Address.java | 2 +- .../file/patternmatching/BillingInfo.java | 2 +- .../file/patternmatching/Customer.java | 2 +- .../file/patternmatching/LineItem.java | 2 +- .../file/patternmatching/Order.java | 2 +- .../file/patternmatching/README.md | 0 .../file/patternmatching/ShippingInfo.java | 2 +- .../internal/OrderItemReader.java | 14 ++-- .../internal/OrderLineAggregator.java | 6 +- .../extractor/AddressFieldExtractor.java | 6 +- .../extractor/BillingInfoFieldExtractor.java | 6 +- .../extractor/CustomerFieldExtractor.java | 6 +- .../extractor/FooterFieldExtractor.java | 4 +- .../extractor/HeaderFieldExtractor.java | 4 +- .../extractor/LineItemFieldExtractor.java | 4 +- .../mapper/AddressFieldSetMapper.java | 4 +- .../mapper/BillingFieldSetMapper.java | 4 +- .../mapper/CustomerFieldSetMapper.java | 4 +- .../internal/mapper/HeaderFieldSetMapper.java | 4 +- .../mapper/OrderItemFieldSetMapper.java | 4 +- .../mapper/ShippingFieldSetMapper.java | 4 +- .../internal/validator/OrderValidator.java | 14 ++-- .../internal/xml/Customer.java | 2 +- .../internal/xml/LineItem.java | 2 +- .../patternmatching/internal/xml/Order.java | 2 +- .../patternmatching/internal/xml/Shipper.java | 2 +- .../{sample => samples}/file/xml/README.md | 0 .../file/xml/XmlJobConfiguration.java | 6 +- .../{sample => samples}/filter/README.md | 0 .../football/FootballJobConfiguration.java | 22 +++--- .../{sample => samples}/football/Game.java | 2 +- .../{sample => samples}/football/Player.java | 2 +- .../football/PlayerDao.java | 2 +- .../football/PlayerSummary.java | 2 +- .../{sample => samples}/football/README.md | 14 ++-- .../internal/FootballExceptionHandler.java | 2 +- .../football/internal/GameFieldSetMapper.java | 4 +- .../football/internal/JdbcGameDao.java | 4 +- .../football/internal/JdbcPlayerDao.java | 6 +- .../internal/JdbcPlayerSummaryDao.java | 4 +- .../internal/PlayerFieldSetMapper.java | 4 +- .../football/internal/PlayerItemWriter.java | 6 +- .../internal/PlayerSummaryMapper.java | 4 +- .../internal/PlayerSummaryRowMapper.java | 4 +- .../headerfooter/README.md | 0 .../jdbc/JdbcReaderBatchWriterSampleJob.java | 8 +- .../batch/{sample => samples}/jdbc/README.md | 0 .../JdbcCursorReaderBatchWriterSampleJob.java | 8 +- .../JdbcPagingReaderBatchWriterSampleJob.java | 8 +- .../{sample => samples}/jobstep/README.md | 0 .../jpa/CustomerCreditCrudRepository.java | 4 +- ...tomerCreditPagingAndSortingRepository.java | 4 +- .../jpa/JpaJobConfiguration.java | 8 +- .../jpa/JpaRepositoryJobConfiguration.java | 12 ++- .../batch/{sample => samples}/jpa/README.md | 0 .../launch/DefaultJobLoader.java | 2 +- .../{sample => samples}/launch/JobLoader.java | 2 +- ...onousItemProcessingWithVirtualThreads.java | 2 +- ...ionForLaunchingJobsWithVirtualThreads.java | 2 +- ...ningConcurrentStepsWithVirtualThreads.java | 2 +- ...unningParallelStepsWithVirtualThreads.java | 2 +- ...ingPartitionedStepsWithVirtualThreads.java | 2 +- ...stemCommandTaskletsWithVirtualThreads.java | 2 +- .../GeneratingTradeResettingListener.java | 4 +- .../loop/LimitDecider.java | 2 +- .../batch/{sample => samples}/loop/README.md | 0 .../batch/{sample => samples}/mail/README.md | 0 .../mail/TestMailErrorHandler.java | 2 +- .../mail/TestMailSender.java | 2 +- .../batch/{sample => samples}/mail/User.java | 2 +- .../mail/UserMailItemProcessor.java | 3 +- .../metrics/BatchMetricsApplication.java | 2 +- .../metrics/Job1Configuration.java | 2 +- .../metrics/Job2Configuration.java | 2 +- .../metrics/JobScheduler.java | 2 +- .../metrics/PrometheusConfiguration.java | 2 +- .../{sample => samples}/misc/groovy/README.md | 0 .../misc/jmx/InfiniteLoopReader.java | 2 +- .../misc/jmx/InfiniteLoopWriter.java | 2 +- .../JobExecutionNotificationPublisher.java | 2 +- .../{sample => samples}/misc/jmx/README.md | 0 .../jmx/SimpleMessageApplicationEvent.java | 2 +- .../misc/quartz/JobLauncherDetails.java | 2 +- .../{sample => samples}/misc/quartz/README.md | 5 +- .../mongodb/DeletionJobConfiguration.java | 2 +- .../mongodb/InsertionJobConfiguration.java | 2 +- .../mongodb/MongoDBConfiguration.java | 4 +- .../mongodb/MongoDBSampleApp.java | 2 +- .../{sample => samples}/mongodb/Person.java | 2 +- .../partitioning/local/README.md | 0 .../partitioning/remote/BasicPartitioner.java | 2 +- .../remote/BrokerConfiguration.java | 4 +- .../remote/DataSourceConfiguration.java | 4 +- .../aggregating/ManagerConfiguration.java | 8 +- .../aggregating/WorkerConfiguration.java | 6 +- .../remote/polling/ManagerConfiguration.java | 8 +- .../remote/polling/WorkerConfiguration.java | 6 +- .../processindicator/README.md | 0 .../restart/fail/README.md | 0 .../restart/stop/README.md | 0 .../retry/RetrySampleConfiguration.java | 8 +- .../skip/DataSourceConfiguration.java | 2 +- ...SkippableExceptionDuringProcessSample.java | 2 +- .../SkippableExceptionDuringReadSample.java | 2 +- .../SkippableExceptionDuringWriteSample.java | 2 +- .../support/DummyItemWriter.java | 2 +- .../ExceptionThrowingItemReaderProxy.java | 2 +- .../support/HeaderCopyCallback.java | 2 +- .../support/RetrySampleItemWriter.java | 2 +- .../support/SummaryFooterCallback.java | 2 +- .../batch/{sample => samples}/trade/README.md | 0 .../ValidationSampleConfiguration.java | 4 +- .../validation/domain/Person.java | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../adapter/readerwriter/delegatingJob.xml | 2 +- .../adapter/tasklet/taskletJob.xml | 4 +- .../amqp/default.amqp.properties | 0 .../amqp/job/amqp-example-job.xml | 4 +- .../amqp/job/rabbitmq-beans.xml | 2 +- .../beanwrapper/data/ImportPersonDataStep.txt | 0 .../beanwrapper/data/ImportTradeDataStep.txt | 0 .../job/beanWrapperMapperSampleJob.xml | 16 ++-- .../chunking/remote-chunking.properties | 0 .../data/ImportTradeDataStep.txt | 0 .../job/compositeItemWriterSampleJob.xml | 10 +-- .../file/delimited/data/delimited.csv | 0 .../file/delimited/job/delimited.xml | 4 +- .../file/fixed/data/fixedLength.txt | 0 .../file/fixed/job/fixedLength.xml | 4 +- .../file/json/data/trades.json | 0 .../file/multiline/data/multiLine.txt | 0 .../file/multiline/job/multiLine.xml | 4 +- .../multilineaggregate/data/multilineStep.txt | 0 .../multilineaggregate/job/multilineJob.xml | 8 +- .../multirecordtype/data/multiRecordType.txt | 0 .../multirecordtype/job/multiRecordType.xml | 6 +- .../file/multiresource/data/delimited.csv | 0 .../file/multiresource/data/delimited2.csv | 0 .../file/multiresource/job/multiResource.xml | 4 +- .../data/multilineOrderInput.txt | 0 .../data/multilineOrderOutput.txt | 0 .../patternmatching/data/order_sample.txt | 0 .../job/multilineOrderInputTokenizers.xml | 0 .../patternmatching/job/multilineOrderJob.xml | 18 ++--- .../job/multilineOrderOutputAggregators.xml | 12 +-- .../job/multilineOrderValidator.xml | 2 +- .../file/xml/data/input.xml | 0 .../{sample => samples}/file/xml/job/xml.xml | 6 +- .../filter/data/customers.txt | 0 .../filter/job/customerFilterJob.xml | 14 ++-- .../football/data/games-small.csv | 0 .../football/data/games.csv | 0 .../data/player-containsBadRecords.csv | 0 .../football/data/player-small1.csv | 0 .../football/data/player-small2.csv | 0 .../football/data/player.csv | 0 .../football/job/footballJob.xml | 18 ++--- .../football/sql/schema.sql | 0 .../headerfooter/data/input.txt | 0 .../headerfooter/job/headerFooterSample.xml | 6 +- .../hibernate/CustomerCredit.hbm.xml | 2 +- .../jdbc/job/jdbcCursor.xml | 4 +- .../jdbc/job/jdbcPaging.xml | 4 +- .../{sample => samples}/jdbc/sql/schema.sql | 0 .../jobstep/data/ImportTradeDataStep.txt | 0 .../jobstep/job/jobStepSample.xml | 8 +- .../batch/{sample => samples}/jpa/job/jpa.xml | 4 +- .../jpa/job/repository.xml | 6 +- .../{sample => samples}/jpa/sql/schema.sql | 0 .../loop/loopFlowSample.xml | 8 +- .../{sample => samples}/mail/mailJob.xml | 8 +- .../metrics/docker-compose.yml | 0 .../metrics/metrics-sample.properties | 0 .../metrics/prometheus.yml | 0 .../metrics/spring-batch-dashboard.json | 0 .../misc/groovy/data/files.zip | Bin .../misc/groovy/job/groovyJob.xml | 2 +- .../misc/jmx/adhoc-job-launcher-context.xml | 6 +- .../misc/jmx/adhocLoopJob.xml | 4 +- .../quartz/quartz-job-launcher-context.xml | 2 +- .../mongodb/mongodb-sample.properties | 0 .../partition/file/data/delimited1.csv | 0 .../partition/file/data/delimited2.csv | 0 .../partition/file/job/partitionFileJob.xml | 10 +-- .../partition/jdbc/partitionJdbcJob.xml | 12 +-- .../remote/remote-partitioning.properties | 0 .../data/ImportTradeDataStep.txt | 0 .../processindicator/job/parallelJob.xml | 16 ++-- .../job/staging-test-context.xml | 4 +- .../restart/fail/data/ImportTradeDataStep.txt | 0 .../restart/fail/job/failRestartSample.xml | 10 +-- .../restart/stop/stopRestartSample.xml | 4 +- .../{sample => samples}/retry/retrySample.xml | 4 +- .../{sample => samples}/skip/data/input1.txt | 0 .../{sample => samples}/skip/data/input2.txt | 0 .../job/skipSample-job-launcher-context.xml | 4 +- .../skip/job/skipSampleJob.xml | 24 +++--- .../trade/data/ImportTradeDataStep.txt | 0 .../trade/data/TradeJob.csv | 0 .../trade/job/tradeJob.xml | 22 +++--- .../resources/simple-job-launcher-context.xml | 4 +- .../DelegatingJobFunctionalTests.java | 6 +- .../TaskletAdapterJobFunctionalTests.java | 4 +- .../amqp/AmqpJobFunctionalTests.java | 6 +- ...WrapperMapperSampleJobFunctionalTests.java | 4 +- .../RemoteChunkingJobFunctionalTests.java | 6 +- .../common/ColumnRangePartitionerTests.java | 2 +- .../common/CustomItemReaderTests.java | 2 +- .../common/CustomItemWriterTests.java | 2 +- ...ExceptionThrowingItemReaderProxyTests.java | 4 +- .../common/OutputFileListenerTests.java | 2 +- .../common/StagingItemReaderTests.java | 4 +- .../common/StagingItemWriterTests.java | 4 +- ...positeItemWriterSampleFunctionalTests.java | 6 +- .../config/JobRunnerConfiguration.java | 2 +- .../AggregateItemFieldSetMapperTests.java | 4 +- .../multiline/AggregateItemReaderTests.java | 6 +- .../domain/multiline/AggregateItemTests.java | 4 +- .../order/AddressFieldSetMapperTests.java | 8 +- .../order/BillingFieldSetMapperTests.java | 8 +- .../order/CustomerFieldSetMapperTests.java | 8 +- .../order/HeaderFieldSetMapperTests.java | 8 +- .../order/OrderItemFieldSetMapperTests.java | 8 +- .../domain/order/OrderItemReaderTests.java | 16 ++-- .../order/ShippingFieldSetMapperTests.java | 8 +- ...ositeCustomerUpdateLineTokenizerTests.java | 2 +- .../trade/CustomerUpdateProcessorTests.java | 20 +++-- .../domain/trade/TradeTests.java | 2 +- .../CustomerCreditIncreaseProcessorTests.java | 7 +- .../CustomerCreditRowMapperTests.java | 6 +- ...ditUpdatePreparedStatementSetterTests.java | 4 +- .../CustomerCreditUpdateProcessorTests.java | 6 +- .../CustomerUpdateProcessorTests.java | 6 +- .../FlatFileCustomerCreditDaoTests.java | 4 +- .../internal/GeneratingItemReaderTests.java | 2 +- .../trade/internal/JdbcTradeWriterTests.java | 4 +- .../internal/TradeFieldSetMapperTests.java | 6 +- .../trade/internal/TradeProcessorTests.java | 6 +- .../trade/internal/TradeRowMapperTests.java | 6 +- .../delimited/DelimitedFunctionalTests.java | 8 +- .../fixed/FixedLengthFunctionalTests.java | 8 +- .../file/json/JsonFunctionalTests.java | 4 +- .../multiline/MultiLineFunctionalTests.java | 6 +- .../MultilineAggregateJobFunctionalTests.java | 4 +- .../MultiRecordTypeFunctionalTests.java | 7 +- .../MultiResourceFunctionalTests.java | 8 +- .../PatternMatchingJobFunctionalTests.java | 6 +- .../validator/OrderValidatorTests.java | 14 ++-- .../file/xml/XmlFunctionalTests.java | 8 +- .../CustomerFilterJobFunctionalTests.java | 4 +- .../football/FootballJobFunctionalTests.java | 4 +- .../internal/JdbcGameDaoIntegrationTests.java | 4 +- .../JdbcPlayerDaoIntegrationTests.java | 4 +- .../JdbcPlayerSummaryDaoIntegrationTests.java | 4 +- .../HeaderFooterSampleFunctionalTests.java | 4 +- .../jdbc/JdbcCursorFunctionalTests.java | 6 +- .../jdbc/JdbcPagingFunctionalTests.java | 6 +- .../jobstep/JobStepFunctionalTests.java | 6 +- .../jpa/JpaFunctionalTests.java | 4 +- .../jpa/RepositoryFunctionalTests.java | 4 +- .../loom/VirtualThreadsSupportTests.java | 8 +- .../loop/LoopFlowSampleFunctionalTests.java | 6 +- .../mail/MailJobFunctionalTests.java | 4 +- .../misc/groovy/GroovyJobFunctionalTests.java | 4 +- ...obExecutionNotificationPublisherTests.java | 2 +- .../misc/jmx/RemoteLauncherTests.java | 8 +- .../misc/quartz/JobLauncherDetailsTests.java | 2 +- .../file/PartitionFileJobFunctionalTests.java | 8 +- .../jdbc/PartitionJdbcJobFunctionalTests.java | 8 +- .../RemotePartitioningJobFunctionalTests.java | 4 +- ...WithMessageAggregationFunctionalTests.java | 8 +- ...bWithRepositoryPollingFunctionalTests.java | 8 +- .../ProcessIndicatorJobFunctionalTests.java | 4 +- .../restart/fail/RestartFunctionalTests.java | 6 +- .../stop/GracefulShutdownFunctionalTests.java | 4 +- .../stop/JobOperatorFunctionalTests.java | 4 +- .../retry/RetrySampleConfigurationTests.java | 10 +-- .../retry/RetrySampleFunctionalTests.java | 8 +- .../skip/SkipSampleFunctionalTests.java | 11 +-- .../support/AbstractFieldSetMapperTests.java | 2 +- .../support/AbstractRowMapperTests.java | 2 +- .../support/ItemTrackingItemWriterTests.java | 6 +- .../support/RetrySampleItemWriterTests.java | 2 +- .../trade/TradeJobFunctionalTests.java | 6 +- .../ValidationSampleFunctionalTests.java | 4 +- 379 files changed, 772 insertions(+), 777 deletions(-) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/adapter/readerwriter/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/adapter/tasklet/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/adapter/tasklet/Task.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/amqp/AmqpJobConfiguration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/amqp/AmqpMessageProducer.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/amqp/MessageProcessor.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/amqp/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/beanwrapper/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/chunking/DataSourceConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/chunking/ManagerConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/chunking/WorkerConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/ColumnRangePartitioner.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/ErrorLogTasklet.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/LogAdvice.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/OutputFileListener.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/OutputFileNameListener.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/ProcessIndicatorItemWrapper.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/SkipCheckingDecider.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/SkipCheckingListener.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/StagingItemListener.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/StagingItemProcessor.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/StagingItemReader.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/StagingItemWriter.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/common/StepExecutionApplicationEventAdvice.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/compositewriter/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/config/DataSourceConfiguration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/person/Child.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/person/Person.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/person/PersonService.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/person/internal/PersonWriter.java (89%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CompositeCustomerUpdateLineTokenizer.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerCredit.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerCreditDao.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerDao.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerDebit.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerDebitDao.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerOperation.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerUpdate.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerUpdateFieldSetMapper.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerUpdateProcessor.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerUpdateWriter.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/InvalidCustomerLogger.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/Trade.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/TradeDao.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java (80%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditFieldSetMapper.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditIncreaseProcessor.java (89%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditItemWriter.java (87%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditRowMapper.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditUpdateWriter.java (86%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerDebitRowMapper.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerUpdateWriter.java (83%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/FlatFileCustomerCreditDao.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/GeneratingTradeItemReader.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/HibernateCreditDao.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/ItemTrackingTradeItemWriter.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/JdbcCustomerDao.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/JdbcCustomerDebitDao.java (87%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/JdbcTradeDao.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeFieldSetMapper.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeProcessor.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeRowMapper.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeWriter.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/domain/trade/internal/validator/TradeValidator.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/delimited/DelimitedJobConfiguration.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/delimited/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/fixed/FixedLengthJobConfiguration.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/fixed/README.md (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/json/JsonJobConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/json/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiline/MultiLineJobConfiguration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiline/MultiLineTradeItemReader.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiline/MultiLineTradeItemWriter.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiline/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiline/Trade.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multilineaggregate/AggregateItem.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multilineaggregate/AggregateItemFieldSetMapper.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multilineaggregate/AggregateItemReader.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multilineaggregate/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multirecordtype/DelegatingTradeLineAggregator.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multirecordtype/MultiRecordTypeJobConfiguration.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multirecordtype/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiresource/MultiResourceJobConfiguration.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/multiresource/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/Address.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/BillingInfo.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/Customer.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/LineItem.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/Order.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/ShippingInfo.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/OrderItemReader.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/OrderLineAggregator.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/AddressFieldExtractor.java (82%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java (81%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/CustomerFieldExtractor.java (83%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/FooterFieldExtractor.java (85%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/HeaderFieldExtractor.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/extractor/LineItemFieldExtractor.java (85%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/AddressFieldSetMapper.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/BillingFieldSetMapper.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/validator/OrderValidator.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/xml/Customer.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/xml/LineItem.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/xml/Order.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/xml/Shipper.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/xml/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/file/xml/XmlJobConfiguration.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/filter/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/FootballJobConfiguration.java (86%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/Game.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/Player.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/PlayerDao.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/PlayerSummary.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/README.md (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/FootballExceptionHandler.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/GameFieldSetMapper.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/JdbcGameDao.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/JdbcPlayerDao.java (89%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/JdbcPlayerSummaryDao.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/PlayerFieldSetMapper.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/PlayerItemWriter.java (85%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/PlayerSummaryMapper.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/football/internal/PlayerSummaryRowMapper.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/headerfooter/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jdbc/JdbcReaderBatchWriterSampleJob.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jdbc/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java (82%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java (87%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jobstep/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jpa/CustomerCreditCrudRepository.java (86%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jpa/CustomerCreditPagingAndSortingRepository.java (89%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jpa/JpaJobConfiguration.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jpa/JpaRepositoryJobConfiguration.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/jpa/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/launch/DefaultJobLoader.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/launch/JobLoader.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loop/GeneratingTradeResettingListener.java (92%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loop/LimitDecider.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/loop/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mail/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mail/TestMailErrorHandler.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mail/TestMailSender.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mail/User.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mail/UserMailItemProcessor.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/metrics/BatchMetricsApplication.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/metrics/Job1Configuration.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/metrics/Job2Configuration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/metrics/JobScheduler.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/metrics/PrometheusConfiguration.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/groovy/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/jmx/InfiniteLoopReader.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/jmx/InfiniteLoopWriter.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/jmx/JobExecutionNotificationPublisher.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/jmx/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/jmx/SimpleMessageApplicationEvent.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/quartz/JobLauncherDetails.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/misc/quartz/README.md (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mongodb/DeletionJobConfiguration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mongodb/InsertionJobConfiguration.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mongodb/MongoDBConfiguration.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mongodb/MongoDBSampleApp.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/mongodb/Person.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/local/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/BasicPartitioner.java (95%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/BrokerConfiguration.java (88%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/DataSourceConfiguration.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/aggregating/ManagerConfiguration.java (91%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/aggregating/WorkerConfiguration.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/polling/ManagerConfiguration.java (90%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/partitioning/remote/polling/WorkerConfiguration.java (93%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/processindicator/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/restart/fail/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/restart/stop/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/retry/RetrySampleConfiguration.java (89%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/skip/DataSourceConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/skip/SkippableExceptionDuringProcessSample.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/skip/SkippableExceptionDuringReadSample.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/skip/SkippableExceptionDuringWriteSample.java (98%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/support/DummyItemWriter.java (94%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/support/ExceptionThrowingItemReaderProxy.java (97%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/support/HeaderCopyCallback.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/support/RetrySampleItemWriter.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/support/SummaryFooterCallback.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/trade/README.md (100%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/validation/ValidationSampleConfiguration.java (96%) rename spring-batch-samples/src/main/java/org/springframework/batch/{sample => samples}/validation/domain/Person.java (95%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/adapter/readerwriter/delegatingJob.xml (97%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/adapter/tasklet/taskletJob.xml (90%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/amqp/default.amqp.properties (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/amqp/job/amqp-example-job.xml (94%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/amqp/job/rabbitmq-beans.xml (96%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/beanwrapper/data/ImportPersonDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/beanwrapper/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/beanwrapper/job/beanWrapperMapperSampleJob.xml (80%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/chunking/remote-chunking.properties (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/compositewriter/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/compositewriter/job/compositeItemWriterSampleJob.xml (87%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/delimited/data/delimited.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/delimited/job/delimited.xml (95%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/fixed/data/fixedLength.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/fixed/job/fixedLength.xml (93%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/json/data/trades.json (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multiline/data/multiLine.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multiline/job/multiLine.xml (87%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multilineaggregate/data/multilineStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multilineaggregate/job/multilineJob.xml (86%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multirecordtype/data/multiRecordType.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multirecordtype/job/multiRecordType.xml (91%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multiresource/data/delimited.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multiresource/data/delimited2.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/multiresource/job/multiResource.xml (94%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/data/multilineOrderInput.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/data/multilineOrderOutput.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/data/order_sample.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/job/multilineOrderInputTokenizers.xml (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/job/multilineOrderJob.xml (80%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/job/multilineOrderOutputAggregators.xml (73%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/patternmatching/job/multilineOrderValidator.xml (89%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/xml/data/input.xml (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/file/xml/job/xml.xml (90%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/filter/data/customers.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/filter/job/customerFilterJob.xml (79%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/games-small.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/games.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/player-containsBadRecords.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/player-small1.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/player-small2.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/data/player.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/job/footballJob.xml (85%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/football/sql/schema.sql (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/headerfooter/data/input.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/headerfooter/job/headerFooterSample.xml (92%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/hibernate/CustomerCredit.hbm.xml (84%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jdbc/job/jdbcCursor.xml (88%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jdbc/job/jdbcPaging.xml (91%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jdbc/sql/schema.sql (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jobstep/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jobstep/job/jobStepSample.xml (87%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jpa/job/jpa.xml (95%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jpa/job/repository.xml (95%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/jpa/sql/schema.sql (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/loop/loopFlowSample.xml (85%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/mail/mailJob.xml (90%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/metrics/docker-compose.yml (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/metrics/metrics-sample.properties (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/metrics/prometheus.yml (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/metrics/spring-batch-dashboard.json (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/misc/groovy/data/files.zip (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/misc/groovy/job/groovyJob.xml (98%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/misc/jmx/adhoc-job-launcher-context.xml (91%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/misc/jmx/adhocLoopJob.xml (89%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/misc/quartz/quartz-job-launcher-context.xml (97%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/mongodb/mongodb-sample.properties (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/partition/file/data/delimited1.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/partition/file/data/delimited2.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/partition/file/job/partitionFileJob.xml (92%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/partition/jdbc/partitionJdbcJob.xml (90%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/partitioning/remote/remote-partitioning.properties (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/processindicator/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/processindicator/job/parallelJob.xml (85%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/processindicator/job/staging-test-context.xml (78%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/restart/fail/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/restart/fail/job/failRestartSample.xml (82%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/restart/stop/stopRestartSample.xml (90%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/retry/retrySample.xml (85%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/skip/data/input1.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/skip/data/input2.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/skip/job/skipSample-job-launcher-context.xml (94%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/skip/job/skipSampleJob.xml (83%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/trade/data/ImportTradeDataStep.txt (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/trade/data/TradeJob.csv (100%) rename spring-batch-samples/src/main/resources/org/springframework/batch/{sample => samples}/trade/job/tradeJob.xml (80%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/adapter/readerwriter/DelegatingJobFunctionalTests.java (89%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/adapter/tasklet/TaskletAdapterJobFunctionalTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/amqp/AmqpJobFunctionalTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/chunking/RemoteChunkingJobFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/ColumnRangePartitionerTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/CustomItemReaderTests.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/CustomItemWriterTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/ExceptionThrowingItemReaderProxyTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/OutputFileListenerTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/StagingItemReaderTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/common/StagingItemWriterTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/compositewriter/CompositeItemWriterSampleFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/config/JobRunnerConfiguration.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/multiline/AggregateItemFieldSetMapperTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/multiline/AggregateItemReaderTests.java (88%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/multiline/AggregateItemTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/AddressFieldSetMapperTests.java (88%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/BillingFieldSetMapperTests.java (83%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/CustomerFieldSetMapperTests.java (88%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/HeaderFieldSetMapperTests.java (84%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/OrderItemFieldSetMapperTests.java (89%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/OrderItemReaderTests.java (88%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/order/ShippingFieldSetMapperTests.java (85%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/CustomerUpdateProcessorTests.java (76%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/TradeTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java (83%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditRowMapperTests.java (88%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java (91%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerCreditUpdateProcessorTests.java (87%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/CustomerUpdateProcessorTests.java (86%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/FlatFileCustomerCreditDaoTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/GeneratingItemReaderTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/JdbcTradeWriterTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeFieldSetMapperTests.java (89%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeProcessorTests.java (85%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/domain/trade/internal/TradeRowMapperTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/delimited/DelimitedFunctionalTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/fixed/FixedLengthFunctionalTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/json/JsonFunctionalTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/multiline/MultiLineFunctionalTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/multirecordtype/MultiRecordTypeFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/multiresource/MultiResourceFunctionalTests.java (89%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/patternmatching/PatternMatchingJobFunctionalTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/patternmatching/internal/validator/OrderValidatorTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/file/xml/XmlFunctionalTests.java (91%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/filter/CustomerFilterJobFunctionalTests.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/football/FootballJobFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/football/internal/JdbcGameDaoIntegrationTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/football/internal/JdbcPlayerDaoIntegrationTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/headerfooter/HeaderFooterSampleFunctionalTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/jdbc/JdbcCursorFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/jdbc/JdbcPagingFunctionalTests.java (92%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/jobstep/JobStepFunctionalTests.java (91%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/jpa/JpaFunctionalTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/jpa/RepositoryFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/loom/VirtualThreadsSupportTests.java (91%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/loop/LoopFlowSampleFunctionalTests.java (86%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/mail/MailJobFunctionalTests.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/misc/groovy/GroovyJobFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/misc/jmx/JobExecutionNotificationPublisherTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/misc/jmx/RemoteLauncherTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/misc/quartz/JobLauncherDetailsTests.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/partition/file/PartitionFileJobFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/partition/jdbc/PartitionJdbcJobFunctionalTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/partition/remote/RemotePartitioningJobFunctionalTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java (78%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java (78%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/processindicator/ProcessIndicatorJobFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/restart/fail/RestartFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/restart/stop/GracefulShutdownFunctionalTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/restart/stop/JobOperatorFunctionalTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/retry/RetrySampleConfigurationTests.java (83%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/retry/RetrySampleFunctionalTests.java (84%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/skip/SkipSampleFunctionalTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/support/AbstractFieldSetMapperTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/support/AbstractRowMapperTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/support/ItemTrackingItemWriterTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/support/RetrySampleItemWriterTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/trade/TradeJobFunctionalTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/{sample => samples}/validation/ValidationSampleFunctionalTests.java (94%) diff --git a/pom.xml b/pom.xml index ae68eb5b6..841b1ca9b 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ ${maven-javadoc-plugin.version} - org.springframework.batch.sample.* + org.springframework.batch.samples.* ${project.basedir}/spring-batch-docs/src/main/javadoc/overview.html false diff --git a/spring-batch-docs/modules/ROOT/pages/processor.adoc b/spring-batch-docs/modules/ROOT/pages/processor.adoc index cbf6cb9d6..c4aa0635f 100644 --- a/spring-batch-docs/modules/ROOT/pages/processor.adoc +++ b/spring-batch-docs/modules/ROOT/pages/processor.adoc @@ -334,7 +334,7 @@ public SpringValidator validator() { XML:: + .XML Configuration -[source, xml] +[source,xml] ---- @@ -342,7 +342,7 @@ XML:: - + ---- diff --git a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/database.adoc b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/database.adoc index 004ced537..e7764b55e 100644 --- a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/database.adoc +++ b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/database.adoc @@ -156,7 +156,7 @@ The following example shows how to inject an `ItemReader` into a `Step` in XML: - + ---- @@ -344,7 +344,7 @@ examples: - + ---- @@ -394,7 +394,7 @@ XML: - + ---- @@ -440,7 +440,7 @@ The following example shows property to `true` in XML: - + ---- diff --git a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/flat-files/file-item-reader.adoc b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/flat-files/file-item-reader.adoc index d504af010..63d594de5 100644 --- a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/flat-files/file-item-reader.adoc +++ b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/flat-files/file-item-reader.adoc @@ -340,7 +340,7 @@ the following snippet in XML: ---- diff --git a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/process-indicator.adoc b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/process-indicator.adoc index 2c3ae044c..963fad533 100644 --- a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/process-indicator.adoc +++ b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/process-indicator.adoc @@ -50,7 +50,7 @@ The following bean definition shows how to prevent state persistence in XML: - + diff --git a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/xml-reading-writing.adoc b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/xml-reading-writing.adoc index 8cf484015..209e06d9e 100644 --- a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/xml-reading-writing.adoc +++ b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/xml-reading-writing.adoc @@ -160,14 +160,14 @@ XML:: The following example shows how to describe the alias in XML: + .XML Configuration -[source, xml] +[source,xml] ---- + value="org.springframework.batch.samples.domain.trade.Trade" /> @@ -196,7 +196,7 @@ StaxEventItemReader xmlStaxEventItemReader = new StaxEventItemReader<>(); Resource resource = new ByteArrayResource(xmlResource.getBytes()); Map aliases = new HashMap(); -aliases.put("trade","org.springframework.batch.sample.domain.trade.Trade"); +aliases.put("trade","org.springframework.batch.samples.domain.trade.Trade"); aliases.put("price","java.math.BigDecimal"); aliases.put("customer","java.lang.String"); aliases.put("isin","java.lang.String"); @@ -313,14 +313,14 @@ The following XML example uses the same marshaller as the one used in the readin shown earlier in the chapter: + .XML Configuration -[source, xml] +[source,xml] ---- + value="org.springframework.batch.samples.domain.trade.Trade" /> @@ -342,7 +342,7 @@ discussed, demonstrating the programmatic setup of the required properties: FileSystemResource resource = new FileSystemResource("data/outputFile.xml") Map aliases = new HashMap(); -aliases.put("trade","org.springframework.batch.sample.domain.trade.Trade"); +aliases.put("trade","org.springframework.batch.samples.domain.trade.Trade"); aliases.put("price","java.math.BigDecimal"); aliases.put("customer","java.lang.String"); aliases.put("isin","java.lang.String"); diff --git a/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc b/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc index 35bbf33be..006d521f1 100644 --- a/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc +++ b/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc @@ -197,7 +197,7 @@ The following example shows how to reference the `tasklet` from the `step` in XM + class="org.springframework.batch.samples.tasklet.FileDeletingTasklet"> diff --git a/spring-batch-samples/README.md b/spring-batch-samples/README.md index 0e535316a..5859df8fa 100644 --- a/spring-batch-samples/README.md +++ b/spring-batch-samples/README.md @@ -86,14 +86,14 @@ The purpose of this sample is to show to usage of the `JdbcCursorItemReader`/`JdbcPagingItemReader` and the `JdbcBatchItemWriter` to make efficient updates to a database table. -[Jdbc Readers and Batch Update sample](./src/main/java/org/springframework/batch/sample/jdbc/README.md) +[Jdbc Readers and Batch Update sample](src/main/java/org/springframework/batch/samples/jdbc/README.md) ### JPA Readers and Writers sample The purpose of this sample is to show to usage of the JPA item readers and writers to read and write data from/to a database with JPA and Hibernate. -[JPA Readers and Writers sample](./src/main/java/org/springframework/batch/sample/jpa/README.md) +[JPA Readers and Writers sample](src/main/java/org/springframework/batch/samples/jpa/README.md) ### Amqp Job Sample @@ -102,7 +102,7 @@ The `AmqpItemReader` and Writer were contributed by Chris Schaefer. It is modeled after the `JmsItemReader` / Writer implementations, which are popular models for remote chunking. It leverages the `AmqpTemplate`. -[Amqp Job Sample](src/main/java/org/springframework/batch/sample/amqp/README.md) +[Amqp Job Sample](src/main/java/org/springframework/batch/samples/amqp/README.md) ### BeanWrapperMapper Sample @@ -113,7 +113,7 @@ beans, and then their properties are set using the `BeanWrapperFieldSetMapper`, which sets properties of the prototype according to the field names in the file. -[BeanWrapperMapper Sample](./src/main/java/org/springframework/batch/sample/beanwrapper/README.md) +[BeanWrapperMapper Sample](src/main/java/org/springframework/batch/samples/beanwrapper/README.md) ### Composite ItemWriter Sample @@ -129,7 +129,7 @@ streams in the `Step` where they are used, in order for the step to be restartable. This is a common feature of all delegate patterns. -[Composite writer Sample](./src/main/java/org/springframework/batch/sample/compositewriter/README.md) +[Composite writer Sample](src/main/java/org/springframework/batch/samples/compositewriter/README.md) ### Customer Filter Sample @@ -137,7 +137,7 @@ This shows the use of the `ItemProcessor` to filter out items by returning null. When an item is filtered it leads to an increment in the `filterCount` in the step execution. -[Customer Filter Sample](./src/main/java/org/springframework/batch/sample/filter/README.md) +[Customer Filter Sample](src/main/java/org/springframework/batch/samples/filter/README.md) ### Reader Writer Adapter Sample @@ -145,35 +145,35 @@ This sample shows the delegate pattern, and also the `ItemReaderAdapter` which is used to adapt a POJO to the `ItemReader` interface. -[Reader Writer Adapter Sample](src/main/java/org/springframework/batch/sample/adapter/readerwriter/README.md) +[Reader Writer Adapter Sample](src/main/java/org/springframework/batch/samples/adapter/readerwriter/README.md) ### Tasklet Adapter Sample This sample shows the delegate pattern again, to adapt an existing service to a `Tasklet`. -[Tasklet Adapter Sample](src/main/java/org/springframework/batch/sample/adapter/tasklet/README.md) +[Tasklet Adapter Sample](src/main/java/org/springframework/batch/samples/adapter/tasklet/README.md) ### Delimited File Import Job The goal is to demonstrate a typical scenario of reading data from a delimited file, processing it and writing it to another file. -[Delimited file Job sample](./src/main/java/org/springframework/batch/sample/file/delimited/README.md) +[Delimited file Job sample](src/main/java/org/springframework/batch/samples/file/delimited/README.md) ### Fixed Length Import Job The goal is to demonstrate a typical scenario of reading data from a fixed length file, processing it and writing it to another file. -[Fixed Length Import Job sample](./src/main/java/org/springframework/batch/sample/file/fixed/README.md) +[Fixed Length Import Job sample](src/main/java/org/springframework/batch/samples/file/fixed/README.md) ### XML Input Output The goal here is to show the use of XML input and output through streaming and Spring OXM marshallers and unmarshallers. -[XML Input Output](./src/main/java/org/springframework/batch/sample/file/xml/README.md) +[XML Input Output](src/main/java/org/springframework/batch/samples/file/xml/README.md) ### JSON Input Output @@ -187,14 +187,14 @@ The goal of this sample is to show how to read and write JSON files: ] ``` -[JSON Input Output](./src/main/java/org/springframework/batch/sample/file/json/README.md) +[JSON Input Output](src/main/java/org/springframework/batch/samples/file/json/README.md) ### MultiResource Input Output Job This sample shows how to use the `MultiResourceItemReader` and `MultiResourceItemWriter` to read and write multiple files in the same step. -[MultiResource Input Output Job Sample](./src/main/java/org/springframework/batch/sample/file/multiresource/README.md) +[MultiResource Input Output Job Sample](src/main/java/org/springframework/batch/samples/file/multiresource/README.md) ### MultiLine Input Job @@ -213,7 +213,7 @@ END ... ``` -[MultiLine Input Job Sample](./src/main/java/org/springframework/batch/sample/file/multiline/README.md) +[MultiLine Input Job Sample](src/main/java/org/springframework/batch/samples/file/multiline/README.md) ### MultiRecord type Input Job @@ -236,7 +236,7 @@ TRADUK21341EAH50234 32.45customer6 ... ``` -[MultiRecord type Input Job Sample](./src/main/java/org/springframework/batch/sample/file/multirecordtype/README.md) +[MultiRecord type Input Job Sample](src/main/java/org/springframework/batch/samples/file/multirecordtype/README.md) ### Multiline Aggregate Sample @@ -261,7 +261,7 @@ END The goal of the job is to operate on the two groups, so the item type is naturally `List. -[Multiline Aggregate Sample](./src/main/java/org/springframework/batch/sample/file/multilineaggregate/README.md) +[Multiline Aggregate Sample](src/main/java/org/springframework/batch/samples/file/multilineaggregate/README.md) ### Pattern Matching Sample @@ -294,14 +294,14 @@ SIN;FEDX;AMS; FOT;5;36;14043.74 ``` -[Pattern Matching Sample](./src/main/java/org/springframework/batch/sample/file/patternmatching/README.md) +[Pattern Matching Sample](src/main/java/org/springframework/batch/samples/file/patternmatching/README.md) ### Football Job This is a (American) Football statistics loading job. It loads two files containing players and games data into a database, and then combines them to summarise how each player performed for a particular year. -[Football Job](./src/main/java/org/springframework/batch/sample/football/README.md) +[Football Job](src/main/java/org/springframework/batch/samples/football/README.md) ### Trade Job @@ -313,7 +313,7 @@ file to database. Second, the trades are read from the database and credit on customer accounts is decreased appropriately. Last, a report about customers is exported to a file. -[Trade Job](./src/main/java/org/springframework/batch/sample/trade/README.md) +[Trade Job](src/main/java/org/springframework/batch/samples/trade/README.md) ### Header Footer Sample @@ -325,7 +325,7 @@ input to the output. * `SummaryFooterCallback`: creates a summary footer at the end of the output file. -[Header Footer Sample](./src/main/java/org/springframework/batch/sample/headerfooter/README.md) +[Header Footer Sample](src/main/java/org/springframework/batch/samples/headerfooter/README.md) ### Hibernate Sample @@ -349,7 +349,7 @@ This sample has a single step that is an infinite loop, reading and writing fake data. It is used to demonstrate stop signals and restart capabilities. -[Stop / Restart Sample](src/main/java/org/springframework/batch/sample/restart/stop/README.md) +[Stop / Restart Sample](src/main/java/org/springframework/batch/samples/restart/stop/README.md) ### Fail Restart Sample @@ -363,14 +363,14 @@ that counts how many records it has processed and throws a planned exception in a specified place. Since we re-use the same instance when we restart the job it will not fail the second time. -[Fail / Restart Sample](src/main/java/org/springframework/batch/sample/restart/fail/README.md) +[Fail / Restart Sample](src/main/java/org/springframework/batch/samples/restart/fail/README.md) ### Loop Flow Sample Shows how to implement a job that repeats one of its steps up to a limit set by a `JobExecutionDecider`. -[Loop Flow Sample](src/main/java/org/springframework/batch/sample/loop/README.md) +[Loop Flow Sample](src/main/java/org/springframework/batch/samples/loop/README.md) ### Process Indicator pattern Sample @@ -381,7 +381,7 @@ The job reads data from the same file as the [Fixed Length Import sample](#fixed writing it out directly it goes through a staging table, and the staging table is read in a multi-threaded step. -[Process Indicator pattern Sample](src/main/java/org/springframework/batch/sample/processindicator/README.md) +[Process Indicator pattern Sample](src/main/java/org/springframework/batch/samples/processindicator/README.md) ### Local Partitioning Sample @@ -430,7 +430,7 @@ and Spring Integration channels and messages are sent over the wire through a TC The goal is to demonstrate how to schedule job execution using Quartz scheduler. -[Quartz Sample](src/main/java/org/springframework/batch/sample/misc/quartz/README.md) +[Quartz Sample](src/main/java/org/springframework/batch/samples/misc/quartz/README.md) ### Retry Sample @@ -505,7 +505,7 @@ know which item caused the issue. Hence, it will "scan" the chunk item by item and only the faulty item will be skipped. Technically, the commit-interval will be re-set to 1 and each item will re-processed/re-written in its own transaction. -The `org.springframework.batch.sample.skip.SkippableExceptionDuringWriteSample` sample +The `org.springframework.batch.samples.skip.SkippableExceptionDuringWriteSample` sample illustrates this behaviour: * It reads numbers from 1 to 6 in chunks of 3 items, so two chunks are created: [1, 2 ,3] and [4, 5, 6] @@ -560,8 +560,8 @@ the datasource is exhausted and the step ends here Similar examples show the expected behaviour when a skippable exception is thrown during reading and processing can be found in -`org.springframework.batch.sample.skip.SkippableExceptionDuringReadSample` -and `org.springframework.batch.sample.skip.SkippableExceptionDuringProcessSample`. +`org.springframework.batch.samples.skip.SkippableExceptionDuringReadSample` +and `org.springframework.batch.samples.skip.SkippableExceptionDuringProcessSample`. ### Tasklet Job @@ -591,7 +591,7 @@ source view of the configuration is as follows: + class="org.springframework.batch.samples.tasklet.FileDeletingTasklet"> @@ -599,7 +599,7 @@ source view of the configuration is as follows: + class="org.springframework.batch.samples.common.SystemCommandTasklet"> @@ -634,7 +634,7 @@ This sample requires [docker compose](https://docs.docker.com/compose/) to start To run the sample, please follow these steps: ``` -$>cd spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics +$>cd spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics $>docker-compose up -d ``` @@ -645,9 +645,9 @@ This should start the required monitoring stack: * Grafana on port `3000` Once started, you need to [configure Prometheus as data source in Grafana](https://grafana.com/docs/features/datasources/prometheus/) -and import the ready-to-use dashboard in `spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/spring-batch-dashboard.json`. +and import the ready-to-use dashboard in `spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/spring-batch-dashboard.json`. -Finally, run the `org.springframework.batch.sample.metrics.BatchMetricsApplication` +Finally, run the `org.springframework.batch.samples.metrics.BatchMetricsApplication` class without any argument to start the sample. # MongoDB sample @@ -663,7 +663,7 @@ you can run the following command to start a MongoDB server: $>docker run --name mongodb --rm -d -p 27017:27017 mongo ``` -Once MongoDB is up and running, run the `org.springframework.batch.sample.mongodb.MongoDBSampleApp` +Once MongoDB is up and running, run the `org.springframework.batch.samples.mongodb.MongoDBSampleApp` class without any argument to start the sample. ### Adhoc Loop and JMX Sample @@ -672,4 +672,4 @@ This job is simply an infinite loop. It runs forever so it is useful for testing features to do with stopping and starting jobs. It is used, for instance, as one of the jobs that can be run from JMX. -[Adhoc Loop and JMX Sample](src/main/java/org/springframework/batch/sample/misc/jmx/README.md) +[Adhoc Loop and JMX Sample](src/main/java/org/springframework/batch/samples/misc/jmx/README.md) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/readerwriter/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/readerwriter/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/readerwriter/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/readerwriter/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/tasklet/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/tasklet/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/tasklet/Task.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/Task.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/tasklet/Task.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/Task.java index 9a78d5514..fc9d157a7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/adapter/tasklet/Task.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/Task.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.adapter.tasklet; +package org.springframework.batch.samples.adapter.tasklet; import org.springframework.batch.core.scope.context.ChunkContext; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java index f82898a52..594e6c90f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.amqp; +package org.springframework.batch.samples.amqp; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpMessageProducer.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpMessageProducer.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpMessageProducer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpMessageProducer.java index 6546710a0..65c67eab1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/AmqpMessageProducer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpMessageProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.amqp; +package org.springframework.batch.samples.amqp; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -35,7 +35,7 @@ public final class AmqpMessageProducer { private static final int SEND_MESSAGE_COUNT = 10; private static final String[] BEAN_CONFIG = { - "classpath:org/springframework/batch/sample/amqp/job/rabbitmq-beans.xml" }; + "classpath:org/springframework/batch/samples/amqp/job/rabbitmq-beans.xml" }; public static void main(String[] args) { ApplicationContext applicationContext = new ClassPathXmlApplicationContext(BEAN_CONFIG); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/MessageProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/MessageProcessor.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/MessageProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/MessageProcessor.java index c982944ea..f2e21141a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/MessageProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/MessageProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.amqp; +package org.springframework.batch.samples.amqp; import org.springframework.batch.item.ItemProcessor; import org.springframework.lang.Nullable; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/amqp/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/beanwrapper/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/beanwrapper/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/beanwrapper/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/beanwrapper/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/DataSourceConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/DataSourceConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/DataSourceConfiguration.java index e76ee046e..8d8bd0e52 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/DataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.chunking; +package org.springframework.batch.samples.chunking; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/ManagerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java index 94dbeb5a2..8ca99654b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.chunking; +package org.springframework.batch.samples.chunking; import java.util.Arrays; @@ -51,7 +51,7 @@ import org.springframework.integration.jms.dsl.Jms; @EnableBatchProcessing @EnableBatchIntegration @EnableIntegration -@PropertySource("classpath:org/springframework/batch/sample/chunking/remote-chunking.properties") +@PropertySource("classpath:org/springframework/batch/samples/chunking/remote-chunking.properties") @Import(DataSourceConfiguration.class) public class ManagerConfiguration { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/WorkerConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/WorkerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/WorkerConfiguration.java index e490a73d3..c55929efe 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/chunking/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/WorkerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.chunking; +package org.springframework.batch.samples.chunking; import jakarta.jms.JMSException; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -50,7 +50,7 @@ import org.springframework.integration.jms.dsl.Jms; @EnableBatchProcessing @EnableBatchIntegration @EnableIntegration -@PropertySource("classpath:org/springframework/batch/sample/chunking/remote-chunking.properties") +@PropertySource("classpath:org/springframework/batch/samples/chunking/remote-chunking.properties") @Import(DataSourceConfiguration.class) public class WorkerConfiguration { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java index ac30c9e7b..0707873df 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ErrorLogTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ErrorLogTasklet.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java index 255e66dc4..ad36068a6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ErrorLogTasklet.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/LogAdvice.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/LogAdvice.java index 1bc9580cb..46700bf07 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/LogAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileListener.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java index 68831ddb9..426434c92 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.apache.commons.io.FilenameUtils; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileNameListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileNameListener.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileNameListener.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileNameListener.java index 65614e10e..c0fcce77d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/OutputFileNameListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileNameListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; public class OutputFileNameListener { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ProcessIndicatorItemWrapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ProcessIndicatorItemWrapper.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ProcessIndicatorItemWrapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ProcessIndicatorItemWrapper.java index 96bc9f56a..23eec9265 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ProcessIndicatorItemWrapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ProcessIndicatorItemWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; /** * Item wrapper useful in "process indicator" usecase, where input is marked as processed diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingDecider.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingDecider.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java index 55dadc706..f3d6c4b5d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingDecider.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.JobExecution; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingListener.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java index f71678fad..e13570d27 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/SkipCheckingListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,7 +23,7 @@ import org.springframework.batch.core.annotation.AfterStep; import org.springframework.batch.core.annotation.BeforeStep; import org.springframework.batch.core.annotation.OnSkipInProcess; import org.springframework.batch.core.annotation.OnSkipInWrite; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemListener.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemListener.java index bef7c2eaf..74b286a1d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemProcessor.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemProcessor.java index 27969c69e..95542a3cc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java index d2d5f1324..096763549 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import java.io.InputStream; import java.io.ObjectInputStream; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java index 534f60a1c..bd372246a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StepExecutionApplicationEventAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StepExecutionApplicationEventAdvice.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StepExecutionApplicationEventAdvice.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StepExecutionApplicationEventAdvice.java index b83857644..a23bc5155 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StepExecutionApplicationEventAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StepExecutionApplicationEventAdvice.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.aspectj.lang.JoinPoint; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.sample.misc.jmx.SimpleMessageApplicationEvent; +import org.springframework.batch.samples.misc.jmx.SimpleMessageApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/compositewriter/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/compositewriter/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/compositewriter/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/compositewriter/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/config/DataSourceConfiguration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/config/DataSourceConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/config/DataSourceConfiguration.java index a21d44871..6c148080d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/config/DataSourceConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.config; +package org.springframework.batch.samples.config; import jakarta.annotation.PostConstruct; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Child.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Child.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Child.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Child.java index d6d444857..b6517ebba 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Child.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Child.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.person; +package org.springframework.batch.samples.domain.person; public class Child { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Person.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Person.java index e42c44b9b..3adb59476 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Person.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.person; +package org.springframework.batch.samples.domain.person; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.sample.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.Address; public class Person { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/PersonService.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/PersonService.java index 534219148..014d3b3bc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/PersonService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.person; +package org.springframework.batch.samples.domain.person; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.sample.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.Address; /** * Custom class that contains logic that would normally be be contained in diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/internal/PersonWriter.java similarity index 89% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/internal/PersonWriter.java index a35633e96..73852e677 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/internal/PersonWriter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.person.internal; +package org.springframework.batch.samples.domain.person.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.person.Person; +import org.springframework.batch.samples.domain.person.Person; public class PersonWriter implements ItemWriter { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java index 7923b1c31..6b1928568 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.StepExecutionListener; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCredit.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCredit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java index fe6602e77..2812aced7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCredit.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCreditDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCreditDao.java index 114476a80..bc6fd5375 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCreditDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; /** * Interface for writing customer's credit information to output. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDao.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDao.java index 6b88a01cd..a8eddd786 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebit.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebit.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebit.java index 350a77251..cdf5cf5a2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebit.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebitDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebitDao.java index 8d1b26d09..000c2693a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebitDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; /** * Interface for writing {@link CustomerDebitDao} object to arbitrary output. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerOperation.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerOperation.java index a0eeb7ba5..7ef594c7d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerOperation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdate.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdate.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdate.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdate.java index 86b215755..37df420ed 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdate.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateFieldSetMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateFieldSetMapper.java index 44cdc501d..3544262cc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateFieldSetMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessor.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessor.java index e41e86d19..34921d5f1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; -import static org.springframework.batch.sample.domain.trade.CustomerOperation.*; +import static org.springframework.batch.samples.domain.trade.CustomerOperation.*; import org.springframework.batch.item.ItemProcessor; import org.springframework.lang.Nullable; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateWriter.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateWriter.java index c3dfa1c8c..cf078d097 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/InvalidCustomerLogger.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/InvalidCustomerLogger.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/InvalidCustomerLogger.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/InvalidCustomerLogger.java index f9c2cb986..46b2a5989 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/InvalidCustomerLogger.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/InvalidCustomerLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; /** * Interface for logging invalid customers. Customers may need to be logged because they diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/Trade.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/Trade.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/Trade.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/Trade.java index 5d7c112f7..4ef02bee4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/Trade.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/Trade.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import java.io.Serializable; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/TradeDao.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/TradeDao.java index ebf87d86b..f9fd1c32e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/TradeDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; /** * Interface for writing a Trade object to an arbitrary output. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java similarity index 80% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java index 4d4a1bea6..b05a52d8a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.launch.support.CommandLineJobRunner; -import org.springframework.batch.sample.domain.trade.CustomerUpdate; -import org.springframework.batch.sample.domain.trade.InvalidCustomerLogger; +import org.springframework.batch.samples.domain.trade.CustomerUpdate; +import org.springframework.batch.samples.domain.trade.InvalidCustomerLogger; /** * @author Lucas Ward @@ -33,7 +33,7 @@ public class CommonsLoggingInvalidCustomerLogger implements InvalidCustomerLogge /* * (non-Javadoc) * - * @see org.springframework.batch.sample.domain.trade.InvalidCustomerLogger#log(org. + * @see org.springframework.batch.samples.domain.trade.InvalidCustomerLogger#log(org. * springframework.batch.sample.domain.trade.CustomerUpdate) */ @Override diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditFieldSetMapper.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditFieldSetMapper.java index f71ceb100..8148671e4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessor.java similarity index 89% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessor.java index 3b58ee36d..950a37980 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import org.springframework.batch.item.ItemProcessor; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import org.springframework.lang.Nullable; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditItemWriter.java similarity index 87% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditItemWriter.java index ad3cd55dc..bc664f176 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditItemWriter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; /** * Delegates actual writing to a custom DAO. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapper.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapper.java index 218047de8..7c0f52c10 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import org.springframework.jdbc.core.RowMapper; public class CustomerCreditRowMapper implements RowMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java index 3c10cd6f8..d2e8f865d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.SQLException; import org.springframework.batch.item.database.ItemPreparedStatementSetter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; /** * @author Dave Syer diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateWriter.java similarity index 86% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateWriter.java index 77ab57e12..21f361c3b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateWriter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; public class CustomerCreditUpdateWriter implements ItemWriter { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerDebitRowMapper.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerDebitRowMapper.java index 2cd5417fb..7a5ef5c86 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerDebitRowMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.trade.CustomerDebit; +import org.springframework.batch.samples.domain.trade.CustomerDebit; import org.springframework.jdbc.core.RowMapper; public class CustomerDebitRowMapper implements RowMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateWriter.java similarity index 83% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateWriter.java index 5d10069d6..737e2cc5d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateWriter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerDebit; -import org.springframework.batch.sample.domain.trade.CustomerDebitDao; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.CustomerDebit; +import org.springframework.batch.samples.domain.trade.CustomerDebitDao; +import org.springframework.batch.samples.domain.trade.Trade; /** * Transforms Trade to a CustomerDebit and asks DAO delegate to write the result. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDao.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDao.java index 9d98f175a..06f11a50b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDao.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; import org.springframework.beans.factory.DisposableBean; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/GeneratingTradeItemReader.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/GeneratingTradeItemReader.java index ab1a3c7ab..58f8d26b7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/GeneratingTradeItemReader.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.lang.Nullable; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java index 9adb99876..55172e1f9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.hibernate.SessionFactory; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateCreditDao.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateCreditDao.java index 81a63dd49..34e11f99e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateCreditDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.util.ArrayList; import java.util.List; @@ -22,8 +22,8 @@ import org.hibernate.SessionFactory; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.RepeatListener; import org.springframework.batch.repeat.RepeatStatus; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; /** * @author Lucas Ward @@ -55,8 +55,8 @@ public class HibernateCreditDao implements CustomerCreditDao, RepeatListener { * (non-Javadoc) * * @see - * org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write( - * org.springframework.batch.sample.domain.CustomerCredit) + * org.springframework.batch.samples.domain.trade.internal.CustomerCreditWriter#write( + * org.springframework.batch.samples.domain.CustomerCredit) */ @Override public void writeCredit(CustomerCredit customerCredit) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/ItemTrackingTradeItemWriter.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/ItemTrackingTradeItemWriter.java index 7b287925e..26a0d3ee8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/ItemTrackingTradeItemWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.io.IOException; import java.util.ArrayList; @@ -23,7 +23,7 @@ import javax.sql.DataSource; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDao.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDao.java index c2245b3bb..8bcdd43db 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDao.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import java.util.List; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerDao; import org.springframework.jdbc.core.support.JdbcDaoSupport; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDebitDao.java similarity index 87% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDebitDao.java index df79adb69..4592358c5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDebitDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import javax.sql.DataSource; -import org.springframework.batch.sample.domain.trade.CustomerDebit; -import org.springframework.batch.sample.domain.trade.CustomerDebitDao; +import org.springframework.batch.samples.domain.trade.CustomerDebit; +import org.springframework.batch.samples.domain.trade.CustomerDebitDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeDao.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeDao.java index 63e63340f..08380f443 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeDao.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.TradeDao; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.TradeDao; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapper.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapper.java index 45f4f140c..8839e1489 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; public class TradeFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessor.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessor.java index 461ee5384..55412b9a8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.validator.ValidationException; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.lang.Nullable; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapper.java index 4f2a8c657..50cf0075b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.jdbc.core.RowMapper; public class TradeRowMapper implements RowMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeWriter.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeWriter.java index a385b56db..4a91177dd 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import java.util.ArrayList; @@ -28,8 +28,8 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStreamSupport; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.WriteFailedException; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.TradeDao; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.TradeDao; import org.springframework.util.Assert; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/validator/TradeValidator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/validator/TradeValidator.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/validator/TradeValidator.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/validator/TradeValidator.java index 18d1a1fac..f84b78b22 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/validator/TradeValidator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/validator/TradeValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal.validator; +package org.springframework.batch.samples.domain.trade.internal.validator; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; /** * @author Michael Minella diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/delimited/DelimitedJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/delimited/DelimitedJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java index 3c9a0333e..bc231a3cc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/delimited/DelimitedJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.file.delimited; +package org.springframework.batch.samples.file.delimited; import javax.sql.DataSource; @@ -14,8 +14,8 @@ import org.springframework.batch.item.file.FlatFileItemReader; import org.springframework.batch.item.file.FlatFileItemWriter; import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder; import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/delimited/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/delimited/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/FixedLengthJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/FixedLengthJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java index 5d0d93dcd..de2436a5e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/FixedLengthJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.file.fixed; +package org.springframework.batch.samples.file.fixed; import javax.sql.DataSource; @@ -15,8 +15,8 @@ import org.springframework.batch.item.file.FlatFileItemWriter; import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder; import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder; import org.springframework.batch.item.file.transform.Range; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/README.md similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/README.md index 1140ead32..4a3e80d6c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/fixed/README.md +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/README.md @@ -7,7 +7,7 @@ from a fixed length file, processing it and writing it to another file. In this example we are using a simple fixed length record structure that can be found in the project at -`src/main/resources/org/springframework/batch/sample/file/fixed/data`. +`src/main/resources/org/springframework/batch/samples/file/fixed/data`. The fixed length records look like this: ``` diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/json/JsonJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/json/JsonJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java index 93a167a94..3a09e5c54 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/json/JsonJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.json; +package org.springframework.batch.samples.file.json; import javax.sql.DataSource; @@ -30,7 +30,7 @@ import org.springframework.batch.item.json.JsonFileItemWriter; import org.springframework.batch.item.json.JsonItemReader; import org.springframework.batch.item.json.builder.JsonFileItemWriterBuilder; import org.springframework.batch.item.json.builder.JsonItemReaderBuilder; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/json/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/json/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java index ae1205699..7d9598b5a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.file.multiline; +package org.springframework.batch.samples.file.multiline; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemReader.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemReader.java index 538dd793c..1ee553bb3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multiline; +package org.springframework.batch.samples.file.multiline; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemWriter.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemWriter.java index 59d6825e3..b41936dbd 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/MultiLineTradeItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multiline; +package org.springframework.batch.samples.file.multiline; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ExecutionContext; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/Trade.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/Trade.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/Trade.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/Trade.java index f2ff3c1d5..ba7a0a102 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiline/Trade.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/Trade.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multiline; +package org.springframework.batch.samples.file.multiline; import java.io.Serializable; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItem.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItem.java index a1ca70bd9..617ec1d5e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItem.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.multilineaggregate; +package org.springframework.batch.samples.file.multilineaggregate; /** * A wrapper type for an item that is used by {@link AggregateItemReader} to identify the diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemFieldSetMapper.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemFieldSetMapper.java index c7fc11ec0..ad2c8c2ac 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemFieldSetMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.multilineaggregate; +package org.springframework.batch.samples.file.multilineaggregate; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemReader.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemReader.java index a86c1dc05..e0daf546d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/AggregateItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multilineaggregate; +package org.springframework.batch.samples.file.multilineaggregate; import java.util.ArrayList; import java.util.List; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multilineaggregate/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/DelegatingTradeLineAggregator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/DelegatingTradeLineAggregator.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java index c93a93cef..7aaa8b68a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/DelegatingTradeLineAggregator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multirecordtype; +package org.springframework.batch.samples.file.multirecordtype; import org.springframework.batch.item.file.transform.LineAggregator; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.Trade; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeJobConfiguration.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeJobConfiguration.java index 613555aa3..0f2f27c10 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.multirecordtype; +package org.springframework.batch.samples.file.multirecordtype; import java.util.Map; @@ -34,10 +34,10 @@ import org.springframework.batch.item.file.transform.BeanWrapperFieldExtractor; import org.springframework.batch.item.file.transform.FixedLengthTokenizer; import org.springframework.batch.item.file.transform.FormatterLineAggregator; import org.springframework.batch.item.file.transform.Range; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditFieldSetMapper; -import org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditFieldSetMapper; +import org.springframework.batch.samples.domain.trade.internal.TradeFieldSetMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multirecordtype/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiresource/MultiResourceJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/MultiResourceJobConfiguration.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiresource/MultiResourceJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/MultiResourceJobConfiguration.java index 9b9513702..7bde44336 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiresource/MultiResourceJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/MultiResourceJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.multiresource; +package org.springframework.batch.samples.file.multiresource; import javax.sql.DataSource; @@ -33,8 +33,8 @@ import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder; import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder; import org.springframework.batch.item.file.builder.MultiResourceItemReaderBuilder; import org.springframework.batch.item.file.builder.MultiResourceItemWriterBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiresource/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/multiresource/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Address.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Address.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Address.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Address.java index e02b70ef9..99928dc5f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Address.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Address.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; public class Address { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/BillingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/BillingInfo.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/BillingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/BillingInfo.java index a81b86b54..9f49fc403 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/BillingInfo.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/BillingInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; public class BillingInfo { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Customer.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Customer.java index 1481b29e6..64baa3305 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Customer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; public class Customer { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/LineItem.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/LineItem.java index bfc14d12b..da9f1d150 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/LineItem.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/LineItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Order.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Order.java index 2d7a6b25e..86a67ce12 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/Order.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Order.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; import java.math.BigDecimal; import java.util.Date; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/ShippingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/ShippingInfo.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/ShippingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/ShippingInfo.java index fd2029b7d..ee6fb4cc8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/ShippingInfo.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/ShippingInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; public class ShippingInfo { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderItemReader.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderItemReader.java index 96302187a..c9d7f6936 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal; +package org.springframework.batch.samples.file.patternmatching.internal; import java.util.ArrayList; @@ -23,12 +23,12 @@ import org.apache.commons.logging.LogFactory; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.Order; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; import org.springframework.lang.Nullable; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderLineAggregator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderLineAggregator.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java index 7fa67736a..ece523a32 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/OrderLineAggregator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal; +package org.springframework.batch.samples.file.patternmatching.internal; import java.util.Map; import org.springframework.batch.item.file.transform.LineAggregator; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.Order; /** * Converts Order object to a list of strings. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/AddressFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/AddressFieldExtractor.java similarity index 82% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/AddressFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/AddressFieldExtractor.java index da9371738..ed66d096b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/AddressFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/AddressFieldExtractor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.Order; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java similarity index 81% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java index 36eddae02..9ea20c05b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.Order; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/CustomerFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/CustomerFieldExtractor.java similarity index 83% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/CustomerFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/CustomerFieldExtractor.java index 8b35dafe8..2f1a9fee7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/CustomerFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/CustomerFieldExtractor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.Order; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/FooterFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/FooterFieldExtractor.java similarity index 85% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/FooterFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/FooterFieldExtractor.java index 2eae5764e..4c2ca2d79 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/FooterFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/FooterFieldExtractor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.Order; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/HeaderFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/HeaderFieldExtractor.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/HeaderFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/HeaderFieldExtractor.java index ca590e260..646246405 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/HeaderFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/HeaderFieldExtractor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import java.text.SimpleDateFormat; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.Order; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/LineItemFieldExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/LineItemFieldExtractor.java similarity index 85% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/LineItemFieldExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/LineItemFieldExtractor.java index 4c608d81a..d97e193e3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/extractor/LineItemFieldExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/LineItemFieldExtractor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.extractor; +package org.springframework.batch.samples.file.patternmatching.internal.extractor; import org.springframework.batch.item.file.transform.FieldExtractor; -import org.springframework.batch.sample.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.LineItem; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/AddressFieldSetMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/AddressFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/AddressFieldSetMapper.java index 9e9f91538..049fcf1b3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/AddressFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/AddressFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.Address; public class AddressFieldSetMapper implements FieldSetMapper
{ diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/BillingFieldSetMapper.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/BillingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/BillingFieldSetMapper.java index f8ba05c7e..c9b0b7b1e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/BillingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/BillingFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; public class BillingFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java index e48160a52..d4acb6075 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/CustomerFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.Customer; public class CustomerFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java index 74fe29558..ec113a492 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/HeaderFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.Order; public class HeaderFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java index d69012147..33402802e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/OrderItemFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.LineItem; public class OrderItemFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java index 27ec0f5d4..2aa3a8cb6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/mapper/ShippingFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.mapper; +package org.springframework.batch.samples.file.patternmatching.internal.mapper; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; public class ShippingFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidator.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidator.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidator.java index e1a8feb93..d3a284189 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.validator; +package org.springframework.batch.samples.file.patternmatching.internal.validator; import java.math.BigDecimal; import java.math.RoundingMode; @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.Order; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Customer.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Customer.java index c9561ab0c..cbc9eb5dc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Customer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.xml; +package org.springframework.batch.samples.file.patternmatching.internal.xml; /** * An XML customer. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/LineItem.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/LineItem.java index c293e51ba..5333e1f7a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/LineItem.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/LineItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.xml; +package org.springframework.batch.samples.file.patternmatching.internal.xml; /** * An XML line-item. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Order.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Order.java index 244763a23..972180352 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Order.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Order.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.xml; +package org.springframework.batch.samples.file.patternmatching.internal.xml; import java.util.Date; import java.util.List; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Shipper.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Shipper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Shipper.java index a45f7703a..f1f7b23ae 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/patternmatching/internal/xml/Shipper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/xml/Shipper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.xml; +package org.springframework.batch.samples.file.patternmatching.internal.xml; /** * An XML shipper. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/xml/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/xml/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/xml/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/xml/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/xml/XmlJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/xml/XmlJobConfiguration.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/file/xml/XmlJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/file/xml/XmlJobConfiguration.java index 907bae30e..884b1817d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/file/xml/XmlJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/xml/XmlJobConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.file.xml; +package org.springframework.batch.samples.file.xml; import java.math.BigDecimal; import java.util.Map; @@ -19,8 +19,8 @@ import org.springframework.batch.item.xml.StaxEventItemReader; import org.springframework.batch.item.xml.StaxEventItemWriter; import org.springframework.batch.item.xml.builder.StaxEventItemReaderBuilder; import org.springframework.batch.item.xml.builder.StaxEventItemWriterBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/filter/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/filter/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/filter/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/filter/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/FootballJobConfiguration.java similarity index 86% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/FootballJobConfiguration.java index 0b1369953..cecfdf3f9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/FootballJobConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; import javax.sql.DataSource; @@ -12,13 +12,13 @@ import org.springframework.batch.item.database.JdbcCursorItemReader; import org.springframework.batch.item.database.builder.JdbcCursorItemReaderBuilder; import org.springframework.batch.item.file.FlatFileItemReader; import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder; -import org.springframework.batch.sample.football.internal.GameFieldSetMapper; -import org.springframework.batch.sample.football.internal.JdbcGameDao; -import org.springframework.batch.sample.football.internal.JdbcPlayerDao; -import org.springframework.batch.sample.football.internal.JdbcPlayerSummaryDao; -import org.springframework.batch.sample.football.internal.PlayerFieldSetMapper; -import org.springframework.batch.sample.football.internal.PlayerItemWriter; -import org.springframework.batch.sample.football.internal.PlayerSummaryMapper; +import org.springframework.batch.samples.football.internal.GameFieldSetMapper; +import org.springframework.batch.samples.football.internal.JdbcGameDao; +import org.springframework.batch.samples.football.internal.JdbcPlayerDao; +import org.springframework.batch.samples.football.internal.JdbcPlayerSummaryDao; +import org.springframework.batch.samples.football.internal.PlayerFieldSetMapper; +import org.springframework.batch.samples.football.internal.PlayerItemWriter; +import org.springframework.batch.samples.football.internal.PlayerSummaryMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; @@ -35,7 +35,7 @@ public class FootballJobConfiguration { @Bean public FlatFileItemReader playerFileItemReader() { return new FlatFileItemReaderBuilder().name("playerFileItemReader") - .resource(new ClassPathResource("org/springframework/batch/sample/football/data/player-small1.csv")) + .resource(new ClassPathResource("org/springframework/batch/samples/football/data/player-small1.csv")) .delimited() .names("ID", "lastName", "firstName", "position", "birthYear", "debutYear") .fieldSetMapper(new PlayerFieldSetMapper()) @@ -64,7 +64,7 @@ public class FootballJobConfiguration { @Bean public FlatFileItemReader gameFileItemReader() { return new FlatFileItemReaderBuilder().name("gameFileItemReader") - .resource(new ClassPathResource("org/springframework/batch/sample/football/data/games-small.csv")) + .resource(new ClassPathResource("org/springframework/batch/samples/football/data/games-small.csv")) .delimited() .names("id", "year", "team", "week", "opponent", "completes", "attempts", "passingYards", "passingTd", "interceptions", "rushes", "rushYards", "receptions", "receptionYards", "totalTd") @@ -138,7 +138,7 @@ public class FootballJobConfiguration { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") .addScript("/org/springframework/batch/core/schema-hsqldb.sql") - .addScript("/org/springframework/batch/sample/football/sql/schema.sql") + .addScript("/org/springframework/batch/samples/football/sql/schema.sql") .build(); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Game.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Game.java index 9f68bbe65..2b65308a9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Game.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; import java.io.Serializable; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Player.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Player.java index c89dc0c17..4e8514083 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/Player.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; import java.io.Serializable; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerDao.java index ff53ea975..12d79c778 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; /** * Interface for writing {@link Player} objects to arbitrary output. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerSummary.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerSummary.java index a2542e316..3068ae6a2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/PlayerSummary.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; /** * Domain object representing the summary of a given Player's year. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/README.md similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/README.md index 905a3acdf..1642ec73c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/README.md +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/README.md @@ -6,7 +6,7 @@ This is a (American) Football statistics loading job. We gave it the id of `footballJob` in our configuration file. Before diving into the batch job, we'll examine the two input files that need to be loaded. First is `player.csv`, which can be found in the -samples project under `src/main/resources/org/springframework/batch/sample/football/data`. +samples project under `src/main/resources/org/springframework/batch/samples/football/data`. Each line within this file represents a player, with a unique id, the player’s name, position, etc: ``` @@ -64,7 +64,7 @@ graph LR ``` This corresponds exactly with the `footballJob.xml` job configuration file which can be found in -`src/main/resources/org/springframework/batch/sample/football/job`. +`src/main/resources/org/springframework/batch/samples/football/job`. When you drill down into the football job you will see that the configuration has a list of steps: ```xml @@ -103,10 +103,10 @@ dive deeper into the first step: playerLoad: ref="playerFileItemReader" /> + class="org.springframework.batch.samples.football.internal.internal.PlayerItemWriter"> + class="org.springframework.batch.samples.football.internal.internal.JdbcPlayerDao"> @@ -182,7 +182,7 @@ Batch infrastructure. Because the input is flat-file based, a + class="org.springframework.batch.samples.football.internal.internal.PlayerFieldSetMapper" /> ``` @@ -257,7 +257,7 @@ not a file: + class="org.springframework.batch.samples.football.internal.internal.PlayerSummaryMapper" /> @@ -286,7 +286,7 @@ two steps, each record returned by the provider will be written out to the database in the PLAYER_SUMMARY table. The equivalent Java configuration of the football job can be found in -`org/springframework/batch/sample/football/FootballJobConfiguration.java`. +`org/springframework/batch/samples/football/FootballJobConfiguration.java`. ## Run the sample diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/FootballExceptionHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/FootballExceptionHandler.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/FootballExceptionHandler.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/FootballExceptionHandler.java index 5c96dab52..081b889fa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/FootballExceptionHandler.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/FootballExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/GameFieldSetMapper.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/GameFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/GameFieldSetMapper.java index 2bb9287fb..0ae7cd2c0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/GameFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/GameFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.football.Game; +import org.springframework.batch.samples.football.Game; public class GameFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcGameDao.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcGameDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcGameDao.java index 809fb3a56..d2d5e7baf 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcGameDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcGameDao.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.football.Game; +import org.springframework.batch.samples.football.Game; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcInsert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerDao.java similarity index 89% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerDao.java index 63d3b94f1..f49266cc0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import javax.sql.DataSource; -import org.springframework.batch.sample.football.Player; -import org.springframework.batch.sample.football.PlayerDao; +import org.springframework.batch.samples.football.Player; +import org.springframework.batch.samples.football.PlayerDao; import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDao.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDao.java index 388348847..32c12d118 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDao.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import javax.sql.DataSource; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.football.PlayerSummary; +import org.springframework.batch.samples.football.PlayerSummary; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerFieldSetMapper.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerFieldSetMapper.java index 406135c29..910588f89 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerFieldSetMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.football.Player; +import org.springframework.batch.samples.football.Player; public class PlayerFieldSetMapper implements FieldSetMapper { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerItemWriter.java similarity index 85% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerItemWriter.java index 2bdc5e151..79f90a31b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerItemWriter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.football.Player; -import org.springframework.batch.sample.football.PlayerDao; +import org.springframework.batch.samples.football.Player; +import org.springframework.batch.samples.football.PlayerDao; public class PlayerItemWriter implements ItemWriter { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryMapper.java index 9eb2557a8..5570ded7e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryMapper.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.football.PlayerSummary; +import org.springframework.batch.samples.football.PlayerSummary; import org.springframework.jdbc.core.RowMapper; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryRowMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryRowMapper.java index 61292c041..042c961a3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/internal/PlayerSummaryRowMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/football/internal/PlayerSummaryRowMapper.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.football.PlayerSummary; +import org.springframework.batch.samples.football.PlayerSummary; import org.springframework.jdbc.core.RowMapper; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/headerfooter/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/headerfooter/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/headerfooter/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/headerfooter/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/JdbcReaderBatchWriterSampleJob.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/JdbcReaderBatchWriterSampleJob.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/JdbcReaderBatchWriterSampleJob.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/JdbcReaderBatchWriterSampleJob.java index be2a53d7e..fde7c8639 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/JdbcReaderBatchWriterSampleJob.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/JdbcReaderBatchWriterSampleJob.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jdbc; +package org.springframework.batch.samples.jdbc; import javax.sql.DataSource; @@ -26,8 +26,8 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.database.BeanPropertyItemSqlParameterSourceProvider; import org.springframework.batch.item.database.JdbcBatchItemWriter; import org.springframework.batch.item.database.builder.JdbcBatchItemWriterBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; @@ -70,7 +70,7 @@ public class JdbcReaderBatchWriterSampleJob { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") .addScript("/org/springframework/batch/core/schema-hsqldb.sql") - .addScript("/org/springframework/batch/sample/jdbc/sql/schema.sql") + .addScript("/org/springframework/batch/samples/jdbc/sql/schema.sql") .build(); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java similarity index 82% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java index 7b1cca651..6ef618b2f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/cursor/JdbcCursorReaderBatchWriterSampleJob.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jdbc.cursor; +package org.springframework.batch.samples.jdbc.cursor; import javax.sql.DataSource; import org.springframework.batch.item.database.JdbcCursorItemReader; import org.springframework.batch.item.database.builder.JdbcCursorItemReaderBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper; -import org.springframework.batch.sample.jdbc.JdbcReaderBatchWriterSampleJob; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditRowMapper; +import org.springframework.batch.samples.jdbc.JdbcReaderBatchWriterSampleJob; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java similarity index 87% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java index 4ecd24c85..e3dcdde85 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jdbc/paging/JdbcPagingReaderBatchWriterSampleJob.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jdbc.paging; +package org.springframework.batch.samples.jdbc.paging; import java.util.HashMap; import java.util.Map; @@ -24,9 +24,9 @@ import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.item.database.JdbcPagingItemReader; import org.springframework.batch.item.database.Order; import org.springframework.batch.item.database.builder.JdbcPagingItemReaderBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper; -import org.springframework.batch.sample.jdbc.JdbcReaderBatchWriterSampleJob; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditRowMapper; +import org.springframework.batch.samples.jdbc.JdbcReaderBatchWriterSampleJob; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jobstep/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jobstep/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jobstep/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jobstep/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditCrudRepository.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditCrudRepository.java similarity index 86% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditCrudRepository.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditCrudRepository.java index 2d8fee35c..84c269666 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditCrudRepository.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditCrudRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import org.springframework.data.repository.CrudRepository; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditPagingAndSortingRepository.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditPagingAndSortingRepository.java similarity index 89% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditPagingAndSortingRepository.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditPagingAndSortingRepository.java index a72282f31..e80b938c1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/CustomerCreditPagingAndSortingRepository.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/CustomerCreditPagingAndSortingRepository.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; import java.math.BigDecimal; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.data.repository.PagingAndSortingRepository; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaJobConfiguration.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaJobConfiguration.java index fc3f2f9b3..7a9ac8e61 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; import javax.sql.DataSource; import jakarta.persistence.EntityManagerFactory; @@ -27,8 +27,8 @@ import org.springframework.batch.item.database.JpaItemWriter; import org.springframework.batch.item.database.JpaPagingItemReader; import org.springframework.batch.item.database.builder.JpaItemWriterBuilder; import org.springframework.batch.item.database.builder.JpaPagingItemReaderBuilder; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; @@ -81,7 +81,7 @@ public class JpaJobConfiguration { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") .addScript("/org/springframework/batch/core/schema-hsqldb.sql") - .addScript("/org/springframework/batch/sample/jpa/sql/schema.sql") + .addScript("/org/springframework/batch/samples/jpa/sql/schema.sql") .build(); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaRepositoryJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaRepositoryJobConfiguration.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaRepositoryJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaRepositoryJobConfiguration.java index b4367890c..ebcfc2195 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/JpaRepositoryJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/JpaRepositoryJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; import java.math.BigDecimal; import java.util.Map; @@ -31,10 +31,8 @@ import org.springframework.batch.item.data.RepositoryItemReader; import org.springframework.batch.item.data.RepositoryItemWriter; import org.springframework.batch.item.data.builder.RepositoryItemReaderBuilder; import org.springframework.batch.item.data.builder.RepositoryItemWriterBuilder; -import org.springframework.batch.item.database.JpaItemWriter; -import org.springframework.batch.item.database.JpaPagingItemReader; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -56,7 +54,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; */ @Configuration @EnableBatchProcessing(isolationLevelForCreate = "ISOLATION_DEFAULT") -@EnableJpaRepositories(basePackages = "org.springframework.batch.sample.jpa") +@EnableJpaRepositories(basePackages = "org.springframework.batch.samples.jpa") public class JpaRepositoryJobConfiguration { @Bean @@ -96,7 +94,7 @@ public class JpaRepositoryJobConfiguration { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") .addScript("/org/springframework/batch/core/schema-hsqldb.sql") - .addScript("/org/springframework/batch/sample/jpa/sql/schema.sql") + .addScript("/org/springframework/batch/samples/jpa/sql/schema.sql") .build(); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/jpa/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/jpa/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/DefaultJobLoader.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/DefaultJobLoader.java index 6ddd1c650..d7bc149d0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/DefaultJobLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.launch; +package org.springframework.batch.samples.launch; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/JobLoader.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/JobLoader.java index 2d70e7848..812ab561f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/launch/JobLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.launch; +package org.springframework.batch.samples.launch; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java index 797dbac24..23b3736ca 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import java.util.Arrays; import java.util.concurrent.Future; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java index e60f76bb8..26685075d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForLaunchingJobsWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java index 80cbe6cd3..da791acfa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningConcurrentStepsWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import java.util.Arrays; import java.util.concurrent.locks.Lock; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java index 38289805e..347fac287 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningParallelStepsWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java index 26356e8e4..bd996ead3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java index c8f5d4326..518fc0718 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import java.io.File; import java.io.IOException; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/GeneratingTradeResettingListener.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/GeneratingTradeResettingListener.java index 53be16681..686450009 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/GeneratingTradeResettingListener.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loop; +package org.springframework.batch.samples.loop; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.StepExecutionListener; -import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; +import org.springframework.batch.samples.domain.trade.internal.GeneratingTradeItemReader; import org.springframework.beans.factory.InitializingBean; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/LimitDecider.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/LimitDecider.java index a8000a19a..ca0a6f09d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/LimitDecider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loop; +package org.springframework.batch.samples.loop; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/loop/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailErrorHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailErrorHandler.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailErrorHandler.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailErrorHandler.java index a06111e61..551081e49 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailErrorHandler.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailErrorHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mail; +package org.springframework.batch.samples.mail; import java.util.ArrayList; import java.util.List; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailSender.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailSender.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailSender.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailSender.java index bcc7f25da..59e5bde9d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/TestMailSender.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/TestMailSender.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mail; +package org.springframework.batch.samples.mail; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/User.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/User.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/User.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/User.java index de6831e99..5634f01d8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/User.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mail; +package org.springframework.batch.samples.mail; /** * @author Dan Garrette diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/UserMailItemProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/UserMailItemProcessor.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/UserMailItemProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/UserMailItemProcessor.java index d8ba89000..5eef350d1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mail/UserMailItemProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mail/UserMailItemProcessor.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mail; +package org.springframework.batch.samples.mail; import java.util.Date; import org.springframework.batch.item.ItemProcessor; -import org.springframework.batch.sample.mail.User; import org.springframework.lang.Nullable; import org.springframework.mail.SimpleMailMessage; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/BatchMetricsApplication.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/BatchMetricsApplication.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/BatchMetricsApplication.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/BatchMetricsApplication.java index 6449625ae..225850858 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/BatchMetricsApplication.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/BatchMetricsApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.metrics; +package org.springframework.batch.samples.metrics; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job1Configuration.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job1Configuration.java index 03ac75c3e..e7fd37220 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job1Configuration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.metrics; +package org.springframework.batch.samples.metrics; import java.util.Random; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job2Configuration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job2Configuration.java index 77bf4adcb..99a81e22d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/Job2Configuration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.metrics; +package org.springframework.batch.samples.metrics; import java.util.LinkedList; import java.util.List; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/JobScheduler.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/JobScheduler.java index 06e9c417e..d76526697 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/JobScheduler.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.metrics; +package org.springframework.batch.samples.metrics; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParameters; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/PrometheusConfiguration.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/PrometheusConfiguration.java index b27526f63..b83014b94 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/metrics/PrometheusConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.metrics; +package org.springframework.batch.samples.metrics; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/groovy/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/groovy/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/groovy/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/groovy/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopReader.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopReader.java index a830d9a20..ccc48f0a5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import org.springframework.batch.item.ItemReader; import org.springframework.lang.Nullable; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopWriter.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopWriter.java index f56a4199f..c1052b536 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/InfiniteLoopWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/InfiniteLoopWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisher.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisher.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisher.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisher.java index cd0998022..fab7f805a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisher.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import javax.management.Notification; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/SimpleMessageApplicationEvent.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/SimpleMessageApplicationEvent.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/SimpleMessageApplicationEvent.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/SimpleMessageApplicationEvent.java index 23c7f2132..72d12cbf5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/jmx/SimpleMessageApplicationEvent.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/jmx/SimpleMessageApplicationEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import org.springframework.context.ApplicationEvent; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetails.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetails.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetails.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetails.java index a4321a85d..97a2f0ae0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetails.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetails.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.misc.quartz; +package org.springframework.batch.samples.misc.quartz; import java.util.Date; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/README.md similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/README.md index 56da85d88..62bfd1a83 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/misc/quartz/README.md +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/misc/quartz/README.md @@ -33,9 +33,10 @@ Also, a Quartz `JobDetail` is defined using a Spring `JobDetailBean` as a convenience. ```xml + - - + + diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/DeletionJobConfiguration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/DeletionJobConfiguration.java index 9babf2da2..42dcd42d9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/DeletionJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mongodb; +package org.springframework.batch.samples.mongodb; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/InsertionJobConfiguration.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/InsertionJobConfiguration.java index 518d14a07..1e1488d50 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/InsertionJobConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mongodb; +package org.springframework.batch.samples.mongodb; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBConfiguration.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBConfiguration.java index 05b0a12da..4695a21fd 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mongodb; +package org.springframework.batch.samples.mongodb; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; @@ -28,7 +28,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; @Configuration -@PropertySource("classpath:/org/springframework/batch/sample/mongodb/mongodb-sample.properties") +@PropertySource("classpath:/org/springframework/batch/samples/mongodb/mongodb-sample.properties") public class MongoDBConfiguration { @Value("${mongodb.host}") diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBSampleApp.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBSampleApp.java index bb651fdcf..ae7b53bbb 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/MongoDBSampleApp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mongodb; +package org.springframework.batch.samples.mongodb; import java.util.Arrays; import java.util.List; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/Person.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/Person.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/Person.java index 8dac2336a..3a77a9830 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/Person.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/mongodb/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mongodb; +package org.springframework.batch.samples.mongodb; public class Person { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/local/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/local/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/local/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/local/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BasicPartitioner.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BasicPartitioner.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BasicPartitioner.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BasicPartitioner.java index 953f252d0..99a5b50b6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BasicPartitioner.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BasicPartitioner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote; +package org.springframework.batch.samples.partitioning.remote; import java.util.Map; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BrokerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BrokerConfiguration.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BrokerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BrokerConfiguration.java index 6de7fc175..ac6c6368d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/BrokerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/BrokerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote; +package org.springframework.batch.samples.partitioning.remote; import jakarta.jms.JMSException; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource; * @author Mahmoud Ben Hassine */ @Configuration -@PropertySource("classpath:org/springframework/batch/sample/partitioning/remote/remote-partitioning.properties") +@PropertySource("classpath:org/springframework/batch/samples/partitioning/remote/remote-partitioning.properties") public class BrokerConfiguration { @Value("${broker.url}") diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/DataSourceConfiguration.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/DataSourceConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/DataSourceConfiguration.java index d2b7bdc8d..dbb6fabde 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/DataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote; +package org.springframework.batch.samples.partitioning.remote; import javax.sql.DataSource; @@ -30,7 +30,7 @@ import org.springframework.jdbc.support.JdbcTransactionManager; * @author Mahmoud Ben Hassine */ @Configuration -@PropertySource("classpath:org/springframework/batch/sample/partitioning/remote/remote-partitioning.properties") +@PropertySource("classpath:org/springframework/batch/samples/partitioning/remote/remote-partitioning.properties") public class DataSourceConfiguration { @Value("${datasource.url}") diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/ManagerConfiguration.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/ManagerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/ManagerConfiguration.java index e1f4485aa..34b14195c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/ManagerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote.aggregating; +package org.springframework.batch.samples.partitioning.remote.aggregating; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -24,9 +24,9 @@ import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.integration.config.annotation.EnableBatchIntegration; import org.springframework.batch.integration.partition.RemotePartitioningManagerStepBuilderFactory; -import org.springframework.batch.sample.partitioning.remote.BasicPartitioner; -import org.springframework.batch.sample.partitioning.remote.BrokerConfiguration; -import org.springframework.batch.sample.partitioning.remote.DataSourceConfiguration; +import org.springframework.batch.samples.partitioning.remote.BasicPartitioner; +import org.springframework.batch.samples.partitioning.remote.BrokerConfiguration; +import org.springframework.batch.samples.partitioning.remote.DataSourceConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/WorkerConfiguration.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/WorkerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/WorkerConfiguration.java index 07cd0a86b..76985b89b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/aggregating/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/aggregating/WorkerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote.aggregating; +package org.springframework.batch.samples.partitioning.remote.aggregating; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -24,8 +24,8 @@ import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.integration.config.annotation.EnableBatchIntegration; import org.springframework.batch.integration.partition.RemotePartitioningWorkerStepBuilderFactory; import org.springframework.batch.repeat.RepeatStatus; -import org.springframework.batch.sample.partitioning.remote.BrokerConfiguration; -import org.springframework.batch.sample.partitioning.remote.DataSourceConfiguration; +import org.springframework.batch.samples.partitioning.remote.BrokerConfiguration; +import org.springframework.batch.samples.partitioning.remote.DataSourceConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/ManagerConfiguration.java similarity index 90% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/ManagerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/ManagerConfiguration.java index 0b00cf070..af3102493 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/ManagerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote.polling; +package org.springframework.batch.samples.partitioning.remote.polling; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -24,9 +24,9 @@ import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.integration.config.annotation.EnableBatchIntegration; import org.springframework.batch.integration.partition.RemotePartitioningManagerStepBuilderFactory; -import org.springframework.batch.sample.partitioning.remote.BasicPartitioner; -import org.springframework.batch.sample.partitioning.remote.BrokerConfiguration; -import org.springframework.batch.sample.partitioning.remote.DataSourceConfiguration; +import org.springframework.batch.samples.partitioning.remote.BasicPartitioner; +import org.springframework.batch.samples.partitioning.remote.BrokerConfiguration; +import org.springframework.batch.samples.partitioning.remote.DataSourceConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/WorkerConfiguration.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/WorkerConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/WorkerConfiguration.java index 00a138b28..61d84081b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/partitioning/remote/polling/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/partitioning/remote/polling/WorkerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partitioning.remote.polling; +package org.springframework.batch.samples.partitioning.remote.polling; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -24,8 +24,8 @@ import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.integration.config.annotation.EnableBatchIntegration; import org.springframework.batch.integration.partition.RemotePartitioningWorkerStepBuilderFactory; import org.springframework.batch.repeat.RepeatStatus; -import org.springframework.batch.sample.partitioning.remote.BrokerConfiguration; -import org.springframework.batch.sample.partitioning.remote.DataSourceConfiguration; +import org.springframework.batch.samples.partitioning.remote.BrokerConfiguration; +import org.springframework.batch.samples.partitioning.remote.DataSourceConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/processindicator/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/processindicator/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/processindicator/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/processindicator/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/restart/fail/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/restart/fail/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/restart/fail/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/restart/fail/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/restart/stop/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/restart/stop/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/restart/stop/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/restart/stop/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/retry/RetrySampleConfiguration.java similarity index 89% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/retry/RetrySampleConfiguration.java index a5f645695..8b1ad4968 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/retry/RetrySampleConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.retry; +package org.springframework.batch.samples.retry; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -23,9 +23,9 @@ import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.StepBuilder; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; -import org.springframework.batch.sample.support.RetrySampleItemWriter; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.internal.GeneratingTradeItemReader; +import org.springframework.batch.samples.support.RetrySampleItemWriter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/DataSourceConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/DataSourceConfiguration.java index 9a464c4df..33d35dc2f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/DataSourceConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.skip; +package org.springframework.batch.samples.skip; import javax.sql.DataSource; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringProcessSample.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringProcessSample.java index ead057bc2..005d885b7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringProcessSample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.skip; +package org.springframework.batch.samples.skip; import java.util.Arrays; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringReadSample.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringReadSample.java index d10a29a49..b6f5bcda4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringReadSample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.skip; +package org.springframework.batch.samples.skip; import java.util.Arrays; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringWriteSample.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringWriteSample.java index 337735ab3..3d5414048 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/skip/SkippableExceptionDuringWriteSample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.skip; +package org.springframework.batch.samples.skip; import java.util.Arrays; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/DummyItemWriter.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/support/DummyItemWriter.java index 6b089e3da..cb80c90e9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/DummyItemWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/ExceptionThrowingItemReaderProxy.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/support/ExceptionThrowingItemReaderProxy.java index fcde2896b..dbe0cf8fc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/ExceptionThrowingItemReaderProxy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.item.ItemReader; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/HeaderCopyCallback.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/support/HeaderCopyCallback.java index 5a4e4f5ed..b0ab2666d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/HeaderCopyCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import java.io.IOException; import java.io.Writer; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/RetrySampleItemWriter.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/support/RetrySampleItemWriter.java index 49ff18227..2c90d7e0d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/RetrySampleItemWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/SummaryFooterCallback.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/SummaryFooterCallback.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/support/SummaryFooterCallback.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/support/SummaryFooterCallback.java index da7e7bb83..985f8d5c7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/SummaryFooterCallback.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/support/SummaryFooterCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import java.io.IOException; import java.io.Writer; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/README.md b/spring-batch-samples/src/main/java/org/springframework/batch/samples/trade/README.md similarity index 100% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/README.md rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/trade/README.md diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/ValidationSampleConfiguration.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/ValidationSampleConfiguration.java index e3b402af7..09713f3a2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/ValidationSampleConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.validation; +package org.springframework.batch.samples.validation; import java.util.Arrays; @@ -29,7 +29,7 @@ import org.springframework.batch.core.step.builder.StepBuilder; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.item.support.ListItemWriter; import org.springframework.batch.item.validator.BeanValidatingItemProcessor; -import org.springframework.batch.sample.validation.domain.Person; +import org.springframework.batch.samples.validation.domain.Person; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/domain/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/domain/Person.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/domain/Person.java rename to spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/domain/Person.java index a06fa8caf..29b76ccf6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/domain/Person.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/validation/domain/Person.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.validation.domain; +package org.springframework.batch.samples.validation.domain; import jakarta.validation.constraints.NotEmpty; diff --git a/spring-batch-samples/src/main/resources/META-INF/persistence.xml b/spring-batch-samples/src/main/resources/META-INF/persistence.xml index dc3dc605d..573cb7a21 100644 --- a/spring-batch-samples/src/main/resources/META-INF/persistence.xml +++ b/spring-batch-samples/src/main/resources/META-INF/persistence.xml @@ -4,7 +4,7 @@ version="1.0"> - org.springframework.batch.sample.domain.trade.CustomerCredit + org.springframework.batch.samples.domain.trade.CustomerCredit true diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/readerwriter/delegatingJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml similarity index 97% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/readerwriter/delegatingJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml index 9465c0f25..cdb0c5177 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/readerwriter/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml @@ -35,5 +35,5 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/tasklet/taskletJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/tasklet/taskletJob.xml similarity index 90% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/tasklet/taskletJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/tasklet/taskletJob.xml index f3a042e03..6d65c22cd 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/adapter/tasklet/taskletJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/tasklet/taskletJob.xml @@ -44,11 +44,11 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/default.amqp.properties b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/default.amqp.properties similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/default.amqp.properties rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/default.amqp.properties diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/amqp-example-job.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/amqp-example-job.xml similarity index 94% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/amqp-example-job.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/amqp-example-job.xml index 467a93c21..3cafb1e50 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/amqp-example-job.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/amqp-example-job.xml @@ -8,7 +8,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/batch https://www.springframework.org/schema/batch/spring-batch.xsd http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + @@ -22,7 +22,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/rabbitmq-beans.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/rabbitmq-beans.xml similarity index 96% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/rabbitmq-beans.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/rabbitmq-beans.xml index fa4528151..c60e3b750 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/amqp/job/rabbitmq-beans.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/amqp/job/rabbitmq-beans.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/data/ImportPersonDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/data/ImportPersonDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/data/ImportPersonDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/data/ImportPersonDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/job/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/job/beanWrapperMapperSampleJob.xml similarity index 80% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/job/beanWrapperMapperSampleJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/job/beanWrapperMapperSampleJob.xml index e3c037451..0f645886b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/beanwrapper/job/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/beanwrapper/job/beanWrapperMapperSampleJob.xml @@ -24,7 +24,7 @@ + value="classpath:org/springframework/batch/samples/beanwrapper/data/ImportTradeDataStep.txt" /> @@ -35,7 +35,7 @@ + value="classpath:org/springframework/batch/samples/beanwrapper/data/ImportPersonDataStep.txt" /> @@ -57,11 +57,11 @@ - + - + @@ -78,17 +78,17 @@ - + - + - + - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/chunking/remote-chunking.properties b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/chunking/remote-chunking.properties similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/chunking/remote-chunking.properties rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/chunking/remote-chunking.properties diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/compositewriter/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/compositewriter/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/compositewriter/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/compositewriter/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/compositewriter/job/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/compositewriter/job/compositeItemWriterSampleJob.xml similarity index 87% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/compositewriter/job/compositeItemWriterSampleJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/compositewriter/job/compositeItemWriterSampleJob.xml index eb3ab2aac..e82c4589b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/compositewriter/job/compositeItemWriterSampleJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/compositewriter/job/compositeItemWriterSampleJob.xml @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ + value="classpath:org/springframework/batch/samples/compositewriter/data/ImportTradeDataStep.txt" /> @@ -58,11 +58,11 @@ - + - + @@ -88,5 +88,5 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/delimited/data/delimited.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/delimited/data/delimited.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/delimited/data/delimited.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/delimited/data/delimited.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/delimited/job/delimited.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/delimited/job/delimited.xml similarity index 95% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/delimited/job/delimited.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/delimited/job/delimited.xml index d398e1f73..75497247a 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/delimited/job/delimited.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/delimited/job/delimited.xml @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/fixed/data/fixedLength.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/fixed/data/fixedLength.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/fixed/data/fixedLength.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/fixed/data/fixedLength.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/fixed/job/fixedLength.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/fixed/job/fixedLength.xml similarity index 93% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/fixed/job/fixedLength.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/fixed/job/fixedLength.xml index be9cbf283..3da053903 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/fixed/job/fixedLength.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/fixed/job/fixedLength.xml @@ -15,7 +15,7 @@ - + @@ -32,7 +32,7 @@ + value="org.springframework.batch.samples.domain.trade.CustomerCredit" /> diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/json/data/trades.json b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/json/data/trades.json similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/json/data/trades.json rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/json/data/trades.json diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiline/data/multiLine.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/data/multiLine.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiline/data/multiLine.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/data/multiLine.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiline/job/multiLine.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/job/multiLine.xml similarity index 87% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiline/job/multiLine.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/job/multiLine.xml index 1f5c47fb1..a21502bd2 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiline/job/multiLine.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/job/multiLine.xml @@ -14,7 +14,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multilineaggregate/data/multilineStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multilineaggregate/data/multilineStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multilineaggregate/data/multilineStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multilineaggregate/data/multilineStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multilineaggregate/job/multilineJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multilineaggregate/job/multilineJob.xml similarity index 86% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multilineaggregate/job/multilineJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multilineaggregate/job/multilineJob.xml index b5a03ccce..afc109cf0 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multilineaggregate/job/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multilineaggregate/job/multilineJob.xml @@ -17,7 +17,7 @@ + class="org.springframework.batch.samples.file.multilineaggregate.AggregateItemReader"> @@ -32,13 +32,13 @@ + value="classpath:org/springframework/batch/samples/file/multilineaggregate/data/multilineStep.txt" /> + class="org.springframework.batch.samples.file.multilineaggregate.AggregateItemFieldSetMapper"> @@ -47,7 +47,7 @@ + class="org.springframework.batch.samples.domain.trade.internal.TradeFieldSetMapper" /> diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multirecordtype/data/multiRecordType.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multirecordtype/data/multiRecordType.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multirecordtype/job/multiRecordType.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/job/multiRecordType.xml similarity index 91% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multirecordtype/job/multiRecordType.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/job/multiRecordType.xml index c7c4db76c..d28c4382b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multirecordtype/job/multiRecordType.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/job/multiRecordType.xml @@ -48,16 +48,16 @@ + class="org.springframework.batch.samples.domain.trade.internal.TradeFieldSetMapper" /> + class="org.springframework.batch.samples.domain.trade.internal.CustomerCreditFieldSetMapper" /> - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/data/delimited.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/data/delimited.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/data/delimited.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/data/delimited.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/data/delimited2.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/data/delimited2.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/data/delimited2.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/data/delimited2.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/job/multiResource.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/job/multiResource.xml similarity index 94% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/job/multiResource.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/job/multiResource.xml index 3473e37b1..88e5f71e9 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/multiresource/job/multiResource.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiresource/job/multiResource.xml @@ -15,7 +15,7 @@ - + @@ -35,7 +35,7 @@ + value="org.springframework.batch.samples.domain.trade.CustomerCredit" /> diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/multilineOrderInput.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/multilineOrderInput.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/multilineOrderInput.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/multilineOrderInput.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/multilineOrderOutput.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/multilineOrderOutput.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/order_sample.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/order_sample.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/data/order_sample.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/data/order_sample.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderInputTokenizers.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderInputTokenizers.xml similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderInputTokenizers.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderInputTokenizers.xml diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderJob.xml similarity index 80% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderJob.xml index 3138f7da5..95f88196d 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderJob.xml @@ -23,7 +23,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -45,12 +45,12 @@ - - - - - - + + + + + + @@ -60,7 +60,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderOutputAggregators.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderOutputAggregators.xml similarity index 73% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderOutputAggregators.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderOutputAggregators.xml index a15643f3c..3ad04aa19 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderOutputAggregators.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderOutputAggregators.xml @@ -19,42 +19,42 @@ - + - + - + - + - + - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderValidator.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderValidator.xml similarity index 89% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderValidator.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderValidator.xml index 45466ef37..4b07397eb 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/patternmatching/job/multilineOrderValidator.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/patternmatching/job/multilineOrderValidator.xml @@ -6,7 +6,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/xml/data/input.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/xml/data/input.xml similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/xml/data/input.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/xml/data/input.xml diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/xml/job/xml.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/xml/job/xml.xml similarity index 90% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/xml/job/xml.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/xml/job/xml.xml index 2a612dc81..8915ac731 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/file/xml/job/xml.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/xml/job/xml.xml @@ -17,7 +17,7 @@ - + @@ -36,7 +36,7 @@ + value="org.springframework.batch.samples.domain.trade.CustomerCredit" /> @@ -45,7 +45,7 @@ - org.springframework.batch.sample.domain.trade.CustomerCredit + org.springframework.batch.samples.domain.trade.CustomerCredit diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/filter/data/customers.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/filter/data/customers.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/filter/data/customers.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/filter/data/customers.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/filter/job/customerFilterJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/filter/job/customerFilterJob.xml similarity index 79% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/filter/job/customerFilterJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/filter/job/customerFilterJob.xml index 5b702cd83..d180077d2 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/filter/job/customerFilterJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/filter/job/customerFilterJob.xml @@ -17,13 +17,13 @@ + class="org.springframework.batch.samples.domain.trade.CustomerUpdateWriter"> - + @@ -35,10 +35,10 @@ + class="org.springframework.batch.samples.domain.trade.CustomerUpdateFieldSetMapper" /> + class="org.springframework.batch.samples.domain.trade.CompositeCustomerUpdateLineTokenizer"> @@ -54,16 +54,16 @@ + class="org.springframework.batch.samples.domain.trade.CustomerUpdateProcessor"> + class="org.springframework.batch.samples.domain.trade.internal.CommonsLoggingInvalidCustomerLogger" /> + class="org.springframework.batch.samples.domain.trade.internal.JdbcCustomerDao"> diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/games-small.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/games-small.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/games-small.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/games-small.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/games.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/games.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/games.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/games.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-containsBadRecords.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-containsBadRecords.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-containsBadRecords.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-containsBadRecords.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-small1.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-small1.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-small1.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-small1.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-small2.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-small2.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player-small2.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player-small2.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/data/player.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/data/player.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/job/footballJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/job/footballJob.xml similarity index 85% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/job/footballJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/job/footballJob.xml index 5a66eee45..45a9565d2 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/job/footballJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/job/footballJob.xml @@ -27,24 +27,24 @@ - + - + - + - + - + @@ -53,14 +53,14 @@ - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/sql/schema.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/sql/schema.sql similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/football/sql/schema.sql rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/football/sql/schema.sql diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/headerfooter/data/input.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/data/input.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/headerfooter/data/input.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/data/input.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/headerfooter/job/headerFooterSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/job/headerFooterSample.xml similarity index 92% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/headerfooter/job/headerFooterSample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/job/headerFooterSample.xml index 462fb9682..05658f6e0 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/headerfooter/job/headerFooterSample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/job/headerFooterSample.xml @@ -52,12 +52,12 @@ - + + class="org.springframework.batch.samples.support.HeaderCopyCallback" /> + value="org/springframework/batch/samples/headerfooter/data/input.txt" /> - diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcCursor.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcCursor.xml similarity index 88% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcCursor.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcCursor.xml index ac44a1908..bbd30f39b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcCursor.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcCursor.xml @@ -16,14 +16,14 @@ + class="org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor"/> - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcPaging.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcPaging.xml similarity index 91% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcPaging.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcPaging.xml index 66b24b386..14cd7f750 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/job/jdbcPaging.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/job/jdbcPaging.xml @@ -16,12 +16,12 @@ + class="org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor"/> - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/sql/schema.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/sql/schema.sql similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jdbc/sql/schema.sql rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jdbc/sql/schema.sql diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jobstep/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jobstep/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jobstep/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jobstep/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jobstep/job/jobStepSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jobstep/job/jobStepSample.xml similarity index 87% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jobstep/job/jobStepSample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jobstep/job/jobStepSample.xml index 3b2ca325a..bbb6dd086 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jobstep/job/jobStepSample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jobstep/job/jobStepSample.xml @@ -27,7 +27,7 @@ - + @@ -49,11 +49,11 @@ - + - + @@ -63,6 +63,6 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/jpa.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml similarity index 95% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/jpa.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml index c943acf8d..7b7d7ef98 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/jpa.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml @@ -14,7 +14,7 @@ - + @@ -63,6 +63,6 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/repository.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml similarity index 95% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/repository.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml index da24f204b..9a90314a1 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/job/repository.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"> - + @@ -21,7 +21,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/sql/schema.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/sql/schema.sql similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/jpa/sql/schema.sql rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/sql/schema.sql diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/loop/loopFlowSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/loop/loopFlowSample.xml similarity index 85% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/loop/loopFlowSample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/loop/loopFlowSample.xml index c69942fce..383edcdb9 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/loop/loopFlowSample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/loop/loopFlowSample.xml @@ -27,17 +27,17 @@ - + - + - + - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/mail/mailJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/mail/mailJob.xml similarity index 90% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/mail/mailJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/mail/mailJob.xml index 8ff45bef4..fc28c457f 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/mail/mailJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/mail/mailJob.xml @@ -20,7 +20,7 @@ - + @@ -32,11 +32,11 @@ - + - + - + John Adams's Account Info diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/docker-compose.yml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/docker-compose.yml similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/docker-compose.yml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/docker-compose.yml diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/metrics-sample.properties b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/metrics-sample.properties similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/metrics-sample.properties rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/metrics-sample.properties diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/prometheus.yml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/prometheus.yml similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/prometheus.yml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/prometheus.yml diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/spring-batch-dashboard.json b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/spring-batch-dashboard.json similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/metrics/spring-batch-dashboard.json rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/metrics/spring-batch-dashboard.json diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/groovy/data/files.zip b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/data/files.zip similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/groovy/data/files.zip rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/data/files.zip diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/groovy/job/groovyJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml similarity index 98% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/groovy/job/groovyJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml index 08d4072a0..f841d2166 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/groovy/job/groovyJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml @@ -34,7 +34,7 @@ class UnzipTasklet { void execute() { def ant = new AntBuilder() - ant.unzip(src:"src/main/resources/org/springframework/batch/sample/misc/groovy/data/files.zip", + ant.unzip(src:"src/main/resources/org/springframework/batch/samples/misc/groovy/data/files.zip", dest:"target/groovyJob/staging") } } diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml similarity index 91% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhoc-job-launcher-context.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml index 1a04aba55..da17b6e1b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhoc-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml @@ -23,14 +23,14 @@ - + - + @@ -47,7 +47,7 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhocLoopJob.xml similarity index 89% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhocLoopJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhocLoopJob.xml index 6dfd5b8bc..ecdffdd29 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/jmx/adhocLoopJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhocLoopJob.xml @@ -21,8 +21,8 @@ - - + + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/quartz/quartz-job-launcher-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/quartz/quartz-job-launcher-context.xml similarity index 97% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/quartz/quartz-job-launcher-context.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/quartz/quartz-job-launcher-context.xml index 7f334d2ba..076bd0da1 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/misc/quartz/quartz-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/quartz/quartz-job-launcher-context.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/mongodb/mongodb-sample.properties b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/mongodb/mongodb-sample.properties similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/mongodb/mongodb-sample.properties rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/mongodb/mongodb-sample.properties diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/data/delimited1.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/data/delimited1.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/data/delimited1.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/data/delimited1.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/data/delimited2.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/data/delimited2.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/data/delimited2.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/data/delimited2.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/job/partitionFileJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/job/partitionFileJob.xml similarity index 92% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/job/partitionFileJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/job/partitionFileJob.xml index 861c3d013..50a2ca3a8 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/file/job/partitionFileJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/file/job/partitionFileJob.xml @@ -13,7 +13,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -59,14 +59,14 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/jdbc/partitionJdbcJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/jdbc/partitionJdbcJob.xml similarity index 90% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/jdbc/partitionJdbcJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/jdbc/partitionJdbcJob.xml index 8f5029258..1556a2919 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partition/jdbc/partitionJdbcJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partition/jdbc/partitionJdbcJob.xml @@ -12,7 +12,7 @@ - + @@ -29,14 +29,14 @@ - + - + @@ -75,7 +75,7 @@ - + @@ -93,11 +93,11 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/partitioning/remote/remote-partitioning.properties b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/partitioning/remote/remote-partitioning.properties similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/partitioning/remote/remote-partitioning.properties rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/partitioning/remote/remote-partitioning.properties diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/parallelJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/parallelJob.xml similarity index 85% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/parallelJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/parallelJob.xml index f83fe0886..04691f4fa 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/parallelJob.xml @@ -31,7 +31,7 @@ - + @@ -42,15 +42,15 @@ - + - + - + @@ -60,7 +60,7 @@ --> + value="classpath:org/springframework/batch/samples/processindicator/data/ImportTradeDataStep.txt" /> @@ -82,12 +82,12 @@ - + + class="org.springframework.batch.samples.domain.trade.internal.JdbcTradeDao"> @@ -98,7 +98,7 @@ + class="org.springframework.batch.samples.domain.trade.internal.TradeFieldSetMapper" /> diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/staging-test-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/staging-test-context.xml similarity index 78% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/staging-test-context.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/staging-test-context.xml index 345eb7314..d69e162ae 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/processindicator/job/staging-test-context.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/processindicator/job/staging-test-context.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/fail/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/fail/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/fail/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/fail/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/fail/job/failRestartSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/fail/job/failRestartSample.xml similarity index 82% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/fail/job/failRestartSample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/fail/job/failRestartSample.xml index 75d50974e..ddeb2eecd 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/fail/job/failRestartSample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/fail/job/failRestartSample.xml @@ -20,11 +20,11 @@ - + - + @@ -46,11 +46,11 @@ - + - + @@ -60,5 +60,5 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/stop/stopRestartSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml similarity index 90% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/stop/stopRestartSample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml index 560d3f1c7..715a773e6 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/restart/stop/stopRestartSample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml @@ -36,12 +36,12 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/retry/retrySample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/retry/retrySample.xml similarity index 85% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/retry/retrySample.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/retry/retrySample.xml index c891efe19..da815368b 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/retry/retrySample.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/retry/retrySample.xml @@ -19,9 +19,9 @@ - + - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/data/input1.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/data/input1.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/data/input1.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/data/input1.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/data/input2.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/data/input2.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/data/input2.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/data/input2.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSample-job-launcher-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml similarity index 94% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSample-job-launcher-context.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml index 3be305b19..04def7139 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSample-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml @@ -23,7 +23,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSampleJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSampleJob.xml similarity index 83% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSampleJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSampleJob.xml index 9c4517ce3..e21f9e976 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/skip/job/skipSampleJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSampleJob.xml @@ -56,14 +56,14 @@ - + stepName - + @@ -73,7 +73,7 @@ - + @@ -82,21 +82,21 @@ - + - + - + - + - + @@ -112,7 +112,7 @@ - + @@ -121,16 +121,16 @@ - + - + - + diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/data/ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/data/ImportTradeDataStep.txt similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/data/ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/data/ImportTradeDataStep.txt diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/data/TradeJob.csv b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/data/TradeJob.csv similarity index 100% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/data/TradeJob.csv rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/data/TradeJob.csv diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/job/tradeJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/job/tradeJob.xml similarity index 80% rename from spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/job/tradeJob.xml rename to spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/job/tradeJob.xml index a9bd73e05..7a0a2870e 100644 --- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/trade/job/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/trade/job/tradeJob.xml @@ -36,15 +36,15 @@ - + - + - + @@ -52,7 +52,7 @@ - + @@ -61,11 +61,11 @@ - + - @@ -74,10 +74,10 @@ - - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -106,7 +106,7 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml index b036987c1..86beb60e9 100644 --- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml @@ -35,8 +35,8 @@ - + + class="org.springframework.batch.samples.common.StepExecutionApplicationEventAdvice" /> diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/readerwriter/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java similarity index 89% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/readerwriter/DelegatingJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java index aec56c503..670a6f5b5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/readerwriter/DelegatingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.adapter.readerwriter; +package org.springframework.batch.samples.adapter.readerwriter; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.person.PersonService; +import org.springframework.batch.samples.domain.person.PersonService; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -25,7 +25,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/adapter/readerwriter/delegatingJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class DelegatingJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/tasklet/TaskletAdapterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/tasklet/TaskletAdapterJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java index f7cc4d2b1..4a055ee29 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/adapter/tasklet/TaskletAdapterJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.adapter.tasklet; +package org.springframework.batch.samples.adapter.tasklet; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/adapter/tasklet/taskletJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/adapter/tasklet/taskletJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class TaskletAdapterJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/amqp/AmqpJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/amqp/AmqpJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java index 00132a7b1..191c41a3f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/amqp/AmqpJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.amqp; +package org.springframework.batch.samples.amqp; import org.junit.jupiter.api.Test; import org.testcontainers.containers.RabbitMQContainer; @@ -36,8 +36,6 @@ import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.amqp.AmqpJobConfiguration; -import org.springframework.batch.sample.amqp.AmqpMessageProducer; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -61,7 +59,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext *

*/ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/amqp/job/amqp-example-job.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/amqp/job/amqp-example-job.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) @Testcontainers(disabledWithoutDocker = true) class AmqpJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java index 3443e7223..8dd76d676 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.beanwrapper; +package org.springframework.batch.samples.beanwrapper; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/beanwrapper/job/beanWrapperMapperSampleJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/beanwrapper/job/beanWrapperMapperSampleJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class BeanWrapperMapperSampleJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/chunking/RemoteChunkingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/chunking/RemoteChunkingJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java index 3bed4c70d..df19e90e3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/chunking/RemoteChunkingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.chunking; +package org.springframework.batch.samples.chunking; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; -import org.springframework.batch.sample.config.JobRunnerConfiguration; +import org.springframework.batch.samples.config.JobRunnerConfiguration; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ @SpringJUnitConfig(classes = { JobRunnerConfiguration.class, ManagerConfiguration.class }) -@PropertySource("classpath:org/springframework/batch/sample/chunking/remote-chunking.properties") +@PropertySource("classpath:org/springframework/batch/samples/chunking/remote-chunking.properties") class RemoteChunkingJobFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ColumnRangePartitionerTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ColumnRangePartitionerTests.java index 225c4ad7b..ef99ec04a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ColumnRangePartitionerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import java.util.Map; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemReaderTests.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemReaderTests.java index e6f084f6c..014cea2c7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemReaderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemWriterTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemWriterTests.java index 422660498..39017fa12 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/CustomItemWriterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ExceptionThrowingItemReaderProxyTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ExceptionThrowingItemReaderProxyTests.java index 3c94bcbf3..8efb41553 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/ExceptionThrowingItemReaderProxyTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.support.RepeatSynchronizationManager; -import org.springframework.batch.sample.support.ExceptionThrowingItemReaderProxy; +import org.springframework.batch.samples.support.ExceptionThrowingItemReaderProxy; import java.util.List; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/OutputFileListenerTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/OutputFileListenerTests.java index 201006d21..d66adbca3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/OutputFileListenerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemReaderTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemReaderTests.java index 9b7157e1c..11b253b24 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemReaderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import javax.sql.DataSource; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @SpringJUnitConfig( - locations = "classpath:org/springframework/batch/sample/processindicator/job/staging-test-context.xml") + locations = "classpath:org/springframework/batch/samples/processindicator/job/staging-test-context.xml") class StagingItemReaderTests { private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemWriterTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemWriterTests.java index 5f62637a2..447a64e42 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/common/StagingItemWriterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.common; +package org.springframework.batch.samples.common; import javax.sql.DataSource; @@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringJUnitConfig( - locations = "classpath:org/springframework/batch/sample/processindicator/job/staging-test-context.xml") + locations = "classpath:org/springframework/batch/samples/processindicator/job/staging-test-context.xml") class StagingItemWriterTests { private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/compositewriter/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/compositewriter/CompositeItemWriterSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java index 46b9bec18..c8c1d5e67 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/compositewriter/CompositeItemWriterSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.compositewriter; +package org.springframework.batch.samples.compositewriter; import java.io.FileInputStream; import java.io.IOException; @@ -28,7 +28,7 @@ import javax.sql.DataSource; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -39,7 +39,7 @@ import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringJUnitConfig( - locations = { "/org/springframework/batch/sample/compositewriter/job/compositeItemWriterSampleJob.xml", + locations = { "/org/springframework/batch/samples/compositewriter/job/compositeItemWriterSampleJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class CompositeItemWriterSampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/config/JobRunnerConfiguration.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/config/JobRunnerConfiguration.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/config/JobRunnerConfiguration.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/config/JobRunnerConfiguration.java index 50715a59d..57bc9460f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/config/JobRunnerConfiguration.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/config/JobRunnerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.config; +package org.springframework.batch.samples.config; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.repository.JobRepository; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemFieldSetMapperTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemFieldSetMapperTests.java index 3e72b284e..e0fdec80e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemFieldSetMapperTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.multiline; +package org.springframework.batch.samples.domain.multiline; import org.junit.jupiter.api.Test; import org.springframework.batch.item.file.transform.DefaultFieldSet; -import org.springframework.batch.sample.file.multilineaggregate.AggregateItemFieldSetMapper; +import org.springframework.batch.samples.file.multilineaggregate.AggregateItemFieldSetMapper; import static org.junit.jupiter.api.Assertions.*; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemReaderTests.java similarity index 88% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemReaderTests.java index 27483d27b..34e9a8b9d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemReaderTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.multiline; +package org.springframework.batch.samples.domain.multiline; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.sample.file.multilineaggregate.AggregateItem; -import org.springframework.batch.sample.file.multilineaggregate.AggregateItemReader; +import org.springframework.batch.samples.file.multilineaggregate.AggregateItem; +import org.springframework.batch.samples.file.multilineaggregate.AggregateItemReader; import org.springframework.lang.Nullable; import java.util.Collection; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemTests.java index 19e2340c0..aef0e4567 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/multiline/AggregateItemTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.multiline; +package org.springframework.batch.samples.domain.multiline; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.file.multilineaggregate.AggregateItem; +import org.springframework.batch.samples.file.multilineaggregate.AggregateItem; import static org.junit.jupiter.api.Assertions.*; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/AddressFieldSetMapperTests.java similarity index 88% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/AddressFieldSetMapperTests.java index bb6daa423..a4b1269ce 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/AddressFieldSetMapperTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.AddressFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.AddressFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/BillingFieldSetMapperTests.java similarity index 83% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/BillingFieldSetMapperTests.java index c97beb0f8..4810cd4c5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/BillingFieldSetMapperTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.BillingFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.BillingFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/CustomerFieldSetMapperTests.java similarity index 88% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/CustomerFieldSetMapperTests.java index 05d995c8f..5a5e3032b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/CustomerFieldSetMapperTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.CustomerFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.CustomerFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/HeaderFieldSetMapperTests.java similarity index 84% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/HeaderFieldSetMapperTests.java index 92d1ead43..5789842f3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/HeaderFieldSetMapperTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import java.util.Calendar; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Order; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.HeaderFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.HeaderFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemFieldSetMapperTests.java similarity index 89% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemFieldSetMapperTests.java index de4bc7654..01001757a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemFieldSetMapperTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import java.math.BigDecimal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.OrderItemFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.OrderItemFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemReaderTests.java similarity index 88% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemReaderTests.java index a80d97c7e..07942d78e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/OrderItemReaderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,13 +21,13 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.Order; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; -import org.springframework.batch.sample.file.patternmatching.internal.OrderItemReader; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.internal.OrderItemReader; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/ShippingFieldSetMapperTests.java similarity index 85% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/ShippingFieldSetMapperTests.java index dfd8cafaf..017ebccd3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/order/ShippingFieldSetMapperTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.order; +package org.springframework.batch.samples.domain.order; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; -import org.springframework.batch.sample.file.patternmatching.internal.mapper.ShippingFieldSetMapper; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.internal.mapper.ShippingFieldSetMapper; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java index 3a5d3670a..7b40d7d81 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessorTests.java similarity index 76% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessorTests.java index 39435aa2f..477af4f86 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2022 the original author or authors. + * Copyright 2008-2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,7 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.springframework.batch.sample.domain.trade.CustomerOperation.*; /** * @author Lucas Ward @@ -50,14 +49,16 @@ class CustomerUpdateProcessorTests { @Test void testSuccessfulAdd() throws Exception { - CustomerUpdate customerUpdate = new CustomerUpdate(ADD, "test customer", new BigDecimal("232.2")); + CustomerUpdate customerUpdate = new CustomerUpdate(CustomerOperation.ADD, "test customer", + new BigDecimal("232.2")); when(customerDao.getCustomerByName("test customer")).thenReturn(null); assertEquals(customerUpdate, processor.process(customerUpdate)); } @Test void testInvalidAdd() throws Exception { - CustomerUpdate customerUpdate = new CustomerUpdate(ADD, "test customer", new BigDecimal("232.2")); + CustomerUpdate customerUpdate = new CustomerUpdate(CustomerOperation.ADD, "test customer", + new BigDecimal("232.2")); when(customerDao.getCustomerByName("test customer")).thenReturn(new CustomerCredit()); logger.log(customerUpdate); assertNull(processor.process(customerUpdate), "Processor should return null"); @@ -65,21 +66,24 @@ class CustomerUpdateProcessorTests { @Test void testDelete() throws Exception { - CustomerUpdate customerUpdate = new CustomerUpdate(DELETE, "test customer", new BigDecimal("232.2")); + CustomerUpdate customerUpdate = new CustomerUpdate(CustomerOperation.DELETE, "test customer", + new BigDecimal("232.2")); logger.log(customerUpdate); assertNull(processor.process(customerUpdate), "Processor should return null"); } @Test void testSuccessfulUpdate() throws Exception { - CustomerUpdate customerUpdate = new CustomerUpdate(UPDATE, "test customer", new BigDecimal("232.2")); + CustomerUpdate customerUpdate = new CustomerUpdate(CustomerOperation.UPDATE, "test customer", + new BigDecimal("232.2")); when(customerDao.getCustomerByName("test customer")).thenReturn(new CustomerCredit()); assertEquals(customerUpdate, processor.process(customerUpdate)); } @Test void testInvalidUpdate() throws Exception { - CustomerUpdate customerUpdate = new CustomerUpdate(UPDATE, "test customer", new BigDecimal("232.2")); + CustomerUpdate customerUpdate = new CustomerUpdate(CustomerOperation.UPDATE, "test customer", + new BigDecimal("232.2")); when(customerDao.getCustomerByName("test customer")).thenReturn(null); logger.log(customerUpdate); assertNull(processor.process(customerUpdate), "Processor should return null"); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/TradeTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/TradeTests.java index d4931e2be..b950ce4ab 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/TradeTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade; +package org.springframework.batch.samples.domain.trade; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java similarity index 83% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java index aa102549b..d8eca6cec 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import java.math.BigDecimal; @@ -41,7 +42,7 @@ class CustomerCreditIncreaseProcessorTests { CustomerCredit customerCredit = new CustomerCredit(); customerCredit.setCredit(oldCredit); - assertEquals(oldCredit.add(CustomerCreditIncreaseProcessor.FIXED_AMOUNT), + Assertions.assertEquals(oldCredit.add(CustomerCreditIncreaseProcessor.FIXED_AMOUNT), tested.process(customerCredit).getCredit()); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapperTests.java similarity index 88% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapperTests.java index 9cb00ec5d..1b4673179 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapperTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import static org.mockito.Mockito.when; @@ -21,8 +21,8 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.support.AbstractRowMapperTests; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.support.AbstractRowMapperTests; import org.springframework.jdbc.core.RowMapper; class CustomerCreditRowMapperTests extends AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java index 3c8123edf..5dc781338 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import static org.mockito.Mockito.mock; @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; /** * @author Dave Syer diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateProcessorTests.java similarity index 87% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateProcessorTests.java index 9a61d998e..fe23e676c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateProcessorTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCreditDao; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateProcessorTests.java similarity index 86% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateProcessorTests.java index 435d9a349..3bd08dd09 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateProcessorTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.domain.trade.CustomerDebitDao; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.CustomerDebitDao; +import org.springframework.batch.samples.domain.trade.Trade; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDaoTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDaoTests.java index 9a6e41d9a..090fa8094 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDaoTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.CustomerCredit; import java.math.BigDecimal; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/GeneratingItemReaderTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/GeneratingItemReaderTests.java index dfe885ca4..d5c3597c2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/GeneratingItemReaderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeWriterTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeWriterTests.java index c3bf4613a..1cc1db2df 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeWriterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; @@ -21,7 +21,7 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapperTests.java similarity index 89% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapperTests.java index 472a87068..5311cd406 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapperTests.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import java.math.BigDecimal; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.support.AbstractFieldSetMapperTests; class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessorTests.java similarity index 85% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessorTests.java index 38452d313..45ebcbd24 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessorTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.TradeDao; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.TradeDao; import static org.mockito.Mockito.mock; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapperTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapperTests.java index c7ae9fd96..bf7152d38 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapperTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.domain.trade.internal; +package org.springframework.batch.samples.domain.trade.internal; import static org.mockito.Mockito.when; @@ -21,8 +21,8 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.support.AbstractRowMapperTests; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.support.AbstractRowMapperTests; import org.springframework.jdbc.core.RowMapper; class TradeRowMapperTests extends AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/delimited/DelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/delimited/DelimitedFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java index 099e44247..3a82ae0c6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/delimited/DelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.delimited; +package org.springframework.batch.samples.file.delimited; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Mahmoud Ben Hassine * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/delimited/job/delimited.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/delimited/job/delimited.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class DelimitedFunctionalTests { @@ -50,7 +50,7 @@ class DelimitedFunctionalTests { void testLaunchJobWithXmlConfig() throws Exception { // given JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/delimited/data/delimited.csv") + .addString("inputFile", "org/springframework/batch/samples/file/delimited/data/delimited.csv") .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv") .toJobParameters(); @@ -68,7 +68,7 @@ class DelimitedFunctionalTests { JobLauncher jobLauncher = context.getBean(JobLauncher.class); Job job = context.getBean(Job.class); JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/delimited/data/delimited.csv") + .addString("inputFile", "org/springframework/batch/samples/file/delimited/data/delimited.csv") .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv") .toJobParameters(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/fixed/FixedLengthFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/fixed/FixedLengthFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java index d03c052db..a588fd913 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/fixed/FixedLengthFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.fixed; +package org.springframework.batch.samples.file.fixed; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/fixed/job/fixedLength.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/fixed/job/fixedLength.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class FixedLengthFunctionalTests { @@ -43,7 +43,7 @@ class FixedLengthFunctionalTests { void testLaunchJobWithXmlConfig() throws Exception { // given JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/fixed/data/fixedLength.txt") + .addString("inputFile", "org/springframework/batch/samples/file/fixed/data/fixedLength.txt") .addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt") .toJobParameters(); @@ -61,7 +61,7 @@ class FixedLengthFunctionalTests { JobLauncher jobLauncher = context.getBean(JobLauncher.class); Job job = context.getBean(Job.class); JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/fixed/data/fixedLength.txt") + .addString("inputFile", "org/springframework/batch/samples/file/fixed/data/fixedLength.txt") .addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt") .toJobParameters(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/json/JsonFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/json/JsonFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java index 49f28dfe5..a0fc6a844 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/json/JsonFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.json; +package org.springframework.batch.samples.file.json; import java.io.File; import java.io.FileInputStream; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ class JsonFunctionalTests { - public static final String INPUT_FILE = "org/springframework/batch/sample/file/json/data/trades.json"; + public static final String INPUT_FILE = "org/springframework/batch/samples/file/json/data/trades.json"; public static final String OUTPUT_FILE = "target/test-outputs/trades.json"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiline/MultiLineFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiline/MultiLineFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java index 1facdb0dc..985509303 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiline/MultiLineFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multiline; +package org.springframework.batch.samples.file.multiline; import java.nio.file.Files; import java.nio.file.Path; @@ -44,11 +44,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/multiline/job/multiLine.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/multiline/job/multiLine.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class MultiLineFunctionalTests { - private static final String INPUT_FILE = "org/springframework/batch/sample/file/multiline/data/multiLine.txt"; + private static final String INPUT_FILE = "org/springframework/batch/samples/file/multiline/data/multiLine.txt"; private static final String OUTPUT_FILE = "target/test-outputs/multiLineOutput.txt"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java index 9133edc69..3521ade85 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multilineaggregate; +package org.springframework.batch.samples.file.multilineaggregate; import java.nio.charset.StandardCharsets; @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/multilineaggregate/job/multilineJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/multilineaggregate/job/multilineJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class MultilineAggregateJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java index bd72a6c93..5c6216676 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multirecordtype/MultiRecordTypeFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multirecordtype; +package org.springframework.batch.samples.file.multirecordtype; import java.nio.file.Files; import java.nio.file.Path; @@ -28,7 +28,6 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.batch.sample.file.multiline.MultiLineJobConfiguration; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -45,13 +44,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/multirecordtype/job/multiRecordType.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/multirecordtype/job/multiRecordType.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class MultiRecordTypeFunctionalTests { private static final String OUTPUT_FILE = "target/test-outputs/multiRecordTypeOutput.txt"; - private static final String INPUT_FILE = "org/springframework/batch/sample/file/multirecordtype/data/multiRecordType.txt"; + private static final String INPUT_FILE = "org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt"; @Autowired private JobLauncherTestUtils jobLauncherTestUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiresource/MultiResourceFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java similarity index 89% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiresource/MultiResourceFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java index acc111b98..21c9c9712 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/multiresource/MultiResourceFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.multiresource; +package org.springframework.batch.samples.file.multiresource; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Mahmoud Ben Hassine * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/multiresource/job/multiResource.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/multiresource/job/multiResource.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class MultiResourceFunctionalTests { @@ -49,7 +49,7 @@ class MultiResourceFunctionalTests { void testLaunchJobWithXmlConfig() throws Exception { // given JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFiles", "org/springframework/batch/sample/file/multiresource/data/delimited*.csv") + .addString("inputFiles", "org/springframework/batch/samples/file/multiresource/data/delimited*.csv") .addString("outputFiles", "file:./target/test-outputs/multiResourceOutput.csv") .toJobParameters(); @@ -67,7 +67,7 @@ class MultiResourceFunctionalTests { JobLauncher jobLauncher = context.getBean(JobLauncher.class); Job job = context.getBean(Job.class); JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFiles", "org/springframework/batch/sample/file/multiresource/data/delimited*.csv") + .addString("inputFiles", "org/springframework/batch/samples/file/multiresource/data/delimited*.csv") .addString("outputFiles", "file:./target/test-outputs/multiResourceOutput.csv") .toJobParameters(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/PatternMatchingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/PatternMatchingJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java index bab835e24..b5ff7ea69 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/PatternMatchingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching; +package org.springframework.batch.samples.file.patternmatching; import java.nio.file.Files; import java.nio.file.Path; @@ -28,13 +28,13 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/patternmatching/job/multilineOrderJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/patternmatching/job/multilineOrderJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class PatternMatchingJobFunctionalTests { private static final String ACTUAL = "target/test-outputs/multilineOrderOutput.txt"; - private static final String EXPECTED = "org/springframework/batch/sample/file/patternmatching/data/multilineOrderOutput.txt"; + private static final String EXPECTED = "org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt"; @Autowired private JobLauncherTestUtils jobLauncherTestUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidatorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidatorTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidatorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidatorTests.java index feaa9cf54..58b4ab9fa 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/patternmatching/internal/validator/OrderValidatorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/internal/validator/OrderValidatorTests.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.file.patternmatching.internal.validator; +package org.springframework.batch.samples.file.patternmatching.internal.validator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.file.patternmatching.Address; -import org.springframework.batch.sample.file.patternmatching.BillingInfo; -import org.springframework.batch.sample.file.patternmatching.Customer; -import org.springframework.batch.sample.file.patternmatching.LineItem; -import org.springframework.batch.sample.file.patternmatching.Order; -import org.springframework.batch.sample.file.patternmatching.ShippingInfo; +import org.springframework.batch.samples.file.patternmatching.Address; +import org.springframework.batch.samples.file.patternmatching.BillingInfo; +import org.springframework.batch.samples.file.patternmatching.Customer; +import org.springframework.batch.samples.file.patternmatching.LineItem; +import org.springframework.batch.samples.file.patternmatching.Order; +import org.springframework.batch.samples.file.patternmatching.ShippingInfo; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.Errors; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/xml/XmlFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/file/xml/XmlFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java index e9bb77799..6b4d86806 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/file/xml/XmlFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.file.xml; +package org.springframework.batch.samples.file.xml; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Mahmoud Ben Hassine * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/file/xml/job/xml.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/xml/job/xml.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class XmlFunctionalTests { @@ -49,7 +49,7 @@ class XmlFunctionalTests { void testLaunchJobWithXmlConfig() throws Exception { // given JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/xml/data/input.xml") + .addString("inputFile", "org/springframework/batch/samples/file/xml/data/input.xml") .addString("outputFile", "file:./target/test-outputs/output.xml") .toJobParameters(); @@ -67,7 +67,7 @@ class XmlFunctionalTests { JobLauncher jobLauncher = context.getBean(JobLauncher.class); Job job = context.getBean(Job.class); JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "org/springframework/batch/sample/file/xml/data/input.xml") + .addString("inputFile", "org/springframework/batch/samples/file/xml/data/input.xml") .addString("outputFile", "file:./target/test-outputs/output.xml") .toJobParameters(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/filter/CustomerFilterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/filter/CustomerFilterJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java index 121a7da74..834b5059d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/filter/CustomerFilterJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.filter; +package org.springframework.batch.samples.filter; import java.util.Arrays; import java.util.HashMap; @@ -36,7 +36,7 @@ import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/filter/job/customerFilterJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/filter/job/customerFilterJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class CustomerFilterJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/football/FootballJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java index 628b61743..f065943c4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/FootballJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football; +package org.springframework.batch.samples.football; import javax.sql.DataSource; @@ -33,7 +33,7 @@ import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertTrue; @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", - "/org/springframework/batch/sample/football/job/footballJob.xml", "/job-runner-context.xml" }) + "/org/springframework/batch/samples/football/job/footballJob.xml", "/job-runner-context.xml" }) class FootballJobFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcGameDaoIntegrationTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcGameDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcGameDaoIntegrationTests.java index 9329a5859..260d8cf84 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcGameDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcGameDaoIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import java.sql.ResultSet; import java.sql.SQLException; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.football.Game; +import org.springframework.batch.samples.football.Game; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerDaoIntegrationTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerDaoIntegrationTests.java index f16cc7aeb..414c7aa0e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerDaoIntegrationTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import javax.sql.DataSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.football.Player; +import org.springframework.batch.samples.football.Player; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java index bb9177c74..faf9e937f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.football.internal; +package org.springframework.batch.samples.football.internal; import javax.sql.DataSource; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.football.PlayerSummary; +import org.springframework.batch.samples.football.PlayerSummary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/headerfooter/HeaderFooterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/headerfooter/HeaderFooterSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java index c2292258f..8333d3a0b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/headerfooter/HeaderFooterSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.headerfooter; +package org.springframework.batch.samples.headerfooter; import java.io.BufferedReader; import java.io.FileReader; @@ -28,7 +28,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.springframework.test.util.AssertionErrors.assertTrue; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/headerfooter/job/headerFooterSample.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/headerfooter/job/headerFooterSample.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class HeaderFooterSampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcCursorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcCursorFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java index 927c43291..baa4cccbc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcCursorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.jdbc; +package org.springframework.batch.samples.jdbc; import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.batch.sample.jdbc.cursor.JdbcCursorReaderBatchWriterSampleJob; +import org.springframework.batch.samples.jdbc.cursor.JdbcCursorReaderBatchWriterSampleJob; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Mahmoud Ben Hassine * @since 2.0 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/jdbc/job/jdbcCursor.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/jdbc/job/jdbcCursor.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class JdbcCursorFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcPagingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java similarity index 92% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcPagingFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java index 134479797..95cdbdd27 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jdbc/JdbcPagingFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.jdbc; +package org.springframework.batch.samples.jdbc; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.batch.sample.jdbc.paging.JdbcPagingReaderBatchWriterSampleJob; +import org.springframework.batch.samples.jdbc.paging.JdbcPagingReaderBatchWriterSampleJob; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @since 2.0 */ @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/job-runner-context.xml", - "/org/springframework/batch/sample/jdbc/job/jdbcPaging.xml" }) + "/org/springframework/batch/samples/jdbc/job/jdbcPaging.xml" }) class JdbcPagingFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jobstep/JobStepFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/jobstep/JobStepFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java index 5120c7de0..7d8407d89 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jobstep/JobStepFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.jobstep; +package org.springframework.batch.samples.jobstep; import javax.sql.DataSource; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Glenn Renfro */ -@SpringJUnitConfig(locations = { "classpath:/org/springframework/batch/sample/jobstep/job/jobStepSample.xml", +@SpringJUnitConfig(locations = { "classpath:/org/springframework/batch/samples/jobstep/job/jobStepSample.xml", "classpath:/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class JobStepFunctionalTests { @@ -62,7 +62,7 @@ class JobStepFunctionalTests { JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE"); JobParameters jobParameters = new JobParametersBuilder() - .addString("input.file", "org/springframework/batch/sample/jobstep/data/ImportTradeDataStep.txt") + .addString("input.file", "org/springframework/batch/samples/jobstep/data/ImportTradeDataStep.txt") .toJobParameters(); jobLauncherTestUtils.launchJob(jobParameters); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/JpaFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/JpaFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java index ce15703f0..e42e57e54 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/JpaFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/jpa/job/jpa.xml", "/job-runner-context.xml" }) +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/jpa/job/jpa.xml", "/job-runner-context.xml" }) class JpaFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/RepositoryFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/RepositoryFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java index 7c774a23d..d3d516d2e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jpa/RepositoryFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.jpa; +package org.springframework.batch.samples.jpa; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringJUnitConfig( - locations = { "/org/springframework/batch/sample/jpa/job/repository.xml", "/job-runner-context.xml" }) + locations = { "/org/springframework/batch/samples/jpa/job/repository.xml", "/job-runner-context.xml" }) class RepositoryFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/loom/VirtualThreadsSupportTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/loom/VirtualThreadsSupportTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java index 8ca41b9cd..f20794c5d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/loom/VirtualThreadsSupportTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loom; +package org.springframework.batch.samples.loom; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -33,12 +33,6 @@ import org.springframework.batch.core.partition.support.TaskExecutorPartitionHan import org.springframework.batch.core.step.builder.TaskletStepBuilder; import org.springframework.batch.core.step.tasklet.SystemCommandTasklet; import org.springframework.batch.integration.async.AsyncItemProcessor; -import org.springframework.batch.sample.loom.JobConfigurationForAsynchronousItemProcessingWithVirtualThreads; -import org.springframework.batch.sample.loom.JobConfigurationForLaunchingJobsWithVirtualThreads; -import org.springframework.batch.sample.loom.JobConfigurationForRunningConcurrentStepsWithVirtualThreads; -import org.springframework.batch.sample.loom.JobConfigurationForRunningParallelStepsWithVirtualThreads; -import org.springframework.batch.sample.loom.JobConfigurationForRunningPartitionedStepsWithVirtualThreads; -import org.springframework.batch.sample.loom.JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.task.TaskExecutor; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/loop/LoopFlowSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java similarity index 86% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/loop/LoopFlowSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java index edb738542..921dd51fb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/loop/LoopFlowSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.loop; +package org.springframework.batch.samples.loop; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.internal.ItemTrackingTradeItemWriter; +import org.springframework.batch.samples.domain.trade.internal.ItemTrackingTradeItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", - "/org/springframework/batch/sample/loop/loopFlowSample.xml", "/job-runner-context.xml" }) + "/org/springframework/batch/samples/loop/loopFlowSample.xml", "/job-runner-context.xml" }) class LoopFlowSampleFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mail/MailJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mail/MailJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java index 33a406298..7a2f3e374 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mail/MailJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.mail; +package org.springframework.batch.samples.mail; import java.util.Iterator; import java.util.List; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Glenn Renfro * @since 2.1 */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/mail/mailJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/mail/mailJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class MailJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/groovy/GroovyJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/groovy/GroovyJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java index c4b538285..1c41543bc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/groovy/GroovyJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.misc.groovy; +package org.springframework.batch.samples.misc.groovy; import java.io.File; import java.io.IOException; @@ -30,7 +30,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/misc/groovy/job/groovyJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) public class GroovyJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisherTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisherTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisherTests.java index d13f82c90..b5704eb27 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/JobExecutionNotificationPublisherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/JobExecutionNotificationPublisherTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/RemoteLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/RemoteLauncherTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java index b0f6adaca..32abadfda 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/jmx/RemoteLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.misc.jmx; +package org.springframework.batch.samples.misc.jmx; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.batch.core.launch.JobOperator; import org.springframework.batch.core.launch.support.JobRegistryBackgroundJobRunner; -import org.springframework.batch.sample.launch.JobLoader; +import org.springframework.batch.samples.launch.JobLoader; import org.springframework.jmx.MBeanServerNotFoundException; import org.springframework.jmx.access.InvalidInvocationException; import org.springframework.jmx.access.MBeanProxyFactoryBean; @@ -122,8 +122,8 @@ class RemoteLauncherTests { Thread thread = new Thread(() -> { try { JobRegistryBackgroundJobRunner.main( - "org/springframework/batch/sample/misc/jmx/adhoc-job-launcher-context.xml", - "org/springframework/batch/sample/misc/jmx/adhocLoopJob.xml"); + "org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml", + "org/springframework/batch/samples/misc/jmx/adhocLoopJob.xml"); } catch (Exception e) { logger.error(e); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetailsTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java index 449c3eaab..c9eb56edb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/misc/quartz/JobLauncherDetailsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.misc.quartz; +package org.springframework.batch.samples.misc.quartz; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/file/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/file/PartitionFileJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java index a2282b07b..6b838ccfe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/file/PartitionFileJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.partition.file; +package org.springframework.batch.samples.partition.file; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -28,8 +28,8 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/partition/file/job/partitionFileJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/partition/file/job/partitionFileJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class PartitionFileJobFunctionalTests implements ApplicationContextAware { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/jdbc/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/jdbc/PartitionJdbcJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java index 3d035a865..23f694ce5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/jdbc/PartitionJdbcJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.partition.jdbc; +package org.springframework.batch.samples.partition.jdbc; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -28,8 +28,8 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor; +import org.springframework.batch.samples.domain.trade.CustomerCredit; +import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/partition/jdbc/partitionJdbcJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/partition/jdbc/partitionJdbcJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class PartitionJdbcJobFunctionalTests implements ApplicationContextAware { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java index 0bcaff1df..da2783214 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partition.remote; +package org.springframework.batch.samples.partition.remote; import javax.sql.DataSource; @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ @SpringJUnitConfig -@PropertySource("classpath:org/springframework/batch/sample/partitioning/remote/remote-partitioning.properties") +@PropertySource("classpath:org/springframework/batch/samples/partitioning/remote/remote-partitioning.properties") public abstract class RemotePartitioningJobFunctionalTests { private static final String BROKER_DATA_DIRECTORY = "target/activemq-data"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java similarity index 78% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java index c79d33acf..7daefb59b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithMessageAggregationFunctionalTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partition.remote; +package org.springframework.batch.samples.partition.remote; -import org.springframework.batch.sample.config.JobRunnerConfiguration; -import org.springframework.batch.sample.partitioning.remote.aggregating.ManagerConfiguration; -import org.springframework.batch.sample.partitioning.remote.aggregating.WorkerConfiguration; +import org.springframework.batch.samples.config.JobRunnerConfiguration; +import org.springframework.batch.samples.partitioning.remote.aggregating.ManagerConfiguration; +import org.springframework.batch.samples.partitioning.remote.aggregating.WorkerConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java similarity index 78% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java index 818af2ed1..e926da48f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobWithRepositoryPollingFunctionalTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.partition.remote; +package org.springframework.batch.samples.partition.remote; -import org.springframework.batch.sample.config.JobRunnerConfiguration; -import org.springframework.batch.sample.partitioning.remote.polling.ManagerConfiguration; -import org.springframework.batch.sample.partitioning.remote.polling.WorkerConfiguration; +import org.springframework.batch.samples.config.JobRunnerConfiguration; +import org.springframework.batch.samples.partitioning.remote.polling.ManagerConfiguration; +import org.springframework.batch.samples.partitioning.remote.polling.WorkerConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/processindicator/ProcessIndicatorJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/processindicator/ProcessIndicatorJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java index c913c1698..dcf717f53 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/processindicator/ProcessIndicatorJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.processindicator; +package org.springframework.batch.samples.processindicator; import javax.sql.DataSource; @@ -30,7 +30,7 @@ import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/processindicator/job/parallelJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/processindicator/job/parallelJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class ProcessIndicatorJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/fail/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/fail/RestartFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java index adacc08ed..916359e3d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/fail/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.restart.fail; +package org.springframework.batch.samples.restart.fail; import javax.sql.DataSource; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author Mahmoud Ben Hassine * @author Glenn Renfro */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/restart/fail/job/failRestartSample.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/restart/fail/job/failRestartSample.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class RestartFunctionalTests { @@ -93,7 +93,7 @@ class RestartFunctionalTests { private JobExecution runJobForRestartTest() throws Exception { return jobLauncherTestUtils .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties( - "input.file=classpath:org/springframework/batch/sample/restart/fail/data/ImportTradeDataStep.txt"))); + "input.file=classpath:org/springframework/batch/samples/restart/fail/data/ImportTradeDataStep.txt"))); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/GracefulShutdownFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java index d55b34dc4..d70c04de4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.restart.stop; +package org.springframework.batch.samples.restart.stop; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * */ @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", - "/org/springframework/batch/sample/restart/stop/stopRestartSample.xml", "/job-runner-context.xml" }) + "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml", "/job-runner-context.xml" }) class GracefulShutdownFunctionalTests { /** Logger */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/JobOperatorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/JobOperatorFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java index 06af5884a..88c5b0e94 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/restart/stop/JobOperatorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.restart.stop; +package org.springframework.batch.samples.restart.stop; import java.util.List; import java.util.Map; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", - "/org/springframework/batch/sample/restart/stop/stopRestartSample.xml" }) + "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml" }) class JobOperatorFunctionalTests { private static final Log LOG = LogFactory.getLog(JobOperatorFunctionalTests.class); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleConfigurationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleConfigurationTests.java similarity index 83% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleConfigurationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleConfigurationTests.java index ac357e56b..4aace6233 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleConfigurationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleConfigurationTests.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.retry; +package org.springframework.batch.samples.retry; import org.junit.jupiter.api.Test; import org.springframework.batch.core.Job; -import org.springframework.batch.sample.config.DataSourceConfiguration; -import org.springframework.batch.sample.config.JobRunnerConfiguration; -import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; -import org.springframework.batch.sample.support.RetrySampleItemWriter; +import org.springframework.batch.samples.config.DataSourceConfiguration; +import org.springframework.batch.samples.config.JobRunnerConfiguration; +import org.springframework.batch.samples.domain.trade.internal.GeneratingTradeItemReader; +import org.springframework.batch.samples.support.RetrySampleItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java similarity index 84% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java index 8503542eb..590291648 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/retry/RetrySampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.retry; +package org.springframework.batch.samples.retry; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; -import org.springframework.batch.sample.support.RetrySampleItemWriter; +import org.springframework.batch.samples.domain.trade.internal.GeneratingTradeItemReader; +import org.springframework.batch.samples.support.RetrySampleItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ @SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", - "/org/springframework/batch/sample/retry/retrySample.xml", "/job-runner-context.xml" }) + "/org/springframework/batch/samples/retry/retrySample.xml", "/job-runner-context.xml" }) class RetrySampleFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/skip/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/skip/SkipSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java index 11c7274dc..1edfdab19 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/skip/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.skip; +package org.springframework.batch.samples.skip; import java.math.BigDecimal; import java.util.Map; import javax.sql.DataSource; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,8 +40,8 @@ import org.springframework.batch.core.launch.NoSuchJobException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException; import org.springframework.batch.core.repository.JobRestartException; -import org.springframework.batch.sample.common.SkipCheckingListener; -import org.springframework.batch.sample.domain.trade.internal.TradeWriter; +import org.springframework.batch.samples.common.SkipCheckingListener; +import org.springframework.batch.samples.domain.trade.internal.TradeWriter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; @@ -62,7 +63,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author Dan Garrette * @author Mahmoud Ben Hassine */ -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/skip/job/skipSample-job-launcher-context.xml" }) +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml" }) class SkipSampleFunctionalTests { private JdbcTemplate jdbcTemplate; @@ -265,7 +266,7 @@ class SkipSampleFunctionalTests { assertEquals(5, JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "TRADE", "VERSION=1")); // 1 record skipped in processing second step - assertEquals(1, SkipCheckingListener.getProcessSkips()); + Assertions.assertEquals(1, SkipCheckingListener.getProcessSkips()); // Both steps contained skips assertEquals(2, JdbcTestUtils.countRowsInTable(jdbcTemplate, "ERROR_LOG")); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractFieldSetMapperTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractFieldSetMapperTests.java index f4ba455b5..123c252b9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractFieldSetMapperTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.junit.jupiter.api.Test; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractRowMapperTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractRowMapperTests.java index 10e73b082..5b9ef3cbf 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/AbstractRowMapperTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/ItemTrackingItemWriterTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/support/ItemTrackingItemWriterTests.java index 198cedacb..21c484cfa 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/ItemTrackingItemWriterTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.internal.ItemTrackingTradeItemWriter; +import org.springframework.batch.samples.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.internal.ItemTrackingTradeItemWriter; import java.io.IOException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/RetrySampleItemWriterTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/support/RetrySampleItemWriterTests.java index 76e723c18..06022cec8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/support/RetrySampleItemWriterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.sample.support; +package org.springframework.batch.samples.support; import org.junit.jupiter.api.Test; import org.springframework.batch.item.Chunk; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/trade/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/trade/TradeJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java index 6c3b43485..fa2d9ce05 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/trade/TradeJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.trade; +package org.springframework.batch.samples.trade; import java.math.BigDecimal; import java.util.Arrays; @@ -28,7 +28,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.samples.domain.trade.Trade; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -37,7 +37,7 @@ import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/org/springframework/batch/sample/trade/job/tradeJob.xml", +@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/trade/job/tradeJob.xml", "/simple-job-launcher-context.xml", "/job-runner-context.xml" }) class TradeJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java index 19ae8d14f..760799c3d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.sample.validation; +package org.springframework.batch.samples.validation; import java.util.List; @@ -26,7 +26,7 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.item.support.ListItemWriter; -import org.springframework.batch.sample.validation.domain.Person; +import org.springframework.batch.samples.validation.domain.Person; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;