diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 39c20cf42..1e3611d78 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -85,9 +85,6 @@ import org.springframework.util.StringUtils; @AutoConfigureAfter(name = {"org.springframework.cloud.function.deployer.FunctionDeployerConfiguration"}) public class ContextFunctionCatalogAutoConfiguration { - @Deprecated - static final String PREFERRED_MAPPER_PROPERTY = "spring.http.converters.preferred-json-mapper"; - /** * The name of the property to specify desired JSON mapper. Available values are `jackson' and 'gson'. */ @@ -194,9 +191,7 @@ public class ContextFunctionCatalogAutoConfiguration { public static class JsonMapperConfiguration { @Bean public JsonMapper jsonMapper(ApplicationContext context) { - String preferredMapper = context.getEnvironment().containsProperty(JSON_MAPPER_PROPERTY) - ? context.getEnvironment().getProperty(JSON_MAPPER_PROPERTY) - : context.getEnvironment().getProperty(PREFERRED_MAPPER_PROPERTY); + String preferredMapper = context.getEnvironment().getProperty(JSON_MAPPER_PROPERTY); if (StringUtils.hasText(preferredMapper)) { if ("gson".equals(preferredMapper) && ClassUtils.isPresent("com.google.gson.Gson", null)) { return gson(context); 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 31832ff54..dad824228 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 @@ -134,11 +134,8 @@ public class ContextFunctionCatalogInitializer implements ApplicationContextInit } ConfigurationPropertiesBindingPostProcessor.register(registry); - String preferredMapper = context.getEnvironment().containsProperty(ContextFunctionCatalogAutoConfiguration.JSON_MAPPER_PROPERTY) - ? context.getEnvironment().getProperty(ContextFunctionCatalogAutoConfiguration.JSON_MAPPER_PROPERTY) - : context.getEnvironment().getProperty(ContextFunctionCatalogAutoConfiguration.PREFERRED_MAPPER_PROPERTY); - - + 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());