diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/BasicStringConverter.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/BasicStringConverter.java new file mode 100644 index 000000000..23f5d4beb --- /dev/null +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/BasicStringConverter.java @@ -0,0 +1,50 @@ +/* + * Copyright 2018 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 + * + * http://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.web; + +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.cloud.function.context.catalog.FunctionInspector; +import org.springframework.core.convert.ConversionService; +import org.springframework.core.convert.support.DefaultConversionService; + +public class BasicStringConverter implements StringConverter { + + private ConversionService conversionService; + private ConfigurableListableBeanFactory registry; + private FunctionInspector inspector; + + public BasicStringConverter(FunctionInspector inspector, + ConfigurableListableBeanFactory registry) { + this.inspector = inspector; + this.registry = registry; + } + + @Override + public Object convert(Object function, String value) { + if (conversionService == null && registry != null) { + ConversionService conversionService = this.registry + .getConversionService(); + this.conversionService = conversionService != null ? conversionService + : new DefaultConversionService(); + } + Class type = inspector.getInputType(function); + return conversionService.canConvert(String.class, type) + ? conversionService.convert(value, type) + : value; + } + +} \ No newline at end of file diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java index 5998d9008..5067c3e4e 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java @@ -26,13 +26,12 @@ import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.catalog.FunctionInspector; +import org.springframework.cloud.function.web.BasicStringConverter; import org.springframework.cloud.function.web.RequestProcessor; import org.springframework.cloud.function.web.StringConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.web.method.support.AsyncHandlerMethodReturnValueHandler; import reactor.core.publisher.Flux; @@ -62,32 +61,4 @@ public class ReactorAutoConfiguration { return new BasicStringConverter(inspector, beanFactory); } - - private static class BasicStringConverter implements StringConverter { - - private ConversionService conversionService; - private ConfigurableListableBeanFactory registry; - private FunctionInspector inspector; - - public BasicStringConverter(FunctionInspector inspector, - ConfigurableListableBeanFactory registry) { - this.inspector = inspector; - this.registry = registry; - } - - @Override - public Object convert(Object function, String value) { - if (conversionService == null && registry != null) { - ConversionService conversionService = this.registry - .getConversionService(); - this.conversionService = conversionService != null ? conversionService - : new DefaultConversionService(); - } - Class type = inspector.getInputType(function); - return conversionService.canConvert(String.class, type) - ? conversionService.convert(value, type) - : value; - } - - } } diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/ReactorAutoConfiguration.java index deb9018a9..4ae2fc375 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/ReactorAutoConfiguration.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/ReactorAutoConfiguration.java @@ -26,13 +26,12 @@ import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.catalog.FunctionInspector; +import org.springframework.cloud.function.web.BasicStringConverter; import org.springframework.cloud.function.web.RequestProcessor; import org.springframework.cloud.function.web.StringConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.web.method.support.AsyncHandlerMethodReturnValueHandler; import reactor.core.publisher.Flux; @@ -61,32 +60,4 @@ public class ReactorAutoConfiguration { ConfigurableListableBeanFactory beanFactory) { return new BasicStringConverter(inspector, beanFactory); } - - private static class BasicStringConverter implements StringConverter { - - private ConversionService conversionService; - private ConfigurableListableBeanFactory registry; - private FunctionInspector inspector; - - public BasicStringConverter(FunctionInspector inspector, - ConfigurableListableBeanFactory registry) { - this.inspector = inspector; - this.registry = registry; - } - - @Override - public Object convert(Object function, String value) { - if (conversionService == null && registry != null) { - ConversionService conversionService = this.registry - .getConversionService(); - this.conversionService = conversionService != null ? conversionService - : new DefaultConversionService(); - } - Class type = inspector.getInputType(function); - return conversionService.canConvert(String.class, type) - ? conversionService.convert(value, type) - : value; - } - - } }