From b61b24a9b2901f42e1fb101f1cdb6a22be467cea Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 19 Oct 2020 13:20:51 +0200
Subject: [PATCH] Deprecate Flux* function interfaces

---
 .../cloud/function/context/FunctionRegistration.java           | 1 +
 .../org/springframework/cloud/function/core/FluxConsumer.java  | 3 +++
 .../org/springframework/cloud/function/core/FluxFunction.java  | 3 +++
 .../org/springframework/cloud/function/core/FluxSupplier.java  | 3 +++
 .../cloud/function/core/FluxToMonoFunction.java                | 3 +++
 .../org/springframework/cloud/function/core/FluxWrapper.java   | 3 +++
 .../springframework/cloud/function/core/FluxedConsumer.java    | 3 +++
 .../springframework/cloud/function/core/FluxedFunction.java    | 3 +++
 .../cloud/function/core/FunctionFactoryMetadata.java           | 3 +++
 .../springframework/cloud/function/core/IsolatedSupplier.java  | 2 ++
 .../org/springframework/cloud/function/core/MonoSupplier.java  | 3 +++
 .../cloud/function/core/MonoToFluxFunction.java                | 3 +++
 .../springframework/cloud/function/core/WrappedFunction.java   | 3 +++
 13 files changed, 36 insertions(+)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
index 95f189e35..e36f82380 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
@@ -171,6 +171,7 @@ public class FunctionRegistration<T> implements BeanNameAware {
 	 * @return {@code FunctionRegistration} with the appropriately wrapped target.
 	 *
 	 */
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <S> FunctionRegistration<S> wrap() {
 		this.isFunctionSignatureSupported();
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java
index cc3082abe..78e64f2e8 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java
@@ -29,7 +29,10 @@ import reactor.core.publisher.Mono;
  * @author Dave Syer
  * @author Oleg Zhurakousky
  * @see FluxedConsumer
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class FluxConsumer<I>
 		extends WrappedFunction<I, Void, Flux<I>, Mono<Void>, Consumer<I>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java
index f74bc2c9d..74933963e 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java
@@ -28,7 +28,10 @@ import reactor.core.publisher.Flux;
  * @param <O> output type of target function
  * @author Mark Fisher
  * @author Oleg Zhurakousky
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class FluxFunction<I, O>
 		extends WrappedFunction<I, O, Flux<I>, Flux<O>, Function<I, O>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java
index 7b4ca7b6e..8d28038a9 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java
@@ -31,7 +31,10 @@ import reactor.core.publisher.Flux;
  *
  * @param <T> output type of target supplier
  * @author Mark Fisher
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class FluxSupplier<T> implements Supplier<Flux<T>>, FluxWrapper<Supplier<T>> {
 
 	private final Supplier<T> supplier;
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxToMonoFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxToMonoFunction.java
index 862df9dfb..a923d1823 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxToMonoFunction.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxToMonoFunction.java
@@ -33,7 +33,10 @@ import reactor.core.publisher.Mono;
  * @param <O> type of {@link Mono} output of the target function
  * @author Oleg Zhurakousky
  * @since 2.0
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class FluxToMonoFunction<I, O>
 		extends WrappedFunction<I, O, Flux<I>, Mono<O>, Function<Flux<I>, Mono<O>>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxWrapper.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxWrapper.java
index 206fde9d5..524e19a0c 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxWrapper.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxWrapper.java
@@ -19,7 +19,10 @@ package org.springframework.cloud.function.core;
 /**
  * @param <T> target type
  * @author Dave Syer
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public interface FluxWrapper<T> {
 
 	T getTarget();
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedConsumer.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedConsumer.java
index cd3482c9c..227b9e017 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedConsumer.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedConsumer.java
@@ -31,7 +31,10 @@ import reactor.core.publisher.Mono;
  * @since 2.0.1
  * @see FluxConsumer
  *
+ * @deprecated since 3.1 no longer used by the framework
+ *
  */
+@Deprecated
 public class FluxedConsumer<I>
 		extends WrappedFunction<I, Void, Flux<I>, Mono<Void>, Consumer<Flux<I>>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedFunction.java
index dfa7b1fbb..1808c5993 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedFunction.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxedFunction.java
@@ -28,7 +28,10 @@ import reactor.core.publisher.Flux;
  * @param <O> output type of target function
  * @author Oleg Zhurakousky
  * @since 2.0.1
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class FluxedFunction<I, O>
 		extends WrappedFunction<I, O, Flux<I>, Flux<O>, Function<Flux<I>, Flux<O>>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java
index 54e628dd7..4f5f0b10d 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java
@@ -21,7 +21,10 @@ import java.lang.reflect.Method;
 /**
  * @param <F> target type
  * @author Dave Syer
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public interface FunctionFactoryMetadata<F> {
 
 	Method getFactoryMethod();
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/IsolatedSupplier.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/IsolatedSupplier.java
index dbc5ab487..7c9c8ba07 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/IsolatedSupplier.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/IsolatedSupplier.java
@@ -23,7 +23,9 @@ import org.springframework.util.ClassUtils;
 /**
  * @param <T> supplied type
  * @author Dave Syer
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class IsolatedSupplier<T> implements Supplier<T>, Isolated {
 
 	private final Supplier<T> supplier;
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoSupplier.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoSupplier.java
index 9554daabc..d1a5d9222 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoSupplier.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoSupplier.java
@@ -27,7 +27,10 @@ import reactor.core.publisher.Mono;
  * @param <T> output type of target supplier
  * @author Mark Fisher
  * @since 2.1
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class MonoSupplier<T> implements Supplier<Mono<T>>, FluxWrapper<Supplier<T>> {
 
 	private final Supplier<T> supplier;
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoToFluxFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoToFluxFunction.java
index 685a147f9..e0cf7f2c4 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoToFluxFunction.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/MonoToFluxFunction.java
@@ -28,7 +28,10 @@ import reactor.core.publisher.Mono;
  * @param <O> type of {@link Flux} output of the target function
  * @author Oleg Zhurakousky
  * @since 2.0
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public class MonoToFluxFunction<I, O>
 		extends WrappedFunction<I, O, Mono<I>, Flux<O>, Function<Mono<I>, Flux<O>>> {
 
diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/WrappedFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/WrappedFunction.java
index 83aa190ce..65b762b7d 100644
--- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/WrappedFunction.java
+++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/WrappedFunction.java
@@ -34,7 +34,10 @@ import org.reactivestreams.Publisher;
  * {@link Consumer})
  * @author Oleg Zhurakousky
  * @since 2.0.1
+ *
+ * @deprecated since 3.1 no longer used by the framework
  */
+@Deprecated
 public abstract class WrappedFunction<I, O, IP extends Publisher<I>, OP extends Publisher<O>, T>
 		implements Function<IP, OP>, FluxWrapper<T> {