Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18697 from izeye

Browse Source 
* pr/18697:
  Polish

Closes gh-18697
This commit is contained in:
Stephane Nicoll
2019-10-23 10:10:18 +02:00
parent ce8360dc95 8c2d6b28f8
commit 31a7ace38f
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfigurationTests.java
View File

@@ -16,12 +16,9 @@
package org.springframework.boot.autoconfigure.security.rsocket;
import java.util.List;
import io.rsocket.RSocketFactory;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration;
@@ -34,6 +31,8 @@ import org.springframework.security.config.annotation.rsocket.RSocketSecurity;
import org.springframework.security.rsocket.core.SecuritySocketAcceptorInterceptor;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* Tests for {@link RSocketSecurityAutoConfiguration}.
@@ -59,15 +58,14 @@ class RSocketSecurityAutoConfigurationTests {
@Test
void autoConfigurationAddsCustomizerForServerRSocketFactory() {
RSocketFactory.ServerRSocketFactory factory = Mockito.mock(RSocketFactory.ServerRSocketFactory.class);
RSocketFactory.ServerRSocketFactory factory = mock(RSocketFactory.ServerRSocketFactory.class);
ArgumentCaptor<SecuritySocketAcceptorInterceptor> captor = ArgumentCaptor
.forClass(SecuritySocketAcceptorInterceptor.class);
this.contextRunner.run((context) -> {
ServerRSocketFactoryProcessor customizer = context.getBean(ServerRSocketFactoryProcessor.class);
customizer.process(factory);
Mockito.verify(factory).addSocketAcceptorPlugin(captor.capture());
List<SecuritySocketAcceptorInterceptor> values = captor.getAllValues();
assertThat(values.get(0)).isInstanceOf(SecuritySocketAcceptorInterceptor.class);
verify(factory).addSocketAcceptorPlugin(captor.capture());
assertThat(captor.getValue()).isInstanceOf(SecuritySocketAcceptorInterceptor.class);
});
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
View File

@@ -55,7 +55,7 @@ public class RSocketPortInfoApplicationContextInitializer
private static final String PROPERTY_NAME = "local.rsocket.server.port";
private ConfigurableApplicationContext applicationContext;
private final ConfigurableApplicationContext applicationContext;
Listener(ConfigurableApplicationContext applicationContext) {
this.applicationContext = applicationContext;

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java
View File

@@ -170,7 +170,7 @@ class BindableTests {
}
@Test // gh-18218
void withSuppliedValueValueDoesNotForgetAnnotations() {
void withSuppliedValueDoesNotForgetAnnotations() {
Annotation annotation = AnnotationUtils.synthesizeAnnotation(TestAnnotation.class);
Bindable<?> bindable = Bindable.of(String.class).withAnnotations(annotation).withSuppliedValue(() -> "");
assertThat(bindable.getAnnotations()).containsExactly(annotation);