Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LDAP-245: Added new constructor for OdmManager and setter for LdapOperations in FactoryBean.

Browse Source
This commit is contained in:
Mattias Hellborg Arthursson
2013-08-14 16:10:11 +02:00
parent b2104e4d87
commit 1cf071eb96
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
View File

@@ -62,19 +62,23 @@ public final class OdmManagerImpl implements OdmManager {
// A map of managed classes to to meta data about those classes
private final Map<Class<?>, EntityData> metaDataMap=new HashMap<Class<?>, EntityData>();
public OdmManagerImpl(ConverterManager converterManager,
LdapOperations ldapOperations,
Set<Class<?>> managedClasses) {
this.converterManager=converterManager;
this.ldapTemplate = ldapOperations;
if (managedClasses!=null) {
for (Class<?> managedClass: managedClasses) {
addManagedClass(managedClass);
}
}
}
public OdmManagerImpl(ConverterManager converterManager,
ContextSource contextSource,
Set<Class<?>> managedClasses) {
this.converterManager=converterManager;
this.ldapTemplate=new LdapTemplate(contextSource);
if (managedClasses!=null) {
for (Class<?> managedClass: managedClasses) {
addManagedClass(managedClass);
}
}
this(converterManager, new LdapTemplate(contextSource), managedClasses);
}
public OdmManagerImpl(ConverterManager converterManager,

27
odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
View File

@@ -1,12 +1,14 @@
package org.springframework.ldap.odm.core.impl;
import java.util.Set;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.FactoryBeanNotInitializedException;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.odm.typeconversion.ConverterManager;
import java.util.Set;
/**
* A Spring Factory bean which creates {@link OdmManagerImpl} instances.
* <p>
@@ -27,16 +29,25 @@ import org.springframework.ldap.odm.typeconversion.ConverterManager;
* @author Paul Harvey &lt;paul.at.pauls-place.me.uk>
*/
public final class OdmManagerImplFactoryBean implements FactoryBean {
private ContextSource contextSource=null;
private LdapOperations ldapOperations = null;
private Set<Class<?>> managedClasses=null;
private ConverterManager converterManager=null;
/**
* Set the LdapOperations instance to use to interact with the LDAP directory.
*
* @param ldapOperations the LdapOperations instance to use.
*/
public void setLdapOperations(LdapOperations ldapOperations) {
this.ldapOperations = ldapOperations;
}
/**
* Set the ContextSource to use to interact with the LDAP directory.
* @param contextSource The ContextSource to use.
*/
public void setContextSource(ContextSource contextSource) {
this.contextSource=contextSource;
this.ldapOperations = new LdapTemplate(contextSource);
}
/**
@@ -61,8 +72,8 @@ public final class OdmManagerImplFactoryBean implements FactoryBean {
* @see org.springframework.beans.factory.FactoryBean#getObject()
*/
public Object getObject() throws Exception {
if (contextSource==null) {
throw new FactoryBeanNotInitializedException("contextSource property has not been set");
if (ldapOperations==null) {
throw new FactoryBeanNotInitializedException("contextSource ldapOperations property has not been set");
}
if (managedClasses==null) {
throw new FactoryBeanNotInitializedException("managedClasses property has not been set");
@@ -71,7 +82,7 @@ public final class OdmManagerImplFactoryBean implements FactoryBean {
throw new FactoryBeanNotInitializedException("converterManager property has not been set");
}
return new OdmManagerImpl(converterManager, contextSource, managedClasses);
return new OdmManagerImpl(converterManager, ldapOperations, managedClasses);
}
/* (non-Javadoc)