From fd1d653c343ea434934fa80dad695b568bcf4e2c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 16 Oct 2019 12:48:41 +0100 Subject: [PATCH] Rename socket factory processor methods on NettyRSocketServerFactory Previously, the methods were named addServerProcessors and setServerProcessors which wasn't aligned with them taking socket factory processors (ServerRSocketFactoryProcessor) as an argument. This commit renames the methods to align them more closely with the type of their arguments. Closes gh-18617 --- .../RSocketServerAutoConfiguration.java | 2 +- .../netty/NettyRSocketServerFactory.java | 31 ++++++++++--------- .../netty/NettyRSocketServerFactoryTests.java | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) 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 index 8d7bdec50c8..8856f145213 100644 --- 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 @@ -97,7 +97,7 @@ public class RSocketServerAutoConfiguration { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); map.from(properties.getServer().getAddress()).to(factory::setAddress); map.from(properties.getServer().getPort()).to(factory::setPort); - factory.setServerProcessors(processors.orderedStream().collect(Collectors.toList())); + factory.setSocketFactoryProcessors(processors.orderedStream().collect(Collectors.toList())); return factory; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java index 83a51b25846..9a2bbae9c8d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.List; import io.rsocket.RSocketFactory; +import io.rsocket.RSocketFactory.ServerRSocketFactory; import io.rsocket.SocketAcceptor; import io.rsocket.transport.ServerTransport; import io.rsocket.transport.netty.server.CloseableChannel; @@ -60,7 +61,7 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur private Duration lifecycleTimeout; - private List serverProcessors = new ArrayList<>(); + private List socketFactoryProcessors = new ArrayList<>(); @Override public void setPort(int port) { @@ -86,23 +87,25 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur } /** - * Set {@link ServerRSocketFactoryProcessor}s that should be applied to the RSocket - * server builder. Calling this method will replace any existing customizers. - * @param serverProcessors server processors to apply before the server starts + * Set {@link ServerRSocketFactoryProcessor}s that should be called to process the + * {@link ServerRSocketFactory} while building the server. Calling this method will + * replace any existing processors. + * @param socketFactoryProcessors processors to apply before the server starts */ - public void setServerProcessors(Collection serverProcessors) { - Assert.notNull(serverProcessors, "ServerProcessors must not be null"); - this.serverProcessors = new ArrayList<>(serverProcessors); + public void setSocketFactoryProcessors( + Collection socketFactoryProcessors) { + Assert.notNull(socketFactoryProcessors, "SocketFactoryProcessors must not be null"); + this.socketFactoryProcessors = new ArrayList<>(socketFactoryProcessors); } /** - * Add {@link ServerRSocketFactoryProcessor}s that should applied while building the - * server. - * @param serverProcessors server processors to apply before the server starts + * Add {@link ServerRSocketFactoryProcessor}s that should be called to process the + * {@link ServerRSocketFactory} while building the server. + * @param socketFactoryProcessors processors to apply before the server starts */ - public void addServerProcessors(ServerRSocketFactoryProcessor... serverProcessors) { - Assert.notNull(serverProcessors, "ServerProcessors must not be null"); - this.serverProcessors.addAll(Arrays.asList(serverProcessors)); + public void addSocketFactoryProcessors(ServerRSocketFactoryProcessor... socketFactoryProcessors) { + Assert.notNull(socketFactoryProcessors, "SocketFactoryProcessors must not be null"); + this.socketFactoryProcessors.addAll(Arrays.asList(socketFactoryProcessors)); } /** @@ -118,7 +121,7 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur public NettyRSocketServer create(SocketAcceptor socketAcceptor) { ServerTransport transport = createTransport(); RSocketFactory.ServerRSocketFactory factory = RSocketFactory.receive(); - for (ServerRSocketFactoryProcessor processor : this.serverProcessors) { + for (ServerRSocketFactoryProcessor processor : this.socketFactoryProcessors) { factory = processor.process(factory); } Mono starter = factory.acceptor(socketAcceptor).transport(transport).start(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java index efa426735a4..a8055999f46 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java @@ -137,7 +137,7 @@ class NettyRSocketServerFactoryTests { given(processors[i].process(any(RSocketFactory.ServerRSocketFactory.class))) .will((invocation) -> invocation.getArgument(0)); } - factory.setServerProcessors(Arrays.asList(processors)); + factory.setSocketFactoryProcessors(Arrays.asList(processors)); this.server = factory.create(new EchoRequestResponseAcceptor()); InOrder ordered = inOrder((Object[]) processors); for (ServerRSocketFactoryProcessor processor : processors) {