From 8c2d6b28f808ef4a30094f61abca0f195bae791d Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 23 Oct 2019 10:35:47 +0900 Subject: [PATCH] Polish See gh-18697 --- .../RSocketSecurityAutoConfigurationTests.java | 12 +++++------- ...RSocketPortInfoApplicationContextInitializer.java | 2 +- .../boot/context/properties/bind/BindableTests.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfigurationTests.java index cd52963df2..584782e04e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/rsocket/RSocketSecurityAutoConfigurationTests.java @@ -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 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 values = captor.getAllValues(); - assertThat(values.get(0)).isInstanceOf(SecuritySocketAcceptorInterceptor.class); + verify(factory).addSocketAcceptorPlugin(captor.capture()); + assertThat(captor.getValue()).isInstanceOf(SecuritySocketAcceptorInterceptor.class); }); } 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 4b85aff802..23c21156c3 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 @@ -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; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java index ccc0a16e06..6cd1fc3d96 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java @@ -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);