From 6d49ae71aed1759fee30543695bae4d69657c079 Mon Sep 17 00:00:00 2001 From: Taeik Lim Date: Wed, 3 Apr 2024 02:29:03 +0900 Subject: [PATCH] Deprecate ItemStreamReaderDelegate related adapters Signed-off-by: Taeik Lim --- .../spring/batch/plus/kotlin/item/adapter/ItemDelegates.kt | 4 ++++ .../spring/batch/plus/item/adapter/AdapterFactory.java | 2 ++ .../batch/plus/item/adapter/ItemStreamReaderAdapter.java | 2 ++ .../batch/plus/item/adapter/ItemStreamReaderDelegate.java | 2 ++ .../plus/item/adapter/ItemStreamReaderProcessorWriter.java | 2 ++ .../batch/plus/item/adapter/ItemStreamReaderWriter.java | 2 ++ 6 files changed, 14 insertions(+) diff --git a/spring-batch-plus-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/item/adapter/ItemDelegates.kt b/spring-batch-plus-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/item/adapter/ItemDelegates.kt index 6f5fb6e0..fa27833c 100644 --- a/spring-batch-plus-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/item/adapter/ItemDelegates.kt +++ b/spring-batch-plus-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/item/adapter/ItemDelegates.kt @@ -57,6 +57,10 @@ fun ItemStreamSimpleReaderDelegate.asItemStreamReader(): ItemStream /** * An extensions to invoke [AdapterFactory.itemStreamReader]. */ +@Deprecated( + message = "Uses ItemStreamFluxReaderDelegate instead", + replaceWith = ReplaceWith(""), +) fun ItemStreamReaderDelegate.asItemStreamReader(): ItemStreamReader = AdapterFactory.itemStreamReader(this) 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 efef8dc1..438db156 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 @@ -90,10 +90,12 @@ public static ItemStreamReader itemStreamReader(@NonNull ItemStreamSimple * Create an adapter which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader} * with {@link StepScope} bound proxy implementation. It creates new instance for every {@link StepScope}. * + * @deprecated use {@link #itemStreamReader(ItemStreamFluxReaderDelegate)} instead. * @param delegate a delegate * @return an adapted ItemStreamReader * @param a read item type */ + @Deprecated public static ItemStreamReader itemStreamReader(@NonNull ItemStreamReaderDelegate delegate) { Objects.requireNonNull(delegate, "ItemStreamReader delegate is null"); return StepScopeItemStreamReader.of(() -> ItemStreamReaderAdapter.of(delegate)); 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 c63e4b27..9105a10b 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 @@ -31,7 +31,9 @@ * An adapter which adapt {@link ItemStreamReaderDelegate} to {@link ItemStreamReader}. * * @since 0.1.0 + * @deprecated use {@link ItemStreamFluxReaderAdapter} instead. */ +@Deprecated public class ItemStreamReaderAdapter implements ItemStreamReader { /** diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderDelegate.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderDelegate.java index 28a2c613..b4f6e8d2 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderDelegate.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderDelegate.java @@ -28,7 +28,9 @@ * A delegate for {@link ItemStreamReader}. * * @since 0.1.0 + * @deprecated use {@link ItemStreamFluxReaderDelegate} instead. */ +@Deprecated public interface ItemStreamReaderDelegate { /** diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderProcessorWriter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderProcessorWriter.java index 1b925781..ef84c646 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderProcessorWriter.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/item/adapter/ItemStreamReaderProcessorWriter.java @@ -27,7 +27,9 @@ * {@link ItemStreamReader}, {@link ItemProcessor}, {@link ItemStreamWriter} in a single class. * * @since 0.1.0 + * @deprecated use {@link ItemStreamFluxReaderProcessorWriter} instead. */ +@Deprecated public interface ItemStreamReaderProcessorWriter extends ItemStreamReaderDelegate, ItemProcessorDelegate, ItemStreamWriterDelegate { } 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 915baac3..6487df5f 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 @@ -26,6 +26,8 @@ * {@link ItemStreamReader}, {@link ItemStreamWriter} in a single class. * * @since 0.1.0 + * @deprecated use {@link ItemStreamFluxReaderWriter} instead. */ +@Deprecated public interface ItemStreamReaderWriter extends ItemStreamReaderDelegate, ItemStreamWriterDelegate { }