From f95c10337cac069cb4fa44b0e98a90b22a23d437 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 8 Sep 2021 17:29:33 +0200
Subject: [PATCH] Split RSocket configuration from RSocketStrategiesCustomizer

---
 .../rsocket/RSocketAutoConfiguration.java     | 20 +-------
 .../RSocketCustomizerConfiguration.java       | 51 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  1 +
 3 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketCustomizerConfiguration.java

diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
index cbca5b4b5..e7cc2b28a 100644
--- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
@@ -21,7 +21,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.rsocket.RSocketMessageHandlerCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.rsocket.messaging.RSocketStrategiesCustomizer;
 import org.springframework.cloud.function.context.FunctionCatalog;
 import org.springframework.cloud.function.context.FunctionProperties;
 import org.springframework.cloud.function.json.JsonMapper;
@@ -29,7 +28,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.messaging.rsocket.RSocketStrategies;
-import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
 
 /**
  * Main configuration class for components required to support RSocket integration with
@@ -41,26 +39,10 @@ import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
  * @since 3.1
  */
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties({ FunctionProperties.class, RSocketFunctionProperties.class })
+@EnableConfigurationProperties(FunctionProperties.class)
 @ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true)
 class RSocketAutoConfiguration {
 
-	@Bean
-	RSocketStrategiesCustomizer rSocketStrategiesCustomizer(JsonMapper jsonMapper) {
-		return new RSocketStrategiesCustomizer() {
-			@Override
-			public void customize(Builder strategies) {
-				strategies
-				.encoders(encoders -> {
-					encoders.add(0, new MessageAwareJsonEncoder(jsonMapper, true));
-				})
-				.decoders(decoders -> {
-					decoders.add(0, new MessageAwareJsonDecoder(jsonMapper));
-				});
-			}
-		};
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	@Primary
diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketCustomizerConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketCustomizerConfiguration.java
new file mode 100644
index 000000000..82628e186
--- /dev/null
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketCustomizerConfiguration.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021-2021 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.rsocket;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.rsocket.messaging.RSocketStrategiesCustomizer;
+import org.springframework.cloud.function.context.FunctionProperties;
+import org.springframework.cloud.function.json.JsonMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
+
+/**
+ * @author Oleg Zhurakousky
+ *
+ * @since 3.2
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties({ FunctionProperties.class, RSocketFunctionProperties.class })
+public class RSocketCustomizerConfiguration {
+
+	@Bean
+	RSocketStrategiesCustomizer rSocketStrategiesCustomizer(JsonMapper jsonMapper) {
+		return new RSocketStrategiesCustomizer() {
+			@Override
+			public void customize(Builder strategies) {
+				strategies
+				.encoders(encoders -> {
+					encoders.add(0, new MessageAwareJsonEncoder(jsonMapper, true));
+				})
+				.decoders(decoders -> {
+					decoders.add(0, new MessageAwareJsonDecoder(jsonMapper));
+				});
+			}
+		};
+	}
+}
diff --git a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
index 1bbff0f99..3a566621f 100644
--- a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.function.rsocket.RSocketAutoConfiguration,\
+org.springframework.cloud.function.rsocket.RSocketCustomizerConfiguration,\
 org.springframework.cloud.function.rsocket.RSocketRoutingAutoConfiguration