From 96bf1d3c89c174e13378386ccedb9619d666d14a Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Fri, 7 Sep 2007 10:50:01 +0000 Subject: [PATCH] Changed to ContextMapper to get rid of attribute multivalue handling. --- .../ldap/control/SupportedControlsITest.java | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/control/SupportedControlsITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/control/SupportedControlsITest.java index 2b50a90f..58880164 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/control/SupportedControlsITest.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/control/SupportedControlsITest.java @@ -17,14 +17,10 @@ package org.springframework.ldap.control; import java.util.Arrays; -import java.util.LinkedList; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; import org.springframework.ldap.AbstractLdapTemplateIntegrationTest; -import org.springframework.ldap.core.AttributesMapper; +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.LdapTemplate; /** @@ -46,13 +42,13 @@ public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest /** * Maps the 'supportedcontrol' attribute to a string array. */ - final AttributesMapper mapper = new AttributesMapper() { - public Object mapFromAttributes(Attributes attributes) - throws NamingException { - NamingEnumeration enumeration = attributes.get( - SUPPORTED_CONTROL).getAll(); - return toStringArray(enumeration); + ContextMapper mapper = new ContextMapper() { + + public Object mapFromContext(Object ctx) { + DirContextAdapter adapter = (DirContextAdapter) ctx; + return adapter.getStringAttributes(SUPPORTED_CONTROL); } + }; String[] controls = (String[]) tested.lookup("", @@ -71,12 +67,4 @@ public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest public void setTested(LdapTemplate tested) { this.tested = tested; } - - private String[] toStringArray(NamingEnumeration enumeration) { - LinkedList list = new LinkedList(); - while (enumeration.hasMoreElements()) { - list.add((String) enumeration.nextElement()); - } - return (String[]) list.toArray(new String[0]); - } }