From a43b0e8d5c1a235c232cb3cffe91f5ccfb368fbe Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 14 Feb 2014 14:23:08 -0600 Subject: [PATCH] LDAP-295: Fix tests --- .../impl/DefaultObjectDirectoryMapper.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java index 312b00f7..7a518650 100644 --- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java +++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java @@ -16,6 +16,23 @@ package org.springframework.ldap.odm.core.impl; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import javax.naming.Name; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.LdapDataEntry; @@ -33,23 +50,6 @@ import org.springframework.ldap.support.LdapUtils; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; -import javax.naming.Name; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - /** * Default implementation of {@link ObjectDirectoryMapper}. Unless you need to explicitly configure * converters there is typically no reason to explicitly consider yourself with this class. @@ -80,7 +80,7 @@ public class DefaultObjectDirectoryMapper implements ObjectDirectoryMapper { } else if(springVersion.compareTo("3.0") > 0) { return new ConversionServiceConverterManager(); } else { - return new ConversionServiceConverterManager(); + return new ConverterManagerImpl(); } }