Polish "Add support for customizing RSocketMessageHandler"

See gh-21081

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessageHandlerCustomizer.java

@@ -1,18 +1,37 @@
+/*
+ * Copyright 2012-2020 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.boot.autoconfigure.rsocket;
 
-import org.apache.catalina.connector.Connector;
-import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
-import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
-import org.springframework.util.RouteMatcher;
 
 /**
+ * Callback interface that can be used to customize a {@link RSocketMessageHandler}.
+ *
  * @author Aarti Gupta
- * Callback interface that can be used to customize a RSocketMessageHandler {@link Connector}.
+ * @author Madhura Bhave
+ * @since 2.3.0
  */
 @FunctionalInterface
 public interface RSocketMessageHandlerCustomizer {
 
-	RSocketMessageHandler setRouteMatcher(RouteMatcher handler);
+	/**
+	 * Customize the {@link RSocketMessageHandler}.
+	 * @param messageHandler the message handler to customize
+	 */
+	void customize(RSocketMessageHandler messageHandler);
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket;
 import io.rsocket.RSocketFactory;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 
-import java.util.Objects;
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -31,7 +29,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.rsocket.RSocketRequester;
 import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
-import org.springframework.util.RouteMatcher;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring RSocket support in Spring
@@ -41,20 +38,18 @@ import org.springframework.util.RouteMatcher;
  * @since 2.2.0
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass({RSocketRequester.class, RSocketFactory.class, TcpServerTransport.class})
+@ConditionalOnClass({ RSocketRequester.class, RSocketFactory.class, TcpServerTransport.class })
 @AutoConfigureAfter(RSocketStrategiesAutoConfiguration.class)
 public class RSocketMessagingAutoConfiguration {
 
-
 	@Bean
 	@ConditionalOnMissingBean
-	public RSocketMessageHandler messageHandler(RSocketStrategies rSocketStrategies, ObjectProvider<RSocketMessageHandlerCustomizer> customizers) {
+	public RSocketMessageHandler messageHandler(RSocketStrategies rSocketStrategies,
+			ObjectProvider<RSocketMessageHandlerCustomizer> customizers) {
 		RSocketMessageHandler messageHandler = new RSocketMessageHandler();
 		messageHandler.setRSocketStrategies(rSocketStrategies);
-		RSocketMessageHandlerCustomizer rSocketMessageHandlerCustomizer = customizers.getIfAvailable();
+		customizers.orderedStream().forEach((customizer) -> customizer.customize(messageHandler));
-		return rSocketMessageHandlerCustomizer.setRouteMatcher(rSocketStrategies.routeMatcher());
+		return messageHandler;
 	}
 
-
-
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -26,6 +26,7 @@ import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.codec.StringDecoder;
 import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
+import org.springframework.util.MimeType;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Tests for {@link RSocketMessagingAutoConfiguration}.
  *
  * @author Brian Clozel
+ * @author Madhura Bhave
  */
 class RSocketMessagingAutoConfigurationTests {
 
@@ -61,6 +63,14 @@ class RSocketMessagingAutoConfigurationTests {
 				.getBeanNames(RSocketMessageHandler.class).containsOnly("customMessageHandler"));
 	}
 
+	@Test
+	void shouldApplyMessageHandlerCustomizers() {
+		this.contextRunner.withUserConfiguration(CustomizerConfiguration.class).run((context) -> {
+			RSocketMessageHandler handler = context.getBean(RSocketMessageHandler.class);
+			assertThat(handler.getDefaultDataMimeType()).isEqualTo(MimeType.valueOf("application/json"));
+		});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class BaseConfiguration {
 
@@ -86,4 +96,14 @@ class RSocketMessagingAutoConfigurationTests {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class CustomizerConfiguration {
+
+		@Bean
+		RSocketMessageHandlerCustomizer customizer() {
+			return (messageHandler) -> messageHandler.setDefaultDataMimeType(MimeType.valueOf("application/json"));
+		}
+
+	}
+
 }