Merge pull request #9 from tisoft/master

 Allow running the LDAP server with no schema at all

Author: zapodot

src/main/java/org/zapodot/junit/ldap/EmbeddedLdapRuleBuilder.java

@@ -192,9 +192,7 @@ private InMemoryDirectoryServerConfig createInMemoryServerConfiguration() {
                     bindPort,
                     null);
             inMemoryDirectoryServerConfig.setListenerConfigs(listenerConfig);
-            for (Schema s : customSchema().asSet()) {
-                inMemoryDirectoryServerConfig.setSchema(s);
-            }
+            inMemoryDirectoryServerConfig.setSchema(customSchema());
             return inMemoryDirectoryServerConfig;
         } catch (LDAPException e) {
             throw new IllegalStateException(
@@ -211,7 +209,7 @@ private String[] domainDsnArray() {
         }
     }
 
-    private Optional<Schema> customSchema() {
+    private Schema customSchema() {
         final List<File> schemaFiles = schemaFiles();
 
         try {
@@ -220,9 +218,9 @@ private Optional<Schema> customSchema() {
                 final Schema customSchema = initialSchema == null
                                             ? Schema.getSchema(schemaFiles)
                                             : Schema.mergeSchemas(initialSchema, Schema.getSchema(schemaFiles));
-                return Optional.fromNullable(customSchema);
+                return customSchema;
             } else {
-                return Optional.absent();
+                return null;
             }
 
         } catch (IOException | LDIFException | LDAPException e) {

src/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomWithoutSchemaTest.java

@@ -0,0 +1,23 @@
+package org.zapodot.junit.ldap;
+
+import com.unboundid.ldap.sdk.schema.Schema;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class EmbeddedLdapRuleCustomWithoutSchemaTest {
+
+    @Rule
+    public EmbeddedLdapRule embeddedLdapRule = EmbeddedLdapRuleBuilder.newInstance()
+                                                                      .withoutDefaultSchema()
+                                                                      .build();
+
+    @Test
+    public void testEmptySchema() throws Exception {
+        final Schema schema =
+                embeddedLdapRule.ldapConnection().getSchema();
+        assertTrue(schema.getAttributeTypes().isEmpty());
+
+    }
+}