From aa6e412602f8bf02df48d4fe02e81e5b1ddcfcf2 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 3 May 2017 12:38:00 +0200 Subject: [PATCH] DATAKV-176 - Adapt to API changes in repository interfaces. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now follow a more consistent naming scheme for the methods in repository that are driven by the following guidelines: * Methods referring to an identifier now all end on …ById(…). * Methods taking or returning a collection are named …All(…) Please see DATACMNS-944 for details. --- .../support/KeyValueRepositoryFactory.java | 2 +- .../support/SimpleKeyValueRepository.java | 18 ++++++------- .../SimpleKeyValueRepositoryUnitTests.java | 6 ++--- .../data/map/AbstractRepositoryUnitTests.java | 26 +++++++++---------- .../QuerydslKeyValueRepositoryUnitTests.java | 20 +++++++------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java index be777f5..0c91be7 100644 --- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java +++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java @@ -111,7 +111,7 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport { */ @Override @SuppressWarnings("unchecked") - public EntityInformation getEntityInformation(Class domainClass) { + public EntityInformation getEntityInformation(Class domainClass) { PersistentEntity entity = (PersistentEntity) context.getPersistentEntity(domainClass).get(); PersistentEntityInformation entityInformation = new PersistentEntityInformation<>(entity); diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java index 80c7abc..5b8c66c 100644 --- a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java +++ b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java @@ -107,7 +107,7 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable) */ @Override - public Iterable save(Iterable entities) { + public Iterable saveAll(Iterable entities) { for (S entity : entities) { save(entity); @@ -121,7 +121,7 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable) */ @Override - public Optional findOne(ID id) { + public Optional findById(ID id) { return operations.findById(id, entityInformation.getJavaType()); } @@ -130,8 +130,8 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable) */ @Override - public boolean exists(ID id) { - return findOne(id) != null; + public boolean existsById(ID id) { + return findById(id) != null; } /* @@ -148,13 +148,13 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) */ @Override - public Iterable findAll(Iterable ids) { + public Iterable findAllById(Iterable ids) { List result = new ArrayList<>(); for (ID id : ids) { - Optional candidate = findOne(id); + Optional candidate = findById(id); if (candidate.isPresent()) { result.add(candidate.get()); @@ -178,7 +178,7 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable) */ @Override - public void delete(ID id) { + public void deleteById(ID id) { operations.delete(id, entityInformation.getJavaType()); } @@ -188,7 +188,7 @@ public class SimpleKeyValueRepository implements Key */ @Override public void delete(T entity) { - delete(entityInformation.getId(entity) + deleteById(entityInformation.getId(entity) .orElseThrow(() -> new IllegalArgumentException("Cannot delete entity with 'null' id."))); } @@ -197,7 +197,7 @@ public class SimpleKeyValueRepository implements Key * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable) */ @Override - public void delete(Iterable entities) { + public void deleteAll(Iterable entities) { for (T entity : entities) { delete(entity); diff --git a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java index 5751ddf..0333df6 100644 --- a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java @@ -83,7 +83,7 @@ public class SimpleKeyValueRepositoryUnitTests { Foo one = new Foo("one"); Foo two = new Foo("one"); - repo.save(Arrays.asList(one, two)); + repo.saveAll(Arrays.asList(one, two)); verify(opsMock, times(1)).insert(eq(one)); verify(opsMock, times(1)).insert(eq(two)); } @@ -102,7 +102,7 @@ public class SimpleKeyValueRepositoryUnitTests { @Test // DATACMNS-525 public void deleteById() { - repo.delete("one"); + repo.deleteById("one"); verify(opsMock, times(1)).delete(eq("one"), eq(Foo.class)); } @@ -119,7 +119,7 @@ public class SimpleKeyValueRepositoryUnitTests { public void findAllIds() { when(opsMock.findById(any(Serializable.class), any(Class.class))).thenReturn(Optional.empty()); - repo.findAll(Arrays.asList("one", "two", "three")); + repo.findAllById(Arrays.asList("one", "two", "three")); verify(opsMock, times(3)).findById(anyString(), eq(Foo.class)); } diff --git a/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java b/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java index bb3d8cf..5dec113 100644 --- a/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java @@ -70,7 +70,7 @@ public abstract class AbstractRepositoryUnitTests page = repository.findByAge(19, PageRequest.of(0, 1)); assertThat(page.hasNext(), is(true)); @@ -112,7 +112,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findByAgeGreaterThanOrderByAgeAscFirstnameDesc(2); @@ -149,7 +149,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findByAgeGreaterThan(0, Sort.by("firstname")); @@ -160,7 +160,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findByAgeGreaterThan(0, Sort.by("firstname"), PersonSummary.class); @@ -171,7 +171,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findByFirstnameIn(Arrays.asList(CERSEI.getFirstname(), JAIME.getFirstname())); @@ -182,7 +182,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findByFirstnameIn(Arrays.asList(CERSEI.getFirstname(), JAIME.getFirstname())); @@ -194,7 +194,7 @@ public abstract class AbstractRepositoryUnitTests result = repository.findAll(QPerson.person.age.eq(CERSEI.getAge())); assertThat(result, containsInAnyOrder(CERSEI, JAIME)); @@ -65,7 +65,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATACMNS-525 public void findWithPaginationWorksCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Page page1 = repository.findAll(QPerson.person.age.eq(CERSEI.getAge()), PageRequest.of(0, 1)); assertThat(page1.getTotalElements(), is(2L)); @@ -83,7 +83,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATACMNS-525 public void findAllUsingOrderSpecifierWorksCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Iterable result = repository.findAll(QPerson.person.age.eq(CERSEI.getAge()), QPerson.person.firstname.desc()); @@ -94,7 +94,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATACMNS-525 public void findAllUsingPageableWithSortWorksCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Iterable result = repository.findAll(QPerson.person.age.eq(CERSEI.getAge()), PageRequest.of(0, 10, Direction.DESC, "firstname")); @@ -105,7 +105,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATACMNS-525 public void findAllUsingPagableWithQSortWorksCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Iterable result = repository.findAll(QPerson.person.age.eq(CERSEI.getAge()), PageRequest.of(0, 10, new QSort(QPerson.person.firstname.desc()))); @@ -116,7 +116,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATAKV-90 public void findAllWithOrderSpecifierWorksCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Iterable result = repository.findAll(new QSort(QPerson.person.firstname.desc())); @@ -126,7 +126,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATAKV-90 public void findAllShouldIgnoreNullOrderSpecifier() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); Iterable result = repository.findAll((QSort) null); @@ -136,7 +136,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATAKV-95 public void executesExistsCorrectly() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); assertThat(repository.exists(QPerson.person.age.eq(CERSEI.getAge())), is(true)); } @@ -144,7 +144,7 @@ public class QuerydslKeyValueRepositoryUnitTests extends AbstractRepositoryUnitT @Test // DATAKV-96 public void shouldSupportFindAllWithPredicateAndSort() { - repository.save(LENNISTERS); + repository.saveAll(LENNISTERS); List users = Lists.newArrayList(repository.findAll(person.age.gt(0), Sort.by(Direction.ASC, "firstname")));