Add ssl nested class in EmbeddedLdapProperties.

Setup autoconfiguration of LDAP listener with ssl.
Add tests using ssl.
Issue#48060

Signed-off-by: CatiaCorreia catia.correia97@gmail.com
Signed-off-by: CatiaCorreia <catia.correia97@gmail.com>

Author: CatiaCorreia

module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfiguration.java

@@ -115,8 +115,8 @@ public final class EmbeddedLdapAutoConfiguration implements DisposableBean {
 	}
 
 	@Bean
-	InMemoryDirectoryServer directoryServer(ApplicationContext applicationContext, ObjectProvider<SslBundles> sslBundles)
-			throws LDAPException, KeyStoreException, IOException,
+	InMemoryDirectoryServer directoryServer(ApplicationContext applicationContext,
+			ObjectProvider<SslBundles> sslBundles) throws LDAPException, KeyStoreException, IOException,
 			NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException {
 		String[] baseDn = StringUtils.toStringArray(this.embeddedProperties.getBaseDn());
 		InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(baseDn);
@@ -226,7 +226,6 @@ private SSLContext getSslContext(EmbeddedLdapProperties.Ssl ssl, @Nullable SslBu
 
 		}
 		else {
-			Assert.notNull(ssl.getAlgorithm(), "SSL algorithm must be specified");
 			SSLContext sslContext = SSLContext.getInstance(ssl.getAlgorithm());
 			KeyManager[] keyManagers = configureKeyManagers(ssl);
 			TrustManager[] trustManagers = configureTrustManagers(ssl);

module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapProperties.java

@@ -161,7 +161,7 @@ public static class Ssl {
 					}
 				}
 			}
-			catch (NoSuchAlgorithmException e) {
+			catch (NoSuchAlgorithmException ex) {
 				// nothing
 			}
 			DEFAULT_PROTOCOL = protocol;
@@ -306,7 +306,7 @@ public String getAlgorithm() {
 			return this.algorithm;
 		}
 
-		public void setAlgorithm( String sslAlgorithm) {
+		public void setAlgorithm(String sslAlgorithm) {
 			this.algorithm = sslAlgorithm;
 		}
 

module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java

@@ -82,29 +82,28 @@ void testServerDefaultNoSsl() {
 			});
 	}
 
-	 @Test
-	 void testServerWithSslBundle() {
-		 List<String> propertyValues = new ArrayList<>();
-		 String location = "classpath:org/springframework/boot/ldap/autoconfigure/embedded/";
-		 propertyValues.add("spring.ssl.bundle.jks.test.keystore.password=secret");
-		 propertyValues.add("spring.ssl.bundle.jks.test.keystore.location=" + location + "test.jks");
-		 propertyValues.add("spring.ssl.bundle.jks.test.truststore.location=" + location + "test.jks");
-		 propertyValues.add("spring.ldap.embedded.port:1234");
-		 propertyValues.add("spring.ldap.embedded.base-dn:dc=spring,dc=org");
-		 propertyValues.add("spring.ldap.embedded.ssl.enabled:true");
-		 propertyValues.add("spring.ldap.embedded.ssl.bundle:test");
-		 this.contextRunner
-			 .withPropertyValues(propertyValues.toArray(String[]::new))
-			 .run((context) -> {
-				 InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
-				 assertThat(server.getConfig().getListenerConfigs().size()).isEqualTo(1);
-				 InMemoryListenerConfig config = server.getConfig().getListenerConfigs().get(0);
-				 assertThat(config.getListenerName()).isEqualTo("LDAPS");
-				 assertThat(config.getListenPort()).isEqualTo(1234);
-				 assertThat(server.getListenPort()).isEqualTo(1234);
-				 assertThat(server.getConnection("LDAPS").getSSLSession()).isNotNull();
-		 });
-	 }
+	@Test
+	void testServerWithSslBundle() {
+		List<String> propertyValues = new ArrayList<>();
+		String location = "classpath:org/springframework/boot/ldap/autoconfigure/embedded/";
+		propertyValues.add("spring.ssl.bundle.jks.test.keystore.password=secret");
+		propertyValues.add("spring.ssl.bundle.jks.test.keystore.location=" + location + "test.jks");
+		propertyValues.add("spring.ssl.bundle.jks.test.truststore.location=" + location + "test.jks");
+		propertyValues.add("spring.ssl.bundle.jks.test.protocol=TLSv1.2");
+		propertyValues.add("spring.ldap.embedded.port:1234");
+		propertyValues.add("spring.ldap.embedded.base-dn:dc=spring,dc=org");
+		propertyValues.add("spring.ldap.embedded.ssl.enabled:true");
+		propertyValues.add("spring.ldap.embedded.ssl.bundle:test");
+		this.contextRunner.withPropertyValues(propertyValues.toArray(String[]::new)).run((context) -> {
+			InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
+			assertThat(server.getConfig().getListenerConfigs().size()).isEqualTo(1);
+			InMemoryListenerConfig config = server.getConfig().getListenerConfigs().get(0);
+			assertThat(config.getListenerName()).isEqualTo("LDAPS");
+			assertThat(config.getListenPort()).isEqualTo(1234);
+			assertThat(server.getListenPort()).isEqualTo(1234);
+			assertThat(server.getConnection("LDAPS").getSSLSession()).isNotNull();
+		});
+	}
 
 	@Test
 	void testServerWithInvalidSslBundleShouldFail() {