From c0ead79916b838b2e32202df532a7fc6ef5e6198 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 25 Nov 2020 14:10:29 +0100 Subject: [PATCH] DATAKV-330 - Polishing. Reorder methods. Original pull request: #52. --- .../support/SimpleKeyValueRepository.java | 96 +++++++++++-------- .../SimpleKeyValueRepositoryUnitTests.java | 7 +- 2 files changed, 58 insertions(+), 45 deletions(-) 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 80e55d5..5969374 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 @@ -30,6 +30,8 @@ import org.springframework.data.repository.core.EntityInformation; import org.springframework.util.Assert; /** + * Simple {@link KeyValueRepository} implementation. + * * @author Christoph Strobl * @author Oliver Gierke * @author Mark Paluch @@ -58,38 +60,9 @@ public class SimpleKeyValueRepository implements KeyValueRepository findAll(Sort sort) { - - Assert.notNull(sort, "Sort must not be null!"); - - return operations.findAll(sort, entityInformation.getJavaType()); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable) - */ - @Override - public Page findAll(Pageable pageable) { - - Assert.notNull(pageable, "Pageable must not be null!"); - - if (pageable.isUnpaged()) { - List result = findAll(); - return new PageImpl<>(result, Pageable.unpaged(), result.size()); - } - - Iterable content = operations.findInRange(pageable.getOffset(), pageable.getPageSize(), pageable.getSort(), - entityInformation.getJavaType()); - - return new PageImpl<>(IterableConverter.toList(content), pageable, - this.operations.count(entityInformation.getJavaType())); - } + // ------------------------------------------------------------------------- + // Methods from CrudRepository + // ------------------------------------------------------------------------- /* * (non-Javadoc) @@ -206,16 +179,8 @@ public class SimpleKeyValueRepository implements KeyValueRepository entities) { - - Assert.notNull(entities, "The given Iterable of entities must not be null!"); - - entities.forEach(this::delete); - } - @Override public void deleteAllById(Iterable ids) { @@ -224,6 +189,18 @@ public class SimpleKeyValueRepository implements KeyValueRepository entities) { + + Assert.notNull(entities, "The given Iterable of entities must not be null!"); + + entities.forEach(this::delete); + } + /* * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#deleteAll() @@ -232,4 +209,41 @@ public class SimpleKeyValueRepository implements KeyValueRepository findAll(Sort sort) { + + Assert.notNull(sort, "Sort must not be null!"); + + return operations.findAll(sort, entityInformation.getJavaType()); + } + + /* + * (non-Javadoc) + * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable) + */ + @Override + public Page findAll(Pageable pageable) { + + Assert.notNull(pageable, "Pageable must not be null!"); + + if (pageable.isUnpaged()) { + List result = findAll(); + return new PageImpl<>(result, Pageable.unpaged(), result.size()); + } + + Iterable content = operations.findInRange(pageable.getOffset(), pageable.getPageSize(), pageable.getSort(), + entityInformation.getJavaType()); + + return new PageImpl<>(IterableConverter.toList(content), pageable, + this.operations.count(entityInformation.getJavaType())); + } } 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 093445d..634a276 100644 --- a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java @@ -15,7 +15,6 @@ */ package org.springframework.data.keyvalue.repository; -import static java.util.Arrays.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -96,7 +95,7 @@ public class SimpleKeyValueRepositoryUnitTests { Foo one = new Foo("one"); Foo two = new Foo("two"); - repo.saveAll(asList(one, two)); + repo.saveAll(Arrays.asList(one, two)); verify(opsMock, times(1)).insert(eq(one)); verify(opsMock, times(1)).insert(eq(two)); } @@ -123,7 +122,7 @@ public class SimpleKeyValueRepositoryUnitTests { @Test // DATAKV-330 public void deleteAllById() { - repo.deleteAllById(asList("one", "two")); + repo.deleteAllById(Arrays.asList("one", "two")); verify(opsMock, times(1)).delete(eq("one"), eq(Foo.class)); verify(opsMock, times(1)).delete(eq("two"), eq(Foo.class)); @@ -142,7 +141,7 @@ public class SimpleKeyValueRepositoryUnitTests { public void findAllIds() { when(opsMock.findById(any(), any(Class.class))).thenReturn(Optional.empty()); - repo.findAllById(asList("one", "two", "three")); + repo.findAllById(Arrays.asList("one", "two", "three")); verify(opsMock, times(3)).findById(anyString(), eq(Foo.class)); }