From 46d2ac9837c75732b5b5d7c1755a403659ea167b Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:06:25 +0100 Subject: [PATCH 1/9] [JAVA-958] Standardize packages in spring-batch module --- spring-batch/repository.sqlite | Bin 49152 -> 73728 bytes .../java/{org => com}/baeldung/batch/App.java | 2 +- .../baeldung/batch/SpringBatchConfig.java | 16 ++++++++-------- .../batch/SpringBatchRetryConfig.java | 8 ++++---- .../baeldung/batch/SpringConfig.java | 2 +- .../baeldung/batch/model/Transaction.java | 4 ++-- .../CustomMultiResourcePartitioner.java | 2 +- .../SpringbatchPartitionConfig.java | 6 +++--- .../SpringbatchPartitionerApp.java | 2 +- .../batch/service/CustomItemProcessor.java | 4 ++-- .../batch/service/CustomSkipPolicy.java | 2 +- .../service/MissingUsernameException.java | 2 +- .../service/NegativeAmountException.java | 2 +- .../batch/service/RecordFieldSetMapper.java | 4 ++-- .../batch/service/RetryItemProcessor.java | 4 ++-- .../batch/service/SkippingItemProcessor.java | 4 ++-- .../service/adapter/LocalDateTimeAdapter.java | 2 +- .../batchscheduler/SpringBatchScheduler.java | 4 ++-- .../baeldung/batchscheduler/model/Book.java | 2 +- .../batchtesting/SpringBatchApplication.java | 2 +- .../SpringBatchConfiguration.java | 14 +++++++------- .../baeldung/batchtesting/model/Book.java | 2 +- .../batchtesting/model/BookDetails.java | 2 +- .../batchtesting/model/BookRecord.java | 2 +- .../service/BookDetailsItemProcessor.java | 6 +++--- .../service/BookItemProcessor.java | 6 +++--- .../service/BookRecordFieldSetMapper.java | 4 ++-- .../chunks/LineProcessor.java | 4 ++-- .../taskletsvschunks/chunks/LineReader.java | 6 +++--- .../taskletsvschunks/chunks/LinesWriter.java | 6 +++--- .../taskletsvschunks/config/ChunksConfig.java | 10 +++++----- .../config/TaskletsConfig.java | 8 ++++---- .../baeldung/taskletsvschunks/model/Line.java | 2 +- .../tasklets/LinesProcessor.java | 4 ++-- .../tasklets/LinesReader.java | 6 +++--- .../tasklets/LinesWriter.java | 6 +++--- .../taskletsvschunks/utils/FileUtils.java | 4 ++-- spring-batch/src/main/resources/logback.xml | 6 +++--- .../src/main/resources/spring-batch-intro.xml | 6 +++--- .../baeldung/SpringContextTest.java | 4 ++-- .../SpringBatchRetryIntegrationTest.java | 3 ++- .../SpringBatchSchedulerIntegrationTest.java | 3 ++- .../SpringBatchIntegrationTest.java | 3 ++- .../SpringBatchStepScopeIntegrationTest.java | 7 ++++--- .../chunks/ChunksIntegrationTest.java | 4 ++-- .../tasklets/TaskletsIntegrationTest.java | 4 ++-- spring-batch/xml/retryOutput.xml | 2 +- 47 files changed, 106 insertions(+), 102 deletions(-) rename spring-batch/src/main/java/{org => com}/baeldung/batch/App.java (98%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/SpringBatchConfig.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/SpringBatchRetryConfig.java (95%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/SpringConfig.java (99%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/model/Transaction.java (94%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java (98%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/partitioner/SpringbatchPartitionConfig.java (98%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/partitioner/SpringbatchPartitionerApp.java (96%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/CustomItemProcessor.java (77%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/CustomSkipPolicy.java (96%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/MissingUsernameException.java (65%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/NegativeAmountException.java (87%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/RecordFieldSetMapper.java (93%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/RetryItemProcessor.java (95%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/SkippingItemProcessor.java (88%) rename spring-batch/src/main/java/{org => com}/baeldung/batch/service/adapter/LocalDateTimeAdapter.java (93%) rename spring-batch/src/main/java/{org => com}/baeldung/batchscheduler/SpringBatchScheduler.java (98%) rename spring-batch/src/main/java/{org => com}/baeldung/batchscheduler/model/Book.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/SpringBatchApplication.java (97%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/SpringBatchConfiguration.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/model/Book.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/model/BookDetails.java (96%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/model/BookRecord.java (96%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/service/BookDetailsItemProcessor.java (83%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/service/BookItemProcessor.java (79%) rename spring-batch/src/main/java/{org => com}/baeldung/batchtesting/service/BookRecordFieldSetMapper.java (89%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/chunks/LineProcessor.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/chunks/LineReader.java (87%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/chunks/LinesWriter.java (87%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/config/ChunksConfig.java (91%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/config/TaskletsConfig.java (92%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/model/Line.java (96%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/tasklets/LinesProcessor.java (94%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/tasklets/LinesReader.java (91%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/tasklets/LinesWriter.java (91%) rename spring-batch/src/main/java/{org => com}/baeldung/taskletsvschunks/utils/FileUtils.java (96%) rename spring-batch/src/test/java/{org => com}/baeldung/SpringContextTest.java (73%) rename spring-batch/src/test/java/{org => com}/baeldung/batch/SpringBatchRetryIntegrationTest.java (98%) rename spring-batch/src/test/java/{org => com}/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java (96%) rename spring-batch/src/test/java/{org => com}/baeldung/batchtesting/SpringBatchIntegrationTest.java (98%) rename spring-batch/src/test/java/{org => com}/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java (95%) rename spring-batch/src/test/java/{org => com}/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java (89%) rename spring-batch/src/test/java/{org => com}/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java (89%) diff --git a/spring-batch/repository.sqlite b/spring-batch/repository.sqlite index 4456ef63cc28948e07a545a72ec1b63366e9057b..2b549352ec8073708bd085fd414ed93d189c7511 100644 GIT binary patch literal 73728 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ĤRn?9`ddaq2=C}@EY@dj8EjZUg z#15SS@u>=~=>S*zvsWlRuDKRAs=Jfq7dU<%27cGBEyB2u8ou9U&!5rfFW$`*c8fWx z_IJK8^Y@tke`bc8nF;^b>!reSG`_0>@LGQ$YrTkZ!?J;}4H*Vs<(mFFq$2B{E`u{;We3W(`_5W;E z;-+e9M_!q^r#JDjVv|0y)YEHBGO0Co?gM4g$tUl8M#?CY!U7wY=?2_ zxHcWvruQ~<^d}iFj!eonR=k1we}jmW!Ufj<|J+*t{|7Go2iNEkzajx7fCP}h6HMTp zU? zZ3}iiunY<&05`uyNgMef|FvJk-UkAps+GLQ`M>>tD?7g6 delta 609 zcmZoTz|zpbJV9DepMima2Z&)ndZLaoqyEMOJ!VFZ$%d@ro0l=)U}EG1GKD8^VBz1q zkS&>$jgkKh1OJ)Lf)ft$+Zi#kGH|H-rezitmpCPsBxiW#C#9GerdTAWSX!hR7$g}P zn50@-7#LVuTBIhYS(q4^r*Z*pW8^=_z<&;C#u0uuLl$*kPLfRE1)9LdpUc4ij{iFU zZvMsmZTz{L1p^}aS;g6yO*toDU>9MPW@WYovnDsNu&|1;FdK7De#k7$D#grf4PuEK zi!w1AaymJNID5o<`8&mX`UQtL`Z>D_Ffywn2?x6df~;fYKhD5^9O&S^{PyOIJPeGS ztgNi^^1Q4JOpK}fZ}0dCB6muF$BNGEyJKqTgz7s&neNf2*bsSI!{b1n#0dZphyAT^A3xgm-buGe5 Ts1!HCD4;X=|G { diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java similarity index 96% rename from spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java rename to spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java index a156a65b6e..25401de022 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java @@ -1,4 +1,4 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; import org.springframework.batch.core.step.skip.SkipLimitExceededException; import org.springframework.batch.core.step.skip.SkipPolicy; diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java b/spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java similarity index 65% rename from spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java rename to spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java index 2cf8f4d334..b12daa17cc 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java @@ -1,4 +1,4 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; public class MissingUsernameException extends RuntimeException { } diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java b/spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java similarity index 87% rename from spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java rename to spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java index c9c05be671..ee46574f87 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java @@ -1,4 +1,4 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; public class NegativeAmountException extends RuntimeException { diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java similarity index 93% rename from spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java rename to spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java index e61c54193a..09478e9a30 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java @@ -1,6 +1,6 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; -import org.baeldung.batch.model.Transaction; +import com.baeldung.batch.model.Transaction; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; import org.springframework.validation.BindException; diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java similarity index 95% rename from spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java rename to spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java index d4e82452a7..c380e2c0ab 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java @@ -1,10 +1,10 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.baeldung.batch.model.Transaction; +import com.baeldung.batch.model.Transaction; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.slf4j.Logger; diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java similarity index 88% rename from spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java rename to spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java index 307a8213e2..ee37eb6c1b 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java @@ -1,6 +1,6 @@ -package org.baeldung.batch.service; +package com.baeldung.batch.service; -import org.baeldung.batch.model.Transaction; +import com.baeldung.batch.model.Transaction; import org.springframework.batch.item.ItemProcessor; public class SkippingItemProcessor implements ItemProcessor { diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java similarity index 93% rename from spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java rename to spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java index 45c35b87f1..561a7335b3 100644 --- a/spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java +++ b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java @@ -1,4 +1,4 @@ -package org.baeldung.batch.service.adapter; +package com.baeldung.batch.service.adapter; import javax.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; diff --git a/spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java b/spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java similarity index 98% rename from spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java rename to spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java index 1beeb6b2bf..4de3e0a4b6 100644 --- a/spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java +++ b/spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java @@ -1,4 +1,4 @@ -package org.baeldung.batchscheduler; +package com.baeldung.batchscheduler; import java.util.Date; import java.util.IdentityHashMap; @@ -7,7 +7,7 @@ import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.baeldung.batchscheduler.model.Book; +import com.baeldung.batchscheduler.model.Book; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.Job; diff --git a/spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java b/spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java similarity index 92% rename from spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java rename to spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java index f992bde20e..8ee986c729 100644 --- a/spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java +++ b/spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java @@ -1,4 +1,4 @@ -package org.baeldung.batchscheduler.model; +package com.baeldung.batchscheduler.model; public class Book { private int id; diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java similarity index 97% rename from spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java index 39bfdfbee7..04185fb1ca 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.batchtesting; +package com.baeldung.batchtesting; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParametersBuilder; diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java similarity index 92% rename from spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java index 2d891ad7da..664db3fbba 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java @@ -1,13 +1,13 @@ -package org.baeldung.batchtesting; +package com.baeldung.batchtesting; import java.io.IOException; -import org.baeldung.batchtesting.model.Book; -import org.baeldung.batchtesting.model.BookDetails; -import org.baeldung.batchtesting.model.BookRecord; -import org.baeldung.batchtesting.service.BookDetailsItemProcessor; -import org.baeldung.batchtesting.service.BookItemProcessor; -import org.baeldung.batchtesting.service.BookRecordFieldSetMapper; +import com.baeldung.batchtesting.model.Book; +import com.baeldung.batchtesting.model.BookDetails; +import com.baeldung.batchtesting.model.BookRecord; +import com.baeldung.batchtesting.service.BookDetailsItemProcessor; +import com.baeldung.batchtesting.service.BookItemProcessor; +import com.baeldung.batchtesting.service.BookRecordFieldSetMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.Job; diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java similarity index 92% rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java index 3ea4a29e7f..f34e6cb5f6 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java @@ -1,4 +1,4 @@ -package org.baeldung.batchtesting.model; +package com.baeldung.batchtesting.model; public class Book { diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java similarity index 96% rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java index d9284fbc66..3e994d2c92 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java @@ -1,4 +1,4 @@ -package org.baeldung.batchtesting.model; +package com.baeldung.batchtesting.model; public class BookDetails { diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java similarity index 96% rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java index 35fb40e878..d6a1692577 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java @@ -1,4 +1,4 @@ -package org.baeldung.batchtesting.model; +package com.baeldung.batchtesting.model; public class BookRecord { diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java similarity index 83% rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java index f3800fee51..514a383108 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java @@ -1,7 +1,7 @@ -package org.baeldung.batchtesting.service; +package com.baeldung.batchtesting.service; -import org.baeldung.batchtesting.model.BookDetails; -import org.baeldung.batchtesting.model.BookRecord; +import com.baeldung.batchtesting.model.BookDetails; +import com.baeldung.batchtesting.model.BookRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.item.ItemProcessor; diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java similarity index 79% rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java index 69e72ba1d3..84e850fe71 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java @@ -1,7 +1,7 @@ -package org.baeldung.batchtesting.service; +package com.baeldung.batchtesting.service; -import org.baeldung.batchtesting.model.Book; -import org.baeldung.batchtesting.model.BookRecord; +import com.baeldung.batchtesting.model.Book; +import com.baeldung.batchtesting.model.BookRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.item.ItemProcessor; diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java similarity index 89% rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java index cfc36fed7a..d9e8ee1158 100644 --- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java +++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java @@ -1,6 +1,6 @@ -package org.baeldung.batchtesting.service; +package com.baeldung.batchtesting.service; -import org.baeldung.batchtesting.model.BookRecord; +import com.baeldung.batchtesting.model.BookRecord; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.FieldSet; import org.springframework.validation.BindException; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java similarity index 92% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java index 5b6cd9add3..87d0bdc3fb 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java @@ -1,6 +1,6 @@ -package org.baeldung.taskletsvschunks.chunks; +package com.baeldung.taskletsvschunks.chunks; -import org.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.model.Line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java similarity index 87% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java index 5f6b6de218..6ffa730c19 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java @@ -1,7 +1,7 @@ -package org.baeldung.taskletsvschunks.chunks; +package com.baeldung.taskletsvschunks.chunks; -import org.baeldung.taskletsvschunks.model.Line; -import org.baeldung.taskletsvschunks.utils.FileUtils; +import com.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.utils.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java similarity index 87% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java index 66f9103a56..9f292b24b9 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java @@ -1,7 +1,7 @@ -package org.baeldung.taskletsvschunks.chunks; +package com.baeldung.taskletsvschunks.chunks; -import org.baeldung.taskletsvschunks.model.Line; -import org.baeldung.taskletsvschunks.utils.FileUtils; +import com.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.utils.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java similarity index 91% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java index 601ffb7f27..57288fb312 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java @@ -1,9 +1,9 @@ -package org.baeldung.taskletsvschunks.config; +package com.baeldung.taskletsvschunks.config; -import org.baeldung.taskletsvschunks.chunks.LineProcessor; -import org.baeldung.taskletsvschunks.chunks.LineReader; -import org.baeldung.taskletsvschunks.chunks.LinesWriter; -import org.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.chunks.LineProcessor; +import com.baeldung.taskletsvschunks.chunks.LineReader; +import com.baeldung.taskletsvschunks.chunks.LinesWriter; +import com.baeldung.taskletsvschunks.model.Line; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java similarity index 92% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java index b9d06d2639..e7157ac520 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java @@ -1,8 +1,8 @@ -package org.baeldung.taskletsvschunks.config; +package com.baeldung.taskletsvschunks.config; -import org.baeldung.taskletsvschunks.tasklets.LinesProcessor; -import org.baeldung.taskletsvschunks.tasklets.LinesReader; -import org.baeldung.taskletsvschunks.tasklets.LinesWriter; +import com.baeldung.taskletsvschunks.tasklets.LinesProcessor; +import com.baeldung.taskletsvschunks.tasklets.LinesReader; +import com.baeldung.taskletsvschunks.tasklets.LinesWriter; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java similarity index 96% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java index fee6fd31a6..2d7d3ff63f 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java @@ -1,4 +1,4 @@ -package org.baeldung.taskletsvschunks.model; +package com.baeldung.taskletsvschunks.model; import java.io.Serializable; import java.time.LocalDate; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java similarity index 94% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java index ba7a3088d5..8b84c39174 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java @@ -1,6 +1,6 @@ -package org.baeldung.taskletsvschunks.tasklets; +package com.baeldung.taskletsvschunks.tasklets; -import org.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.model.Line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java similarity index 91% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java index 9905ee8f8a..b1f58be4a4 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java @@ -1,7 +1,7 @@ -package org.baeldung.taskletsvschunks.tasklets; +package com.baeldung.taskletsvschunks.tasklets; -import org.baeldung.taskletsvschunks.model.Line; -import org.baeldung.taskletsvschunks.utils.FileUtils; +import com.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.utils.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java similarity index 91% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java index 937288a890..76128b7841 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java @@ -1,7 +1,7 @@ -package org.baeldung.taskletsvschunks.tasklets; +package com.baeldung.taskletsvschunks.tasklets; -import org.baeldung.taskletsvschunks.model.Line; -import org.baeldung.taskletsvschunks.utils.FileUtils; +import com.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.utils.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.ExitStatus; diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java similarity index 96% rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java index df36d5c756..fde3b1fa9d 100644 --- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java +++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java @@ -1,8 +1,8 @@ -package org.baeldung.taskletsvschunks.utils; +package com.baeldung.taskletsvschunks.utils; import com.opencsv.CSVReader; import com.opencsv.CSVWriter; -import org.baeldung.taskletsvschunks.model.Line; +import com.baeldung.taskletsvschunks.model.Line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-batch/src/main/resources/logback.xml b/spring-batch/src/main/resources/logback.xml index 9a622ceb65..55bbeba870 100644 --- a/spring-batch/src/main/resources/logback.xml +++ b/spring-batch/src/main/resources/logback.xml @@ -8,15 +8,15 @@ - + - + - + diff --git a/spring-batch/src/main/resources/spring-batch-intro.xml b/spring-batch/src/main/resources/spring-batch-intro.xml index 908b8aa2e1..2a7c1e7c4a 100644 --- a/spring-batch/src/main/resources/spring-batch-intro.xml +++ b/spring-batch/src/main/resources/spring-batch-intro.xml @@ -22,14 +22,14 @@ + class="com.baeldung.batch.service.RecordFieldSetMapper" /> - + @@ -40,7 +40,7 @@ - org.baeldung.batch.model.Transaction + com.baeldung.batch.model.Transaction diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java b/spring-batch/src/test/java/com/baeldung/SpringContextTest.java similarity index 73% rename from spring-batch/src/test/java/org/baeldung/SpringContextTest.java rename to spring-batch/src/test/java/com/baeldung/SpringContextTest.java index 1a4f923a1e..b82bb35daf 100644 --- a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-batch/src/test/java/com/baeldung/SpringContextTest.java @@ -1,6 +1,6 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.batch.App; +import com.baeldung.batch.App; import org.junit.Test; public class SpringContextTest { diff --git a/spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java similarity index 98% rename from spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java index 293c97ac5d..df9154a765 100644 --- a/spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java @@ -1,5 +1,6 @@ -package org.baeldung.batch; +package com.baeldung.batch; +import com.baeldung.batch.SpringBatchRetryConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.entity.StringEntity; diff --git a/spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java similarity index 96% rename from spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java index 8927421ac5..81877fbc39 100644 --- a/spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java @@ -1,5 +1,6 @@ -package org.baeldung.batchscheduler; +package com.baeldung.batchscheduler; +import com.baeldung.batchscheduler.SpringBatchScheduler; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java similarity index 98% rename from spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java index d66da89ba4..333c69684e 100644 --- a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java @@ -1,10 +1,11 @@ -package org.baeldung.batchtesting; +package com.baeldung.batchtesting; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import java.util.Collection; +import com.baeldung.batchtesting.SpringBatchConfiguration; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java similarity index 95% rename from spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java index f7b888f0f9..4655117b85 100644 --- a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java @@ -1,12 +1,13 @@ -package org.baeldung.batchtesting; +package com.baeldung.batchtesting; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import java.util.Arrays; -import org.baeldung.batchtesting.model.Book; -import org.baeldung.batchtesting.model.BookRecord; +import com.baeldung.batchtesting.SpringBatchConfiguration; +import com.baeldung.batchtesting.model.Book; +import com.baeldung.batchtesting.model.BookRecord; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java similarity index 89% rename from spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java index eaf73e4a4a..1132e4d5e2 100644 --- a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.taskletsvschunks.chunks; +package com.baeldung.taskletsvschunks.chunks; -import org.baeldung.taskletsvschunks.config.ChunksConfig; +import com.baeldung.taskletsvschunks.config.ChunksConfig; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java similarity index 89% rename from spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java rename to spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java index 322b17bd55..2e1ad031aa 100644 --- a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java +++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.taskletsvschunks.tasklets; +package com.baeldung.taskletsvschunks.tasklets; -import org.baeldung.taskletsvschunks.config.TaskletsConfig; +import com.baeldung.taskletsvschunks.config.TaskletsConfig; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-batch/xml/retryOutput.xml b/spring-batch/xml/retryOutput.xml index d30f2c4a32..c5dec44f16 100644 --- a/spring-batch/xml/retryOutput.xml +++ b/spring-batch/xml/retryOutput.xml @@ -1 +1 @@ -1010000.04302222015-10-31 00:00:001234sammy1012321.04302222015-12-03 00:00:009999john \ No newline at end of file + \ No newline at end of file From 8ecb1072a6b2fd34eabd0c4ebf5c6647f20dbccf Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:09:11 +0100 Subject: [PATCH 2/9] [JAVA-958] Standardize packages in spring-5 module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5/src/test/java/org/baeldung/SpringContextTest.java b/spring-5/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5/src/test/java/com/baeldung/SpringContextTest.java index 56e8697f5c..e3f67def90 100644 --- a/spring-5/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 18c557679c3beb832dbde30a8c51f5f6823cf6fa Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:16:56 +0100 Subject: [PATCH 3/9] [JAVA-958] Standardize packages in spring-5-data-reactive module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5-data-reactive/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java index c3ea1d8435..bedb30fcaa 100644 --- a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 6bc9e485303dea3edb9e79678222aa74887e7ca5 Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:18:56 +0100 Subject: [PATCH 4/9] [JAVA-958] Standardize packages in spring-5-reactive module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5-reactive/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java index c3ea1d8435..bedb30fcaa 100644 --- a/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 580aa4d8b0c154640fb82fd3684a4d4308d200c5 Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:21:22 +0100 Subject: [PATCH 5/9] [JAVA-958] Standardize packages in spring-5-reactive-client module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5-reactive-client/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java index 678d04897b..c0ca9b7e64 100644 --- a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From d38818530532360821b3fa40461bffc3a5058ac1 Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:23:39 +0100 Subject: [PATCH 6/9] [JAVA-958] Standardize packages in spring-5-reactive-security module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5-reactive-security/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java index 479c35d986..b4f4118527 100644 --- a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 76ee18f79959027dcba517a9ec8d22a4ac228968 Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:26:22 +0100 Subject: [PATCH 7/9] [JAVA-958] Standardize packages in spring-5-security module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-5-security/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-security/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-5-security/src/test/java/org/baeldung/SpringContextTest.java rename to spring-5-security/src/test/java/com/baeldung/SpringContextTest.java index 729790bd14..7812a5c063 100644 --- a/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-5-security/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From e30cd5677ecd5e13cf55d07fd74b871c6c78fe2f Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:29:03 +0100 Subject: [PATCH 8/9] [JAVA-958] Standardize packages in spring-apache-camel module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-apache-camel/src/test/java/{org => com}/baeldung/SpringContextTest.java (89%) diff --git a/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java b/spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java similarity index 89% rename from spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java rename to spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java index 1c098a56ab..14e7de2095 100644 --- a/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; From 66c4fe3216b807a0bc137e0cf78046fb596b6b0b Mon Sep 17 00:00:00 2001 From: dupirefr Date: Fri, 20 Mar 2020 08:39:48 +0100 Subject: [PATCH 9/9] [JAVA-958] Standardize packages in spring-bom module --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-bom/src/test/java/{org => com}/baeldung/SpringContextTest.java (90%) diff --git a/spring-bom/src/test/java/org/baeldung/SpringContextTest.java b/spring-bom/src/test/java/com/baeldung/SpringContextTest.java similarity index 90% rename from spring-bom/src/test/java/org/baeldung/SpringContextTest.java rename to spring-bom/src/test/java/com/baeldung/SpringContextTest.java index 783567cdfa..0c7da10dd6 100644 --- a/spring-bom/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-bom/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test;