Merge pull request #18697 from izeye

* pr/18697:
  Polish

Closes gh-18697

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<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());
+			verify(factory).addSocketAcceptorPlugin(captor.capture());
-			List<SecuritySocketAcceptorInterceptor> values = captor.getAllValues();
+			assertThat(captor.getValue()).isInstanceOf(SecuritySocketAcceptorInterceptor.class);
-			assertThat(values.get(0)).isInstanceOf(SecuritySocketAcceptorInterceptor.class);
 		});
 	}
 

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;

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);