LDAP implementation enhanced.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@316 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 14 insertions, 19 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
index 4416649..b1074e7 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
@@ -4,8 +4,9 @@ import iaik.asn1.structures.Name;
 import iaik.utils.RFC2253NameParser;

 import iaik.utils.RFC2253NameParserException;

 

+import java.util.ArrayList;

 import java.util.Hashtable;

-import java.util.Iterator;

+import java.util.List;

 

 import org.apache.log4j.Logger;

 

@@ -40,34 +41,28 @@ public class LDAPMappingStore {
 		return this.issuerNameFilter != null;

 	}

 	

-	public void storeMapping(LDAPMapping mapping) {

+	public void addMapping(LDAPMapping mapping) {

 		Name name = mapping.getIssuerName();

 		if (issuerNameFilter != null) {

 			name = this.issuerNameFilter.applyFilter(name);

 		}

-		if (this.storedMappings.containsKey(name)) {

-			log.warn("Skipping mapping \"" + mapping + "\" because is has already been stored under \"" + name.getName() + "\".");

-		} else {

-			log.debug("Storing mapping \"" + mapping + "\" under \"" + name.getName() + "\".");

-			this.storedMappings.put(name, mapping);

-		}

+		List mappingList = (List) this.storedMappings.get(name);

+      if (mappingList == null) {

+         mappingList = new ArrayList();

+         this.storedMappings.put(name, mappingList);

+      }

+      log.debug("Adding mapping \"" + mapping + "\" for \"" + name.getName() + "\".");

+      mappingList.add(mapping);

 	}

 

-//	public void storeMappings(Iterable iterable) {

-//		Iterator it = iterable.iterator();

-//		while (it.hasNext()) {

-//			this.storeMapping((LDAPMapping) it.next());

-//		}

-//	}

-	

-	public LDAPMapping getMapping(Name name) {

+	public List getMappings(Name name) {

 		if (issuerNameFilter != null) {

 			name = this.issuerNameFilter.applyFilter(name);

 		}

-		return (LDAPMapping) this.storedMappings.get(name);

+		return (List) this.storedMappings.get(name);

 	}

 	

-	public LDAPMapping getMapping(String nameString) throws LDAPException {

+	public List getMappings(String nameString) throws LDAPException {

 		RFC2253NameParser parser = new RFC2253NameParser(nameString);

 		Name name;

 		try {

@@ -78,7 +73,7 @@ public class LDAPMappingStore {
 		if (issuerNameFilter != null) {

 			name = this.issuerNameFilter.applyFilter(name);

 		}

-		return getMapping(name);

+		return this.getMappings(name);

 	}

 	

 }