Create spring-boot-rsocket module

Author: wilkinsona

settings.gradle

@@ -69,6 +69,7 @@ include "spring-boot-project:spring-boot-parent"
 include "spring-boot-project:spring-boot-pulsar"
 include "spring-boot-project:spring-boot-r2dbc"
 include "spring-boot-project:spring-boot-reactor-netty"
+include "spring-boot-project:spring-boot-rsocket"
 include "spring-boot-project:spring-boot-test"
 include "spring-boot-project:spring-boot-test-autoconfigure"
 include "spring-boot-project:spring-boot-test-integration-tests"

spring-boot-project/spring-boot-all/build.gradle

@@ -24,8 +24,6 @@ dependencies {
 	optional("io.projectreactor:reactor-tools")
 	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("io.r2dbc:r2dbc-pool")
-	optional("io.rsocket:rsocket-core")
-	optional("io.rsocket:rsocket-transport-netty")
 	optional("io.undertow:undertow-servlet")
 	optional("jakarta.persistence:jakarta.persistence-api")
 	optional("jakarta.servlet:jakarta.servlet-api")

spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,3 @@
-# Application Context Initializers
-org.springframework.context.ApplicationContextInitializer=\
-org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer
-
 # Environment Post Processors
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.springframework.boot.reactor.ReactorEnvironmentPostProcessor

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -52,6 +52,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
 	optional(project(":spring-boot-project:spring-boot-reactor-netty"))
+	optional(project(":spring-boot-project:spring-boot-rsocket"))
 	optional(project(":spring-boot-project:spring-boot-tomcat"))
 	optional(project(":spring-boot-project:spring-boot-tx"))
 	optional(project(":spring-boot-project:spring-boot-validation"))

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java

@@ -29,7 +29,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
-import org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
@@ -46,7 +45,8 @@
  * @author Brian Clozel
  * @since 2.7.0
  */
-@AutoConfiguration(after = { GraphQlAutoConfiguration.class, RSocketMessagingAutoConfiguration.class })
+@AutoConfiguration(after = GraphQlAutoConfiguration.class,
+		afterName = "org.springframework.boot.rsocket.autoconfigure.RSocketMessagingAutoConfiguration")
 @ConditionalOnClass({ GraphQL.class, GraphQlSource.class, RSocketServer.class, HttpServer.class })
 @ConditionalOnBean({ RSocketMessageHandler.class, AnnotatedControllerConfigurer.class })
 @ConditionalOnProperty("spring.graphql.rsocket.mapping")

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/RSocketGraphQlClientAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -25,7 +25,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.rsocket.RSocketRequesterAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.graphql.client.RSocketGraphQlClient;
@@ -42,7 +41,7 @@
  * @author Brian Clozel
  * @since 2.7.0
  */
-@AutoConfiguration(after = RSocketRequesterAutoConfiguration.class)
+@AutoConfiguration(afterName = "org.springframework.boot.rsocket.autoconfigure.RSocketRequesterAutoConfiguration")
 @ConditionalOnClass({ GraphQL.class, RSocketGraphQlClient.class, RSocketRequester.class, RSocket.class,
 		TcpClientTransport.class })
 public class RSocketGraphQlClientAutoConfiguration {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

@@ -26,7 +26,6 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
@@ -38,7 +37,6 @@
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxProperties;
-import org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration;
 import org.springframework.boot.autoconfigure.sql.init.OnDatabaseInitializationCondition;
 import org.springframework.boot.autoconfigure.task.TaskSchedulingAutoConfiguration;
 import org.springframework.boot.autoconfigure.thread.Threading;
@@ -88,7 +86,8 @@
  * @author Yanming Zhou
  * @since 1.1.0
  */
-@AutoConfiguration(after = { JmxAutoConfiguration.class, TaskSchedulingAutoConfiguration.class },
+@AutoConfiguration(beforeName = "org.springframework.boot.rsocket.autoconfigure.RSocketMessagingAutoConfiguration",
+		after = { JmxAutoConfiguration.class, TaskSchedulingAutoConfiguration.class },
 		afterName = "org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration")
 @ConditionalOnClass(EnableIntegration.class)
 @EnableConfigurationProperties({ IntegrationProperties.class, JmxProperties.class })
@@ -303,7 +302,6 @@ static class RSocketOutboundGatewayAvailable {
 
 		@Configuration(proxyBeanMethods = false)
 		@ConditionalOnClass(TcpServerTransport.class)
-		@AutoConfigureBefore(RSocketMessagingAutoConfiguration.class)
 		protected static class IntegrationRSocketServerConfiguration {
 
 			@Bean

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java

@@ -31,7 +31,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -57,7 +56,8 @@
  * @author Madhura Bhave
  * @since 2.0.0
  */
-@AutoConfiguration(before = ReactiveSecurityAutoConfiguration.class, after = RSocketMessagingAutoConfiguration.class)
+@AutoConfiguration(before = ReactiveSecurityAutoConfiguration.class,
+		afterName = "org.springframework.boot.rsocket.autoconfigure.RSocketMessagingAutoConfiguration")
 @ConditionalOnClass({ ReactiveAuthenticationManager.class })
 @ConditionalOnMissingBean(
 		value = { ReactiveAuthenticationManager.class, ReactiveUserDetailsService.class,

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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,7 +19,7 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.rsocket.RSocketMessageHandlerCustomizer;
+import org.springframework.boot.rsocket.autoconfigure.RSocketMessageHandlerCustomizer;
 import org.springframework.boot.rsocket.server.RSocketServerCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +38,7 @@
  */
 @AutoConfiguration
 @EnableRSocketSecurity
-@ConditionalOnClass(SecuritySocketAcceptorInterceptor.class)
+@ConditionalOnClass({ RSocketServerCustomizer.class, SecuritySocketAcceptorInterceptor.class })
 public class RSocketSecurityAutoConfiguration {
 
 	@Bean

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1552,92 +1552,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.rsocket.server.ssl.bundle",
-      "description": "Name of a configured SSL bundle."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.certificate",
-      "description": "Path to a PEM-encoded SSL certificate file."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.certificate-private-key",
-      "description": "Path to a PEM-encoded private key file for the SSL certificate."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.ciphers",
-      "description": "Supported SSL ciphers."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.client-auth",
-      "description": "Client authentication mode. Requires a trust store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.enabled",
-      "description": "Whether to enable SSL support.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.rsocket.server.ssl.enabled-protocols",
-      "description": "Enabled SSL protocols."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-alias",
-      "description": "Alias that identifies the key in the key store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-password",
-      "description": "Password used to access the key in the key store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-store",
-      "description": "Path to the key store that holds the SSL certificate (typically a jks file)."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-store-password",
-      "description": "Password used to access the key store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-store-provider",
-      "description": "Provider for the key store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.key-store-type",
-      "description": "Type of the key store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.protocol",
-      "description": "SSL protocol to use.",
-      "defaultValue": "TLS"
-    },
-    {
-      "name": "spring.rsocket.server.ssl.server-name-bundles",
-      "description": "Mapping of host names to SSL bundles for SNI configuration."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-certificate",
-      "description": "Path to a PEM-encoded SSL certificate authority file."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-certificate-private-key",
-      "description": "Path to a PEM-encoded private key file for the SSL certificate authority."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-store",
-      "description": "Trust store that holds SSL certificates."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-store-password",
-      "description": "Password used to access the trust store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-store-provider",
-      "description": "Provider for the trust store."
-    },
-    {
-      "name": "spring.rsocket.server.ssl.trust-store-type",
-      "description": "Type of the trust store."
-    },
     {
       "name": "spring.security.filter.dispatcher-types",
       "defaultValue": [