root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename nettyServerCustomizers to serverCustomizers 

Closes gh-11155
This commit is contained in:
Stephane Nicoll 2017-11-29 11:11:00 +01:00
parent 9044b5a215
commit 55f7b3a535
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java
View File

@ -40,7 +40,7 @@ import org.springframework.util.Assert;
*/ */
public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFactory { public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFactory {
private List<NettyServerCustomizer> nettyServerCustomizers = new ArrayList<>(); private List<NettyServerCustomizer> serverCustomizers = new ArrayList<>();
public NettyReactiveWebServerFactory() { public NettyReactiveWebServerFactory() {
} }
@ -62,29 +62,29 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
* applied to the Netty server builder. * applied to the Netty server builder.
* @return the customizers that will be applied * @return the customizers that will be applied
*/ */
public Collection<NettyServerCustomizer> getNettyServerCustomizers() { public Collection<NettyServerCustomizer> getServerCustomizers() {
return this.nettyServerCustomizers; return this.serverCustomizers;
} }
/** /**
* Set {@link NettyServerCustomizer}s that should be applied to the Netty server * Set {@link NettyServerCustomizer}s that should be applied to the Netty server
* builder. Calling this method will replace any existing customizers. * builder. Calling this method will replace any existing customizers.
* @param nettyServerCustomizers the customizers to set * @param serverCustomizers the customizers to set
*/ */
public void setNettyServerCustomizers( public void setServerCustomizers(
Collection<? extends NettyServerCustomizer> nettyServerCustomizers) { Collection<? extends NettyServerCustomizer> serverCustomizers) {
Assert.notNull(nettyServerCustomizers, "NettyServerCustomizers must not be null"); Assert.notNull(serverCustomizers, "NettyServerCustomizers must not be null");
this.nettyServerCustomizers = new ArrayList<>(nettyServerCustomizers); this.serverCustomizers = new ArrayList<>(serverCustomizers);
} }
/** /**
* Add {@link NettyServerCustomizer}s that should applied while building the server. * Add {@link NettyServerCustomizer}s that should applied while building the server.
* @param nettyServerCustomizer the customizers to add * @param nettyServerCustomizer the customizers to add
*/ */
public void addContextCustomizers(NettyServerCustomizer... nettyServerCustomizer) { public void addServerCustomizers(NettyServerCustomizer... nettyServerCustomizer) {
Assert.notNull(nettyServerCustomizer, Assert.notNull(nettyServerCustomizer,
"NettyWebServerCustomizer must not be null"); "NettyWebServerCustomizer must not be null");
this.nettyServerCustomizers.addAll(Arrays.asList(nettyServerCustomizer)); this.serverCustomizers.addAll(Arrays.asList(nettyServerCustomizer));
} }
private HttpServer createHttpServer() { private HttpServer createHttpServer() {
@ -107,7 +107,7 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
} }
private void applyCustomizers(Builder options) { private void applyCustomizers(Builder options) {
this.nettyServerCustomizers this.serverCustomizers
.forEach((customizer) -> customizer.customize(options)); .forEach((customizer) -> customizer.customize(options));
} }

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
View File

@ -64,7 +64,7 @@ public class NettyReactiveWebServerFactoryTests
for (int i = 0; i < customizers.length; i++) { for (int i = 0; i < customizers.length; i++) {
customizers[i] = mock(NettyServerCustomizer.class); customizers[i] = mock(NettyServerCustomizer.class);
} }
factory.setNettyServerCustomizers(Arrays.asList(customizers[0], customizers[1])); factory.setServerCustomizers(Arrays.asList(customizers[0], customizers[1]));
this.webServer = factory.getWebServer(new EchoHandler()); this.webServer = factory.getWebServer(new EchoHandler());
InOrder ordered = inOrder((Object[]) customizers); InOrder ordered = inOrder((Object[]) customizers);
for (NettyServerCustomizer customizer : customizers) { for (NettyServerCustomizer customizer : customizers) {