code review

Closes spring-projects#938

Signed-off-by: emanueltrandafir1993 <[email protected]>

Author: etrandafir93

modules/ROOT/pages/testing.adoc

@@ -109,9 +109,7 @@ The following bean definition creates an embedded LDAP server:
 ====
 [source,xml]
 ----
-<bean id="embeddedAlso, `org.springframework.ldap.test.unboundid.LdapTestUtils` provide methods to programmatically work with an embedded LDAP server.
-Also, `org.springframework.ldap.test.unboundid.LdapTestUtils` provide methods to programmatically work with an embedded LDAP server.
-" class="org.springframework.ldap.test.EmbeddedLdapServerFactoryBean">
+<bean id="embeddedLdapServer" class="org.springframework.ldap.test.EmbeddedLdapServerFactoryBean">
     <property name="partitionName" value="example"/>
     <property name="partitionSuffix" value="dc=261consulting,dc=com" />
     <property name="port" value="9321" />
@@ -188,11 +186,10 @@ The following bean definition creates an embedded LDAP server:
 ----
 @Bean
 EmbeddedLdapServer embeddedLdapServer() {
-    return EmbeddedLdapServer.builder()
-        .withPort(18881)
-        .withPartitionName("jayway")
-        .withPartitionSuffix("dc=jayway,dc=se")
-        .withConfigurationCustomizer((config) -> config.setCodeLogDetails(tempLogFile, true))
+    return EmbeddedLdapServer.withPartitionSuffix("dc=jayway,dc=se")
+        .partitionName("jayway")
+        .port(18881)
+        .configurationCustomizer((config) -> config.setCodeLogDetails(tempLogFile, true))
         .build();
 }
 ----

test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ldap.test.unboundid;
 
+import java.util.function.Consumer;
+
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
 import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
 import com.unboundid.ldap.listener.InMemoryListenerConfig;
@@ -46,25 +48,29 @@ public EmbeddedLdapServer(InMemoryDirectoryServer directoryServer) {
 	}
 
 	/**
-	 * Creates a new {@link EmbeddedLdapServerBuilder}.
+	 * Creates a new {@link Builder} with a given partition suffix.
 	 *
 	 * @since 3.3
 	 */
-	public static EmbeddedLdapServerBuilder builder() {
-		return new EmbeddedLdapServerBuilder();
+	public static Builder withPartitionSuffix(String partitionSuffix) {
+		return new Builder(partitionSuffix);
 	}
 
 	/**
 	 * Creates and starts new embedded LDAP server.
+	 * @deprecated Use the builder pattern exposed via
+	 * {@link #withPartitionSuffix(String)} instead.
 	 */
+	@Deprecated(since = "3.3")
 	public static EmbeddedLdapServer newEmbeddedServer(String defaultPartitionName, String defaultPartitionSuffix,
-			int port) throws Exception {
-		InMemoryDirectoryServerConfig config = inMemoryDirectoryServerConfig(defaultPartitionSuffix, port);
-		Entry entry = ldapEntry(defaultPartitionName, defaultPartitionSuffix);
-
-		InMemoryDirectoryServer directoryServer = inMemoryDirectoryServer(config, entry);
-		directoryServer.startListening();
-		return new EmbeddedLdapServer(directoryServer);
+			int port) {
+		EmbeddedLdapServer server = EmbeddedLdapServer.withPartitionSuffix(defaultPartitionSuffix)
+			.partitionName(defaultPartitionName)
+			.port(port)
+			.build();
+
+		server.start();
+		return server;
 	}
 
 	/**
@@ -101,28 +107,88 @@ public void shutdown() {
 		this.directoryServer.shutDown(true);
 	}
 
-	static InMemoryDirectoryServerConfig inMemoryDirectoryServerConfig(String partitionSuffix, int port)
-			throws LDAPException {
-		InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(partitionSuffix);
-		config.addAdditionalBindCredentials("uid=admin,ou=system", "secret");
-		config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("LDAP", port));
-		config.setEnforceSingleStructuralObjectClass(false);
-		config.setEnforceAttributeSyntaxCompliance(true);
-		return config;
-	}
+	/**
+	 * Helper class for embedded Unboundid ldap server.
+	 *
+	 * @author Emanuel Trandafir
+	 * @since 3.3
+	 */
+	public static final class Builder {
 
-	static Entry ldapEntry(String defaultPartitionName, String defaultPartitionSuffix) throws LDAPException {
-		Entry entry = new Entry(new DN(defaultPartitionSuffix));
-		entry.addAttribute("objectClass", "top", "domain", "extensibleObject");
-		entry.addAttribute("dc", defaultPartitionName);
-		return entry;
-	}
+		private int port = 0;
+
+		private Consumer<InMemoryDirectoryServerConfig> configurationCustomizer = (__) -> {
+		};
+
+		private String partitionName = "jayway";
+
+		private final String partitionSuffix;
+
+		private Builder(String partitionSuffix) {
+			this.partitionSuffix = partitionSuffix;
+		}
+
+		public Builder port(int port) {
+			this.port = port;
+			return this;
+		}
+
+		public Builder configurationCustomizer(Consumer<InMemoryDirectoryServerConfig> configurationCustomizer) {
+			this.configurationCustomizer = configurationCustomizer;
+			return this;
+		}
+
+		public Builder partitionName(String defaultPartitionName) {
+			this.partitionName = defaultPartitionName;
+			return this;
+		}
+
+		/**
+		 * Builds and returns a {@link EmbeddedLdapServer}.
+		 * <p>
+		 * In order to start the server, you should call
+		 * {@link EmbeddedLdapServer#start()}.
+		 * @return a new {@link EmbeddedLdapServer}.
+		 */
+		public EmbeddedLdapServer build() {
+			try {
+				InMemoryDirectoryServerConfig config = inMemoryDirectoryServerConfig(this.partitionSuffix, this.port);
+				this.configurationCustomizer.accept(config);
+
+				Entry entry = ldapEntry(this.partitionName, this.partitionSuffix);
+				InMemoryDirectoryServer directoryServer = inMemoryDirectoryServer(config, entry);
+				return new EmbeddedLdapServer(directoryServer);
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex);
+			}
+		}
+
+		private static InMemoryDirectoryServerConfig inMemoryDirectoryServerConfig(String partitionSuffix, int port)
+				throws LDAPException {
+			InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(partitionSuffix);
+			config.addAdditionalBindCredentials("uid=admin,ou=system", "secret");
+			config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("LDAP", port));
+			config.setEnforceSingleStructuralObjectClass(false);
+			config.setEnforceAttributeSyntaxCompliance(true);
+			return config;
+		}
+
+		private static Entry ldapEntry(String defaultPartitionName, String defaultPartitionSuffix)
+				throws LDAPException {
+			Entry entry = new Entry(new DN(defaultPartitionSuffix));
+			entry.addAttribute("objectClass", "top", "domain", "extensibleObject");
+			entry.addAttribute("dc", defaultPartitionName);
+			return entry;
+		}
+
+		private static InMemoryDirectoryServer inMemoryDirectoryServer(InMemoryDirectoryServerConfig config,
+				Entry entry) throws LDAPException {
+			InMemoryDirectoryServer directoryServer = new InMemoryDirectoryServer(config);
+			directoryServer.add(entry);
+			return directoryServer;
+		}
 
-	static InMemoryDirectoryServer inMemoryDirectoryServer(InMemoryDirectoryServerConfig config, Entry entry)
-			throws LDAPException {
-		InMemoryDirectoryServer directoryServer = new InMemoryDirectoryServer(config);
-		directoryServer.add(entry);
-		return directoryServer;
 	}
 
 }

test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerBuilder.java

@@ -47,8 +47,14 @@ public void setPort(int port) {
 	}
 
 	@Override
-	protected EmbeddedLdapServer createInstance() throws Exception {
-		return EmbeddedLdapServer.newEmbeddedServer(this.partitionName, this.partitionSuffix, this.port);
+	protected EmbeddedLdapServer createInstance() {
+		EmbeddedLdapServer server = EmbeddedLdapServer.withPartitionSuffix(this.partitionSuffix)
+			.partitionName(this.partitionName)
+			.port(this.port)
+			.build();
+
+		server.start();
+		return server;
 	}
 
 	@Override

test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBean.java

@@ -78,7 +78,12 @@ public static void startEmbeddedServer(int port, String defaultPartitionSuffix,
 		}
 
 		try {
-			embeddedServer = EmbeddedLdapServer.newEmbeddedServer(defaultPartitionName, defaultPartitionSuffix, port);
+			embeddedServer = EmbeddedLdapServer.withPartitionSuffix(defaultPartitionSuffix)
+				.partitionName(defaultPartitionName)
+				.port(port)
+				.build();
+
+			embeddedServer.start();
 		}
 		catch (Exception ex) {
 			throw new UncategorizedLdapException("Failed to start embedded server", ex);