Merge pull request #16700 from izeye

snicoll · snicoll · commit 4ad837f5dcb7 · 2019-05-02T09:20:26.000+02:00
* pr/16700:
  Polish RSocketServerBootstrap bean name
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
@@ -106,7 +106,7 @@ public RSocketServerFactory rSocketServerFactory(RSocketProperties properties,
 		}
 
 		@Bean
-		public RSocketServerBootstrap nettyRSocketBootstrap(
+		public RSocketServerBootstrap rSocketServerBootstrap(
 				RSocketServerFactory rSocketServerFactory,
 				SocketAcceptor socketAcceptor) {
 			return new RSocketServerBootstrap(rSocketServerFactory, socketAcceptor);

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public RSocketServerFactory rSocketServerFactory(RSocketProperties properties,`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Bean`
`109`		`- public RSocketServerBootstrap nettyRSocketBootstrap(`
	`109`	`+ public RSocketServerBootstrap rSocketServerBootstrap(`
`110`	`110`	`RSocketServerFactory rSocketServerFactory,`
`111`	`111`	`SocketAcceptor socketAcceptor) {`
`112`	`112`	`return new RSocketServerBootstrap(rSocketServerFactory, socketAcceptor);`