SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove additional deprecations

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-07-27 14:29:49 +02:00
parent ff83f3bc59
commit 6879298a5d
3 changed files with 1 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -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);
}

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
View File

@@ -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());

41
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FluxWrapperDetector.java
View File

@@ -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;
}
}