Replace deprecated default authentication converter

Closes gh-18437

Signed-off-by: jihunparkkk <pjh2996@naver.com>

Author: JiHunparkkk

rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java

@@ -41,7 +41,7 @@ public class AuthenticationPayloadInterceptor implements PayloadInterceptor, Ord
 
 	private int order;
 
-	private PayloadExchangeAuthenticationConverter authenticationConverter = new BasicAuthenticationPayloadExchangeConverter();
+	private PayloadExchangeAuthenticationConverter authenticationConverter = new AuthenticationPayloadExchangeConverter();
 
 	/**
 	 * Creates a new instance

rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java

@@ -18,9 +18,11 @@
 
 import java.util.Map;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.CompositeByteBuf;
 import io.rsocket.Payload;
+import io.rsocket.metadata.AuthMetadataCodec;
 import io.rsocket.metadata.CompositeMetadataCodec;
 import io.rsocket.metadata.WellKnownMimeType;
 import io.rsocket.util.DefaultPayload;
@@ -80,8 +82,10 @@ public void constructorWhenAuthenticationManagerNullThenException() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void interceptWhenBasicCredentialsThenAuthenticates() {
 		AuthenticationPayloadInterceptor interceptor = new AuthenticationPayloadInterceptor(this.authenticationManager);
+		interceptor.setAuthenticationConverter(new BasicAuthenticationPayloadExchangeConverter());
 		PayloadExchange exchange = createExchange();
 		TestingAuthenticationToken expectedAuthentication = new TestingAuthenticationToken("user", "password");
 		given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(expectedAuthentication));
@@ -95,8 +99,10 @@ public void interceptWhenBasicCredentialsThenAuthenticates() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void interceptWhenAuthenticationSuccessThenChainSubscribedOnce() {
 		AuthenticationPayloadInterceptor interceptor = new AuthenticationPayloadInterceptor(this.authenticationManager);
+		interceptor.setAuthenticationConverter(new BasicAuthenticationPayloadExchangeConverter());
 		PayloadExchange exchange = createExchange();
 		TestingAuthenticationToken expectedAuthentication = new TestingAuthenticationToken("user", "password");
 		given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(expectedAuthentication));
@@ -108,6 +114,7 @@ public void interceptWhenAuthenticationSuccessThenChainSubscribedOnce() {
 			.verifyComplete();
 	}
 
+	@SuppressWarnings("deprecation")
 	private Payload createRequestPayload() {
 		UsernamePasswordMetadata credentials = new UsernamePasswordMetadata("user", "password");
 		BasicAuthenticationEncoder encoder = new BasicAuthenticationEncoder();
@@ -128,4 +135,48 @@ private PayloadExchange createExchange() {
 				COMPOSITE_METADATA, MediaType.APPLICATION_JSON);
 	}
 
+	@Test
+	public void interceptWhenSimpleCredentialsThenAuthenticates() {
+		AuthenticationPayloadInterceptor interceptor = new AuthenticationPayloadInterceptor(this.authenticationManager);
+		PayloadExchange exchange = createSimpleAuthExchange();
+		TestingAuthenticationToken expectedAuthentication = new TestingAuthenticationToken("user", "password");
+		given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(expectedAuthentication));
+		AuthenticationPayloadInterceptorChain authenticationPayloadChain = new AuthenticationPayloadInterceptorChain();
+		interceptor.intercept(exchange, authenticationPayloadChain).block();
+		Authentication authentication = authenticationPayloadChain.getAuthentication();
+		verify(this.authenticationManager).authenticate(this.authenticationArg.capture());
+		assertThat(this.authenticationArg.getValue()).usingRecursiveComparison()
+			.isEqualTo(UsernamePasswordAuthenticationToken.unauthenticated("user", "password"));
+		assertThat(authentication).isEqualTo(expectedAuthentication);
+	}
+
+	@Test
+	public void interceptWhenSimpleAuthenticationSuccessThenChainSubscribedOnce() {
+		AuthenticationPayloadInterceptor interceptor = new AuthenticationPayloadInterceptor(this.authenticationManager);
+		PayloadExchange exchange = createSimpleAuthExchange();
+		TestingAuthenticationToken expectedAuthentication = new TestingAuthenticationToken("user", "password");
+		given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(expectedAuthentication));
+		PublisherProbe<Void> voidResult = PublisherProbe.empty();
+		PayloadInterceptorChain chain = mock(PayloadInterceptorChain.class);
+		given(chain.next(any())).willReturn(voidResult.mono());
+		StepVerifier.create(interceptor.intercept(exchange, chain))
+			.then(() -> assertThat(voidResult.subscribeCount()).isEqualTo(1))
+			.verifyComplete();
+	}
+
+	private Payload createSimpleAuthPayload() {
+		ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+		CompositeByteBuf metadata = allocator.compositeBuffer();
+		ByteBuf authMetadata = AuthMetadataCodec.encodeSimpleMetadata(allocator, "user".toCharArray(),
+				"password".toCharArray());
+		CompositeMetadataCodec.encodeAndAddMetadata(metadata, allocator,
+				WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION, authMetadata);
+		return DefaultPayload.create(allocator.buffer(), metadata);
+	}
+
+	private PayloadExchange createSimpleAuthExchange() {
+		return new DefaultPayloadExchange(PayloadExchangeType.REQUEST_RESPONSE, createSimpleAuthPayload(),
+				COMPOSITE_METADATA, MediaType.APPLICATION_JSON);
+	}
+
 }

rsocket/src/test/java/org/springframework/security/rsocket/metadata/BasicAuthenticationDecoderTests.java

@@ -31,6 +31,7 @@
 /**
  * @author Rob Winch
  */
+@SuppressWarnings("deprecation")
 public class BasicAuthenticationDecoderTests {
 
 	@Test