From f08f948c3e77a4c63d74fdf0a94ebe9677c98a09 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 25 Aug 2020 21:28:59 -0400 Subject: [PATCH 1/2] Handle null RSocketServer address when setting port property See gh-23084 --- ...PortInfoApplicationContextInitializer.java | 4 +- ...nfoApplicationContextInitializerTests.java | 73 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java index 23c21156c3..720fd1be9a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java @@ -63,7 +63,9 @@ public class RSocketPortInfoApplicationContextInitializer @Override public void onApplicationEvent(RSocketServerInitializedEvent event) { - setPortProperty(this.applicationContext, event.getServer().address().getPort()); + if (event.getServer().address() != null) { + setPortProperty(this.applicationContext, event.getServer().address().getPort()); + } } private void setPortProperty(ApplicationContext context, int port) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java new file mode 100644 index 0000000000..d9e3f62f89 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java @@ -0,0 +1,73 @@ +/* + * Copyright 2012-2019 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.rsocket.context; + +import java.net.InetSocketAddress; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.rsocket.server.RSocketServer; +import org.springframework.boot.rsocket.server.RSocketServerException; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +public class RSocketPortInfoApplicationContextInitializerTests { + + @Autowired + private RSocketPortInfoApplicationContextInitializer initializer; + + @Autowired + private ConfigurableApplicationContext context; + + @Autowired + private ApplicationEventPublisher publisher; + + @Test + void nullAddressDoesNotThrow() { + initializer.initialize(context); + publisher.publishEvent(new RSocketServerInitializedEvent(new RSocketServer() { + @Override + public void start() throws RSocketServerException { + + } + + @Override + public void stop() throws RSocketServerException { + + } + + @Override + public InetSocketAddress address() { + return null; + } + })); + } + + @Configuration(proxyBeanMethods = false) + static class Config { + + @Bean + public RSocketPortInfoApplicationContextInitializer rSocketPortInfoApplicationContextInitializer() { + return new RSocketPortInfoApplicationContextInitializer(); + } + } +} From 6f047c8356043e389718b1534de5582ccedaf81b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Aug 2020 08:47:41 +0100 Subject: [PATCH 2/2] Polish "Handle null RSocketServer address when setting port property" See gh-23084 --- ...PortInfoApplicationContextInitializer.java | 2 +- ...nfoApplicationContextInitializerTests.java | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java index 720fd1be9a..aede35e677 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.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. diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java index d9e3f62f89..97f3223e0f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.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. @@ -18,56 +18,56 @@ package org.springframework.boot.rsocket.context; import java.net.InetSocketAddress; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.rsocket.server.RSocketServer; -import org.springframework.boot.rsocket.server.RSocketServerException; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit.jupiter.SpringExtension; -@ExtendWith(SpringExtension.class) -public class RSocketPortInfoApplicationContextInitializerTests { +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; - @Autowired - private RSocketPortInfoApplicationContextInitializer initializer; - - @Autowired - private ConfigurableApplicationContext context; - - @Autowired - private ApplicationEventPublisher publisher; +/** + * Tests for {@link RSocketPortInfoApplicationContextInitializer}. + * + * @author Spencer Gibb + * @author Andy Wilkinson + */ +class RSocketPortInfoApplicationContextInitializerTests { @Test - void nullAddressDoesNotThrow() { - initializer.initialize(context); - publisher.publishEvent(new RSocketServerInitializedEvent(new RSocketServer() { - @Override - public void start() throws RSocketServerException { - - } - - @Override - public void stop() throws RSocketServerException { - - } + void whenServerHasAddressThenInitializerSetsPortProperty() { + try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(Config.class)) { + context.getBean(RSocketPortInfoApplicationContextInitializer.class).initialize(context); + RSocketServer server = mock(RSocketServer.class); + given(server.address()).willReturn(new InetSocketAddress(65535)); + context.publishEvent(new RSocketServerInitializedEvent(server)); + assertThat(context.getEnvironment().getProperty("local.rsocket.server.port")).isEqualTo("65535"); + } + } - @Override - public InetSocketAddress address() { - return null; - } - })); + @Test + void whenServerHasNoAddressThenInitializerDoesNotSetPortProperty() { + try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(Config.class)) { + context.getBean(RSocketPortInfoApplicationContextInitializer.class).initialize(context); + RSocketServer server = mock(RSocketServer.class); + context.publishEvent(new RSocketServerInitializedEvent(server)); + verify(server).address(); + assertThat(context.getEnvironment().getProperty("local.rsocket.server.port")).isNull(); + } } @Configuration(proxyBeanMethods = false) static class Config { @Bean - public RSocketPortInfoApplicationContextInitializer rSocketPortInfoApplicationContextInitializer() { + RSocketPortInfoApplicationContextInitializer rSocketPortInfoApplicationContextInitializer() { return new RSocketPortInfoApplicationContextInitializer(); } + } + }