code review

Closes #938

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

Author: etrandafir93

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

@@ -16,8 +16,13 @@
 
 package org.springframework.ldap.test.unboundid;
 
+import java.util.List;
 import java.util.function.Consumer;
 
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
 import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
 import com.unboundid.ldap.listener.InMemoryListenerConfig;
@@ -26,6 +31,7 @@
 import com.unboundid.ldap.sdk.LDAPException;
 
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Helper class for embedded Unboundid ldap server.
@@ -115,31 +121,52 @@ public void shutdown() {
 	 */
 	public static final class Builder {
 
+		private final String partitionSuffix;
+
+		private String partitionName;
+
 		private int port = 0;
 
 		private Consumer<InMemoryDirectoryServerConfig> configurationCustomizer = (__) -> {
 		};
 
-		private String partitionName = "jayway";
-
-		private final String partitionSuffix;
-
 		private Builder(String partitionSuffix) {
 			this.partitionSuffix = partitionSuffix;
+			this.partitionName = leftMostElement(partitionSuffix);
 		}
 
+		/**
+		 * Sets the port for the embedded LDAP server.
+		 * @param port the port for the embedded LDAP server. Defaults to 0 in which case
+		 * the server should automatically choose an available port.
+		 * @return this {@link Builder} instance.
+		 */
 		public Builder port(int port) {
 			this.port = port;
 			return this;
 		}
 
+		/**
+		 * Sets a customizer for the {@link InMemoryDirectoryServerConfig}.
+		 * @param configurationCustomizer a {@link Consumer} function that will be applied
+		 * to the {@link InMemoryDirectoryServerConfig} before creating the
+		 * {@link InMemoryDirectoryServer}. The default values, it a Consumer function
+		 * that does nothing: (config) -> {}
+		 * @return this {@link Builder} instance.
+		 */
 		public Builder configurationCustomizer(Consumer<InMemoryDirectoryServerConfig> configurationCustomizer) {
 			this.configurationCustomizer = configurationCustomizer;
 			return this;
 		}
 
-		public Builder partitionName(String defaultPartitionName) {
-			this.partitionName = defaultPartitionName;
+		/**
+		 * Sets the partition name for the embedded LDAP server.
+		 * @param partitionName the partition name for the embedded LDAP server. Defaults
+		 * to the left most element of the partition suffix.
+		 * @return this {@link Builder} instance.
+		 */
+		public Builder partitionName(String partitionName) {
+			this.partitionName = partitionName;
 			return this;
 		}
 
@@ -164,6 +191,16 @@ public EmbeddedLdapServer build() {
 			}
 		}
 
+		static String leftMostElement(String partitionSuffix) {
+			try {
+				List<Rdn> rdns = new LdapName(partitionSuffix).getRdns();
+				return CollectionUtils.lastElement(rdns).getValue().toString();
+			}
+			catch (InvalidNameException ex) {
+				throw new RuntimeException(ex);
+			}
+		}
+
 		private static InMemoryDirectoryServerConfig inMemoryDirectoryServerConfig(String partitionSuffix, int port)
 				throws LDAPException {
 			InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(partitionSuffix);

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

@@ -47,7 +47,7 @@ public void setPort(int port) {
 	}
 
 	@Override
-	protected EmbeddedLdapServer createInstance() {
+	protected EmbeddedLdapServer createInstance() throws Exception {
 		EmbeddedLdapServer server = EmbeddedLdapServer.withPartitionSuffix(this.partitionSuffix)
 			.partitionName(this.partitionName)
 			.port(this.port)

test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java

@@ -50,15 +50,14 @@ public void setUp() {
 
 	@Test
 	public void shouldBuildButNotStartTheServer() {
-		EmbeddedLdapServer.withPartitionSuffix("dc=jayway,dc=se").partitionName("jayway").port(this.port).build();
+		EmbeddedLdapServer.withPartitionSuffix("dc=jayway,dc=se").port(this.port).build();
 
 		assertPortIsFree(this.port);
 	}
 
 	@Test
 	public void shouldBuildTheServerWithCustomPort() {
 		EmbeddedLdapServer.Builder serverBuilder = EmbeddedLdapServer.withPartitionSuffix("dc=jayway,dc=se")
-			.partitionName("jayway")
 			.port(this.port);
 
 		try (EmbeddedLdapServer server = serverBuilder.build()) {
@@ -74,7 +73,6 @@ public void shouldBuildLdapServerAndApplyCustomConfiguration() throws IOExceptio
 
 		EmbeddedLdapServer.Builder serverBuilder = EmbeddedLdapServer.withPartitionSuffix("dc=jayway,dc=se")
 			.port(this.port)
-			.partitionName("jayway")
 			.configurationCustomizer((config) -> config.setCodeLogDetails(tempLogFile, true));
 
 		try (EmbeddedLdapServer server = serverBuilder.build()) {
@@ -155,6 +153,15 @@ public void startWhenAlreadyStartedThenFails() throws Exception {
 		}
 	}
 
+	@Test
+	public void shouldParseLdapName() {
+		String actual = EmbeddedLdapServer.Builder.leftMostElement("dc=jayway,dc=se");
+		assertThat(actual).isEqualTo("jayway");
+
+		String actual2 = EmbeddedLdapServer.Builder.leftMostElement("dc=test,dc=jayway,dc=se");
+		assertThat(actual2).isEqualTo("test");
+	}
+
 	private static LdapTemplate ldapTemplate(String base, int port) {
 		LdapContextSource ctx = new LdapContextSource();
 		ctx.setBase(base);