From 4733f7e6e2836c008904f70624feffcfa14ffcf3 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 3 May 2017 13:01:16 +0200 Subject: [PATCH] DATALDAP-35 - Adapt to API changes in repository interfaces. Related ticket: DATACMNS-944 --- .../support/LdapRepositoryFactory.java | 3 +- .../support/SimpleLdapRepository.java | 31 ++++++++++--------- .../repository/SimpleLdapRepositoryTests.java | 11 ++++--- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java index eff531a..ccc0e76 100644 --- a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java +++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java @@ -44,6 +44,7 @@ import org.springframework.util.Assert; * @author Mattias Hellborg Arthursson * @author Eddu Melendez * @author Mark Paluch + * @author Jens Schauder */ public class LdapRepositoryFactory extends RepositoryFactorySupport { @@ -67,7 +68,7 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport { * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) */ @Override - public EntityInformation getEntityInformation(Class domainClass) { + public EntityInformation getEntityInformation(Class domainClass) { return null; } diff --git a/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java b/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java index 72f9643..67db254 100644 --- a/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java +++ b/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java @@ -41,6 +41,7 @@ import org.springframework.util.Assert; * * @author Mattias Hellborg Arthursson * @author Mark Paluch + * @author Jens Schauder */ public class SimpleLdapRepository implements LdapRepository { @@ -112,10 +113,10 @@ public class SimpleLdapRepository implements LdapRepository { } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable) */ @Override - public Iterable save(Iterable entities) { + public Iterable saveAll(Iterable entities) { return StreamSupport.stream(entities.spliterator(), false) // .map(this::save) // @@ -123,10 +124,10 @@ public class SimpleLdapRepository implements LdapRepository { } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable) */ @Override - public Optional findOne(Name name) { + public Optional findById(Name name) { Assert.notNull(name, "Id must not be null"); @@ -163,14 +164,14 @@ public class SimpleLdapRepository implements LdapRepository { } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#existsById(java.io.Serializable) */ @Override - public boolean exists(Name name) { + public boolean existsById(Name name) { Assert.notNull(name, "Id must not be null"); - return findOne(name) != null; + return findById(name) != null; } /* (non-Javadoc) @@ -182,22 +183,22 @@ public class SimpleLdapRepository implements LdapRepository { } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable) */ @Override - public List findAll(final Iterable names) { + public List findAllById(final Iterable names) { return StreamSupport.stream(names.spliterator(), false) // - .map(this::findOne) // + .map(this::findById) // .flatMap(Optionals::toStream) // .collect(Collectors.toList()); } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#deleteById(java.io.Serializable) */ @Override - public void delete(Name name) { + public void deleteById(Name name) { Assert.notNull(name, "Id must not be null"); @@ -216,10 +217,10 @@ public class SimpleLdapRepository implements LdapRepository { } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable) */ @Override - public void delete(Iterable entities) { + public void deleteAll(Iterable entities) { entities.forEach(this::delete); } @@ -228,6 +229,6 @@ public class SimpleLdapRepository implements LdapRepository { */ @Override public void deleteAll() { - delete(findAll()); + deleteAll(findAll()); } } diff --git a/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java b/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java index 4a2d41d..3cd7dc1 100644 --- a/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java +++ b/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java @@ -47,6 +47,7 @@ import org.springframework.ldap.support.LdapUtils; * * @author Mattias Hellborg Arthursson * @author Mark Paluch + * @author Jens Schauder */ @RunWith(MockitoJUnitRunner.class) public class SimpleLdapRepositoryTests { @@ -163,7 +164,7 @@ public class SimpleLdapRepositoryTests { when(ldapOperationsMock.findByDn(expectedName, Object.class)).thenReturn(expectedResult); - Optional actualResult = tested.findOne(expectedName); + Optional actualResult = tested.findById(expectedName); assertThat(actualResult).contains(expectedResult); } @@ -175,7 +176,7 @@ public class SimpleLdapRepositoryTests { when(ldapOperationsMock.findByDn(expectedName, Object.class)).thenThrow(new NameNotFoundException("")); - Optional actualResult = tested.findOne(expectedName); + Optional actualResult = tested.findById(expectedName); assertThat(actualResult).isNotPresent(); } @@ -187,7 +188,7 @@ public class SimpleLdapRepositoryTests { when(ldapOperationsMock.findByDn(expectedName, Object.class)).thenReturn(null); - Optional actualResult = tested.findOne(expectedName); + Optional actualResult = tested.findById(expectedName); assertThat(actualResult).isNotPresent(); } @@ -204,7 +205,7 @@ public class SimpleLdapRepositoryTests { when(ldapOperationsMock.findByDn(expectedName1, Object.class)).thenReturn(expectedResult1); when(ldapOperationsMock.findByDn(expectedName2, Object.class)).thenReturn(expectedResult2); - Iterable actualResult = tested.findAll(Arrays.asList(expectedName1, expectedName2)); + Iterable actualResult = tested.findAllById(Arrays.asList(expectedName1, expectedName2)); Iterator iterator = actualResult.iterator(); assertThat(iterator.next()).isSameAs(expectedResult1); @@ -224,7 +225,7 @@ public class SimpleLdapRepositoryTests { when(ldapOperationsMock.findByDn(expectedName1, Object.class)).thenReturn(null); when(ldapOperationsMock.findByDn(expectedName2, Object.class)).thenReturn(expectedResult2); - Iterable actualResult = tested.findAll(Arrays.asList(expectedName1, expectedName2)); + Iterable actualResult = tested.findAllById(Arrays.asList(expectedName1, expectedName2)); Iterator iterator = actualResult.iterator(); assertThat(iterator.next()).isSameAs(expectedResult2);