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

DATAGEODE-387 - Polishing.

Browse Source 
Reorder methods according to interface order. Revert import ordering changes.

Original pull request: #45.
This commit is contained in:
Mark Paluch
2020-11-25 13:49:28 +01:00
parent cff758103a
commit 8666c68efe
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java
View File

@@ -285,11 +285,21 @@ public class SimpleGemfireRepository<T, ID> implements GemfireRepository<T, ID>
return Optional.ofNullable(value);
}
@Override
public void deleteById(@NonNull ID id) {
getTemplate().remove(id);
}
@Override
public void delete(@NonNull T entity) {
deleteById(getEntityInformation().getRequiredId(entity));
}
@Override
public void deleteAllById(@NonNull Iterable<? extends ID> ids) {
CollectionUtils.nullSafeIterable(ids).forEach(this::deleteById);
}
@Override
public void deleteAll() {
@@ -311,16 +321,6 @@ public class SimpleGemfireRepository<T, ID> implements GemfireRepository<T, ID>
CollectionUtils.nullSafeIterable(entities).forEach(this::delete);
}
@Override
public void deleteAllById(Iterable<? extends ID> ids) {
CollectionUtils.nullSafeIterable(ids).forEach(this::deleteById);
}
@Override
public void deleteById(@NonNull ID id) {
getTemplate().remove(id);
}
boolean isPartitioned(Region<?, ?> region) {
return region != null

28
spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java
View File

@@ -15,22 +15,24 @@
*/
package org.springframework.data.gemfire.repository.support;
import static java.util.Arrays.*;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.annotation.Resource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.Page;
@@ -111,7 +113,7 @@ public class SimpleGemfireRepositoryIntegrationTests {
assertThat(this.repository.count()).isEqualTo(0);
List<Person> people = asList(new Person(1L, "Jon", "Doe"), new Person(2L, "Jane", "Doe"),
List<Person> people = Arrays.asList(new Person(1L, "Jon", "Doe"), new Person(2L, "Jane", "Doe"),
new Person(3L, "Cookie", "Doe"), new Person(4L, "Pie", "Doe"), new Person(5L, "Sour", "Doe"));
people.forEach(person -> this.template.put(person.getId(), person));
@@ -156,17 +158,17 @@ public class SimpleGemfireRepositoryIntegrationTests {
this.template.put(carter.getId(), carter);
this.template.put(leroi.getId(), leroi);
Iterable<Person> result = this.repository.findAllById(asList(carter.getId(), leroi.getId()));
Iterable<Person> result = this.repository.findAllById(Arrays.asList(carter.getId(), leroi.getId()));
assertThat(result).isNotNull();
assertThat(result).hasSize(2);
assertThat(result).containsAll(asList(carter, leroi));
assertThat(result).containsAll(Arrays.asList(carter, leroi));
}
@Test
public void findAllWithIdsReturnsNoMatches() {
Iterable<Person> results = this.repository.findAllById(asList(1L, 2L));
Iterable<Person> results = this.repository.findAllById(Arrays.asList(1L, 2L));
assertThat(results).isNotNull();
assertThat(results).isEmpty();
@@ -182,7 +184,7 @@ public class SimpleGemfireRepositoryIntegrationTests {
this.template.put(kurt.getId(), kurt);
this.template.put(eddie.getId(), eddie);
Iterable<Person> results = this.repository.findAllById(asList(0L, 1L, 2L, 4L));
Iterable<Person> results = this.repository.findAllById(Arrays.asList(0L, 1L, 2L, 4L));
assertThat(results).isNotNull();
assertThat(results).hasSize(2);
@@ -226,14 +228,14 @@ public class SimpleGemfireRepositoryIntegrationTests {
assertThat(this.repository.count()).isEqualTo(0);
List<Person> people = asList(new Person(1L, "Jon", "Doe"), new Person(2L, "Jane", "Doe"),
List<Person> people = Arrays.asList(new Person(1L, "Jon", "Doe"), new Person(2L, "Jane", "Doe"),
new Person(3L, "Cookie", "Doe"), new Person(4L, "Pie", "Doe"), new Person(5L, "Sour", "Doe"));
people.forEach(person -> this.template.put(person.getId(), person));
assertThat(this.repository.count()).isEqualTo(5);
this.repository.deleteAllById(asList(1L, 2L));
this.repository.deleteAllById(Arrays.asList(1L, 2L));
assertThat(this.repository.count()).isEqualTo(3L);
assertThat(this.repository.findAll()) //
@@ -250,7 +252,7 @@ public class SimpleGemfireRepositoryIntegrationTests {
Person jonBloom = new Person(2L, "Jon", "Bloom");
Person juanBlume = new Person(3L, "Juan", "Blume");
this.repository.saveAll(asList(johnBlum, jonBloom, juanBlume));
this.repository.saveAll(Arrays.asList(johnBlum, jonBloom, juanBlume));
assertThat(this.template.getRegion().size()).isEqualTo(3);
assertThat((Person) this.template.get(johnBlum.getId())).isEqualTo(johnBlum);