Update behavior to be backward compatible

Signed-off-by: Stéphane Gobancé <[email protected]>

Author: ecnabogs

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/AliasKeyManagerFactory.java

@@ -111,26 +111,22 @@ private AliasX509ExtendedKeyManager(X509ExtendedKeyManager keyManager, String al
 
 		@Override
 		public String chooseEngineClientAlias(String[] keyTypes, Principal[] issuers, SSLEngine sslEngine) {
-			return findFirstMatchingAlias(keyTypes, issuers, this::getClientAliases)
-				.orElseGet(() -> this.delegate.chooseEngineClientAlias(keyTypes, issuers, sslEngine));
+			return findFirstMatchingAlias(keyTypes, issuers, this::getClientAliases).orElse(null);
 		}
 
 		@Override
 		public String chooseEngineServerAlias(String keyType, Principal[] issuers, SSLEngine sslEngine) {
-			return findFirstMatchingAlias(keyType, issuers, this::getServerAliases)
-				.orElseGet(() -> this.delegate.chooseEngineServerAlias(keyType, issuers, sslEngine));
+			return findFirstMatchingAlias(keyType, issuers, this::getServerAliases).orElse(null);
 		}
 
 		@Override
 		public String chooseClientAlias(String[] keyTypes, Principal[] issuers, Socket socket) {
-			return findFirstMatchingAlias(keyTypes, issuers, this::getClientAliases)
-				.orElseGet(() -> this.delegate.chooseClientAlias(keyTypes, issuers, socket));
+			return findFirstMatchingAlias(keyTypes, issuers, this::getClientAliases).orElse(null);
 		}
 
 		@Override
 		public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
-			return findFirstMatchingAlias(keyType, issuers, this::getServerAliases)
-				.orElseGet(() -> this.delegate.chooseServerAlias(keyType, issuers, socket));
+			return findFirstMatchingAlias(keyType, issuers, this::getServerAliases).orElse(null);
 		}
 
 		@Override

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/AliasKeyManagerFactoryTests.java

@@ -60,14 +60,14 @@ void chooseEngineServerAliasReturnsTestAliasMatchingSupportedDelegateAliasAndAlg
 	}
 
 	@Test
-	void chooseEngineServerAliasReturnsDelegateAliasWhenTestAliasIsUnknown() throws Exception {
+	void chooseEngineServerAliasReturnsNullWhenTestAliasIsUnknown() throws Exception {
 
 		final String delegateSupportedAlgorithm = "supported-alg";
 		final String[] delegateSupportedAlias = new String[] { "alias0", "alias1", "alias2" };
 		final String delegateChosenAlias = delegateSupportedAlias[0];
 		final String testAlias = "unknown-alias";
 		final String testAlgorithm = delegateSupportedAlgorithm;
-		final String expectedAlias = delegateChosenAlias;
+		final String expectedAlias = null;
 
 		KeyManagerFactory delegate = mockServerKeyManagerFactory(delegateSupportedAlgorithm, delegateSupportedAlias,
 				delegateChosenAlias);
@@ -117,14 +117,14 @@ void chooseServerAliasReturnsTestAliasMatchingSupportedDelegateAliasAndAlgorithm
 	}
 
 	@Test
-	void chooseServerAliasReturnsDelegateAliasWhenTestAliasIsUnknown() throws Exception {
+	void chooseServerAliasReturnsNullWhenTestAliasIsUnknown() throws Exception {
 
 		final String delegateSupportedAlgorithm = "supported-alg";
 		final String[] delegateSupportedAlias = new String[] { "alias0", "alias1", "alias2" };
 		final String delegateChosenAlias = delegateSupportedAlias[0];
 		final String testAlias = "unknown-alias";
 		final String testAlgorithm = delegateSupportedAlgorithm;
-		final String expectedAlias = delegateChosenAlias;
+		final String expectedAlias = null;
 
 		KeyManagerFactory delegate = mockServerKeyManagerFactory(delegateSupportedAlgorithm, delegateSupportedAlias,
 				delegateChosenAlias);
@@ -174,14 +174,14 @@ void chooseEngineClientAliasReturnsTestAliasMatchingSupportedDelegateAliasAndAlg
 	}
 
 	@Test
-	void chooseEngineClientAliasReturnsDelegateAliasWhenTestAliasIsUnknown() throws Exception {
+	void chooseEngineClientAliasReturnsNullWhenTestAliasIsUnknown() throws Exception {
 
 		final String delegateSupportedAlgorithm = "supported-alg";
 		final String[] delegateSupportedAlias = new String[] { "alias0", "alias1", "alias2" };
 		final String delegateChosenAlias = delegateSupportedAlias[0];
 		final String testAlias = "unknown-alias";
 		final String[] testAlgorithms = new String[] { delegateSupportedAlgorithm };
-		final String expectedAlias = delegateChosenAlias;
+		final String expectedAlias = null;
 
 		KeyManagerFactory delegate = mockClientKeyManagerFactory(delegateSupportedAlgorithm, delegateSupportedAlias,
 				delegateChosenAlias);
@@ -231,14 +231,14 @@ void chooseClientAliasReturnsTestAliasMatchingSupportedDelegateAliasAndAlgorithm
 	}
 
 	@Test
-	void chooseClientAliasReturnsDelegateAliasWhenTestAliasIsUnknown() throws Exception {
+	void chooseClientAliasReturnsNullWhenTestAliasIsUnknown() throws Exception {
 
 		final String delegateSupportedAlgorithm = "supported-alg";
 		final String[] delegateSupportedAlias = new String[] { "alias0", "alias1", "alias2" };
 		final String delegateChosenAlias = delegateSupportedAlias[0];
 		final String testAlias = "unknown-alias";
 		final String[] testAlgorithms = new String[] { delegateSupportedAlgorithm };
-		final String expectedAlias = delegateChosenAlias;
+		final String expectedAlias = null;
 
 		KeyManagerFactory delegate = mockClientKeyManagerFactory(delegateSupportedAlgorithm, delegateSupportedAlias,
 				delegateChosenAlias);