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

LDAP-266: Integration tests of automatic repository support.

Browse Source
This commit is contained in:
Mattias Hellborg Arthursson
2013-10-14 09:21:24 +02:00
parent 1e2a060459
commit 2c3d1935dc
9 changed files with 381 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/src/main/java/org/springframework/ldap/repository/LdapRepository.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Copyright 2005-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ldap.repository;
import org.springframework.data.repository.CrudRepository;
import org.springframework.ldap.query.LdapQuery;
import javax.naming.Name;
/**
* Ldap specific extensions to CrudRepository.
*
* @author Mattias Hellborg Arthursson
* @since 2.0
*/
public interface LdapRepository<T> extends CrudRepository<T, Name> {
/**
* Find one entry matching the specified query.
*
* @param ldapQuery the query specification.
* @return the found entry or <code>null</code> if no matching entry was found.
* @throws org.springframework.dao.IncorrectResultSizeDataAccessException if more than one entry matches the query.
*/
T findOne(LdapQuery ldapQuery);
/**
* Find all entries matching the specified query.
*
* @param ldapQuery the query specification.
* @return the entries matching the query.
*/
Iterable<T> findAll(LdapQuery ldapQuery);
}

1
core/src/main/java/org/springframework/ldap/repository/LdapRepositoryFactory.java
View File

@@ -24,6 +24,7 @@ import org.springframework.ldap.core.LdapOperations;
import java.io.Serializable;
/**
* Factory to create {@link LdapRepository} instances.
* @author Mattias Hellborg Arthursson
* @since 2.0
*/

18
core/src/main/java/org/springframework/ldap/repository/LdapRepositoryFactoryBean.java
View File

@@ -1,3 +1,19 @@
/*
* Copyright 2005-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ldap.repository;
import org.springframework.data.repository.Repository;
@@ -9,6 +25,8 @@ import org.springframework.util.Assert;
import javax.naming.Name;
/**
* {@link org.springframework.beans.factory.FactoryBean} to create {@link LdapRepository} instances.
*
* @author Mattias Hellborg Arthursson
* @since 2.0
*/

55
core/src/main/java/org/springframework/ldap/repository/SimpleLdapRepository.java
View File

@@ -16,8 +16,8 @@
package org.springframework.ldap.repository;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.data.domain.Persistable;
import org.springframework.data.repository.CrudRepository;
import org.springframework.ldap.NameNotFoundException;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler;
@@ -28,6 +28,7 @@ import org.springframework.util.Assert;
import javax.naming.Name;
import java.util.Iterator;
import java.util.LinkedList;
import static org.springframework.ldap.query.LdapQueryBuilder.query;
@@ -37,7 +38,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query;
* @author Mattias Hellborg Arthursson
* @since 2.0
*/
public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
public class SimpleLdapRepository<T> implements LdapRepository<T> {
private static final String OBJECTCLASS_ATTRIBUTE = "objectclass";
private final LdapOperations ldapOperations;
private final ObjectDirectoryMapper odm;
@@ -64,7 +65,7 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
Persistable persistable = (Persistable) entity;
return persistable.isNew();
} else {
return id != null;
return id == null;
}
}
@@ -74,15 +75,21 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
Name declaredId = odm.getId(entity);
Name calculatedId = odm.getCalculatedId(entity);
if(isNew(entity, declaredId)) {
if(declaredId == null) {
odm.setId(entity, calculatedId);
if (isNew(entity, declaredId)) {
if (declaredId == null) {
if (calculatedId != null) {
odm.setId(entity, calculatedId);
} else {
throw new IllegalStateException(String.format("Unable to calculate id of entry of class %s - " +
"ID not set and unable to calculate new ID. Missing @DnAttribute annotations with index?",
entity.getClass()));
}
}
ldapOperations.create(entity);
} else {
ldapOperations.update(entity);
if(declaredId != calculatedId) {
if (declaredId != calculatedId) {
odm.setId(entity, calculatedId);
}
}
@@ -92,7 +99,7 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
@Override
public <S extends T> Iterable<S> save(Iterable<S> entities) {
return new DelegatingIterable<S, S>(entities, new Function<S, S>() {
return new TransformingIterable<S, S>(entities, new Function<S, S>() {
@Override
public S transform(S entry) {
return save(entry);
@@ -110,8 +117,25 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
}
}
@Override
public Iterable<T> findAll(LdapQuery ldapQuery) {
Assert.notNull(ldapQuery, "LdapQuery must not be null");
return ldapOperations.find(ldapQuery, clazz);
}
@Override
public T findOne(LdapQuery ldapQuery) {
Assert.notNull(ldapQuery, "LdapQuery must not be null");
try {
return ldapOperations.findOne(ldapQuery, clazz);
} catch (EmptyResultDataAccessException e) {
return null;
}
}
@Override
public boolean exists(Name name) {
Assert.notNull(name, "Id must not be null");
return findOne(name) != null;
}
@@ -122,12 +146,21 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
@Override
public Iterable<T> findAll(final Iterable<Name> names) {
return new DelegatingIterable<Name, T>(names, new Function<Name, T>() {
Iterable<T> found = new TransformingIterable<Name, T>(names, new Function<Name, T>() {
@Override
public T transform(Name name) {
return findOne(name);
}
});
LinkedList<T> list = new LinkedList<T>();
for (T entry : found) {
if (entry != null) {
list.add(entry);
}
}
return list;
}
@Override
@@ -154,11 +187,11 @@ public class SimpleLdapRepository<T> implements CrudRepository<T, Name> {
delete(findAll());
}
private static class DelegatingIterable<F, T> implements Iterable<T> {
private final static class TransformingIterable<F, T> implements Iterable<T> {
private final Iterable<F> target;
private final Function<F, T> function;
private DelegatingIterable(Iterable<F> target, Function<F, T> function) {
private TransformingIterable(Iterable<F> target, Function<F, T> function) {
this.target = target;
this.function = function;
}