From 3d91285a72dc1de36f9b983f111bf95fece4463b Mon Sep 17 00:00:00 2001 From: Taeik Lim Date: Fri, 8 Mar 2024 20:43:42 +0900 Subject: [PATCH] Change adaptor word to adapter Signed-off-by: Taeik Lim --- CHANGELOG.md | 2 +- doc/en/step/item-stream-reader-processor-writer.md | 4 ++-- .../spring/batch/plus/item/adapter/AdapterFactory.java | 8 ++++---- .../batch/plus/item/adapter/ItemProcessorAdapter.java | 4 ++-- .../plus/item/adapter/ItemStreamFluxReaderAdapter.java | 4 ++-- .../item/adapter/ItemStreamIterableReaderAdapter.java | 4 ++-- .../item/adapter/ItemStreamIteratorReaderAdapter.java | 4 ++-- .../batch/plus/item/adapter/ItemStreamReaderAdapter.java | 4 ++-- .../batch/plus/item/adapter/ItemStreamReaderWriter.java | 2 +- .../plus/item/adapter/ItemStreamSimpleReaderAdapter.java | 4 ++-- .../batch/plus/item/adapter/ItemStreamWriterAdapter.java | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5150b1e..84204e0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,7 +85,7 @@ Support for [Spring Batch 5.0.0](https://github.com/spring-projects/spring-batch - Deprecate throttleLimit method - ItemStreamWriterDelegate - Change the signature of write method -- Remove deprecated adaptor classes +- Remove deprecated adapter classes #### Bug fixes & Improvements diff --git a/doc/en/step/item-stream-reader-processor-writer.md b/doc/en/step/item-stream-reader-processor-writer.md index ffec3bcd..12620a89 100644 --- a/doc/en/step/item-stream-reader-processor-writer.md +++ b/doc/en/step/item-stream-reader-processor-writer.md @@ -14,7 +14,7 @@ Spring uses a reactive library called [Reactor](https://projectreactor.io/), whi A chunk-oriented step in Spring Batch consists of `ItemReader`, `ItemProcessor`, and `ItemWriter`, which are usually defined separately and then assembled to define a step. However, there are some issues with this approach: it is difficult to share data between `ItemReader`, `ItemProcessor`, and `ItemWriter`, and you need to see each respective file to understand the batch flow. Also, if the classes are not reused, they can make the elements of a job less coherent. -To resolve such issues, `ItemStreamReaderProcessorWriter` provides an adaptor to use `Flux` and helps you define `ItemReader`, `ItemProcessor`, and `ItemWriter` in a single file. +To resolve such issues, `ItemStreamReaderProcessorWriter` provides an adapter to use `Flux` and helps you define `ItemReader`, `ItemProcessor`, and `ItemWriter` in a single file. Because Spring Batch Plus has compileOnly dependencies on Reactor, you need to manually add them to use `ItemStreamReaderProcessorWriter`. @@ -502,4 +502,4 @@ open class TestJobConfig( } } } -``` \ No newline at end of file +``` diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/AdapterFactory.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/AdapterFactory.java index 30265264..e40610e3 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/AdapterFactory.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/AdapterFactory.java @@ -27,7 +27,7 @@ import org.springframework.lang.NonNull; /** - * An adaptor factory for {@link ItemStreamReaderDelegate}, {@link ItemProcessorDelegate}, + * An adapter factory for {@link ItemStreamReaderDelegate}, {@link ItemProcessorDelegate}, * {@link ItemStreamWriterDelegate}. * * @since 0.1.0 @@ -35,7 +35,7 @@ public final class AdapterFactory { /** - * Create an adaptor which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader} + * Create an adapter which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader} * with {@link StepScope} bound proxy implementation. It creates new instance for every {@link StepScope}. * * @param delegate a delegate @@ -48,7 +48,7 @@ public static ItemStreamReader itemStreamReader(@NonNull ItemStreamReader } /** - * Create an adaptor which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. + * Create an adapter which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. * * @param delegate a delegate * @return an adapted ItemProcessor @@ -60,7 +60,7 @@ public static ItemProcessor itemProcessor(@NonNull ItemProcessorDel } /** - * Create an adaptor which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. + * Create an adapter which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. * * @param delegate a delegate * @return an adapted ItemStreamWriter diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemProcessorAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemProcessorAdapter.java index 0a05b6e5..f152603d 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemProcessorAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemProcessorAdapter.java @@ -24,14 +24,14 @@ import org.springframework.lang.NonNull; /** - * An adaptor which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. + * An adapter which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. * * @since 0.1.0 */ public class ItemProcessorAdapter implements ItemProcessor { /** - * Create an adaptor which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. + * Create an adapter which adapt {@link ItemProcessorDelegate} to {@link ItemProcessor}. * * @param delegate a delegate * @return an adapted ItemProcessor diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamFluxReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamFluxReaderAdapter.java index c8e57268..c4cb289f 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamFluxReaderAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamFluxReaderAdapter.java @@ -29,14 +29,14 @@ import reactor.core.publisher.Flux; /** - * An adaptor which adapt {@link ItemStreamFluxReaderDelegate} to {@link ItemStreamReader}. + * An adapter which adapt {@link ItemStreamFluxReaderDelegate} to {@link ItemStreamReader}. * * @since 1.1.0 */ public class ItemStreamFluxReaderAdapter implements ItemStreamReader { /** - * Create an adaptor which adapt {@link ItemStreamFluxReaderDelegate} to {@link ItemStreamReader}. + * Create an adapter which adapt {@link ItemStreamFluxReaderDelegate} to {@link ItemStreamReader}. * * @param delegate a delegate * @return an adapted ItemStreamReader diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIterableReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIterableReaderAdapter.java index a74e38ba..2eb6e6d3 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIterableReaderAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIterableReaderAdapter.java @@ -27,14 +27,14 @@ import org.springframework.lang.NonNull; /** - * An adaptor which adapt {@link ItemStreamIterableReaderDelegate} to {@link ItemStreamReader}. + * An adapter which adapt {@link ItemStreamIterableReaderDelegate} to {@link ItemStreamReader}. * * @since 1.1.0 */ public class ItemStreamIterableReaderAdapter implements ItemStreamReader { /** - * Create an adaptor which adapt {@link ItemStreamIterableReaderDelegate} to {@link ItemStreamReader}. + * Create an adapter which adapt {@link ItemStreamIterableReaderDelegate} to {@link ItemStreamReader}. * * @param delegate a delegate * @return an adapted ItemStreamReader diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIteratorReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIteratorReaderAdapter.java index 91c2413a..ead2e104 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIteratorReaderAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamIteratorReaderAdapter.java @@ -26,14 +26,14 @@ import org.springframework.lang.NonNull; /** - * An adaptor which adapt {@link ItemStreamIteratorReaderDelegate} to {@link ItemStreamReader}. + * An adapter which adapt {@link ItemStreamIteratorReaderDelegate} to {@link ItemStreamReader}. * * @since 1.1.0 */ public class ItemStreamIteratorReaderAdapter implements ItemStreamReader { /** - * Create an adaptor which adapt {@link ItemStreamIteratorReaderDelegate} to {@link ItemStreamReader}. + * Create an adapter which adapt {@link ItemStreamIteratorReaderDelegate} to {@link ItemStreamReader}. * * @param delegate a delegate * @return an adapted ItemStreamReader diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderAdapter.java index f458e3d5..c63e4b27 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderAdapter.java @@ -28,14 +28,14 @@ import reactor.core.publisher.Flux; /** - * An adaptor which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader}. + * An adapter which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader}. * * @since 0.1.0 */ public class ItemStreamReaderAdapter implements ItemStreamReader { /** - * Create an adaptor which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader}. + * Create an adapter which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader}. * * @param delegate a delegate * @return an adapted ItemStreamReader diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderWriter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderWriter.java index 76e4e807..915baac3 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderWriter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderWriter.java @@ -22,7 +22,7 @@ import org.springframework.batch.item.ItemStreamWriter; /** - * A simple adaptor for stream reader, writer. It can represent + * A simple adapter for stream reader, writer. It can represent * {@link ItemStreamReader}, {@link ItemStreamWriter} in a single class. * * @since 0.1.0 diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamSimpleReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamSimpleReaderAdapter.java index 9cfd0d53..0957a71f 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamSimpleReaderAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamSimpleReaderAdapter.java @@ -25,14 +25,14 @@ import org.springframework.lang.NonNull; /** - * An adaptor which adapt {@link ItemStreamSimpleReaderDelegate} to {@link ItemStreamReader}. + * An adapter which adapt {@link ItemStreamSimpleReaderDelegate} to {@link ItemStreamReader}. * * @since 1.1.0 */ public class ItemStreamSimpleReaderAdapter implements ItemStreamReader { /** - * Create an adaptor which adapt {@link ItemStreamSimpleReaderDelegate} to {@link ItemStreamReader}. + * Create an adapter which adapt {@link ItemStreamSimpleReaderDelegate} to {@link ItemStreamReader}. * * @param delegate a delegate * @return an adapted ItemStreamReader diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamWriterAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamWriterAdapter.java index a087f8cc..1b09f246 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamWriterAdapter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamWriterAdapter.java @@ -26,14 +26,14 @@ import org.springframework.lang.NonNull; /** - * An adaptor which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. + * An adapter which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. * * @since 0.1.0 */ public class ItemStreamWriterAdapter implements ItemStreamWriter { /** - * Create an adaptor which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. + * Create an adapter which adapt {@link ItemStreamWriterDelegate} to {@link ItemStreamWriter}. * * @param delegate a delegate * @return an adapted ItemStreamWriter