From 6879298a5d93505ae1bfafc24ad14faf0a8508d5 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 27 Jul 2022 14:29:49 +0200
Subject: [PATCH] Remove additional deprecations

---
 .../catalog/SimpleFunctionRegistry.java       | 22 ----------
 .../ContextFunctionCatalogInitializer.java    |  2 +-
 .../context/config/FluxWrapperDetector.java   | 41 -------------------
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FluxWrapperDetector.java

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index 68c31c8da..ce4705296 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -540,28 +540,6 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
 			return type;
 		}
 
-		/**
-		 * Use individual {@link #getInputType()}, {@link #getOutputType()} and their variants as well as
-		 * other supporting operations instead.
-		 * @deprecated since 3.1
-		 */
-		@Deprecated
-		public Type getFunctionType() {
-			if (this.isFunction()) {
-				ResolvableType rItype = ResolvableType.forType(this.inputType);
-				ResolvableType rOtype = ResolvableType.forType(this.outputType);
-				return ResolvableType.forClassWithGenerics(Function.class, rItype, rOtype).getType();
-			}
-			else if (this.isConsumer()) {
-				ResolvableType rItype = ResolvableType.forType(this.inputType);
-				return ResolvableType.forClassWithGenerics(Consumer.class, rItype).getType();
-			}
-			else {
-				ResolvableType rOtype = ResolvableType.forType(this.outputType);
-				return ResolvableType.forClassWithGenerics(Supplier.class, rOtype).getType();
-			}
-		}
-
 		public Class<?> getRawOutputType() {
 			return this.outputType == null ? null : FunctionTypeUtils.getRawType(this.outputType);
 		}
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
index dad824228..6abdb5a4a 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
@@ -135,7 +135,7 @@ public class ContextFunctionCatalogInitializer implements ApplicationContextInit
 			ConfigurationPropertiesBindingPostProcessor.register(registry);
 
 			String preferredMapper = context.getEnvironment().getProperty(ContextFunctionCatalogAutoConfiguration.JSON_MAPPER_PROPERTY);
-					
+
 			if (ClassUtils.isPresent("com.google.gson.Gson", null) && "gson".equals(preferredMapper)) {
 				if (this.context.getBeanFactory().getBeanNamesForType(Gson.class, false, false).length == 0) {
 					this.context.registerBean(Gson.class, () -> new Gson());
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FluxWrapperDetector.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FluxWrapperDetector.java
deleted file mode 100644
index cba4fbe54..000000000
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FluxWrapperDetector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.function.context.config;
-
-import java.lang.reflect.Type;
-
-import org.reactivestreams.Publisher;
-
-import org.springframework.cloud.function.context.WrapperDetector;
-
-/**
- * @author Dave Syer
- * @deprecated as of 3.0. Not used by the framework
- */
-@Deprecated
-public class FluxWrapperDetector implements WrapperDetector {
-
-	@Override
-	public boolean isWrapper(Type type) {
-		if (type instanceof Class<?>) {
-			Class<?> cls = (Class<?>) type;
-			return Publisher.class.isAssignableFrom(cls);
-		}
-		return false;
-	}
-
-}