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

SGF-623 - Adapt to API changes in repository interfaces.

Browse Source
This commit is contained in:
Oliver Gierke
2017-05-03 13:42:22 +02:00
parent 939e1087b7
commit 5391b7b5f0
13 changed files with 78 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.gemfire.repository;
import java.io.Serializable;
import org.springframework.data.domain.Sort;
import org.springframework.data.repository.CrudRepository;
@@ -28,8 +26,7 @@ import org.springframework.data.repository.CrudRepository;
* @see java.io.Serializable
* @see org.springframework.data.repository.CrudRepository
*/
@SuppressWarnings("unused")
public interface GemfireRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {
public interface GemfireRepository<T, ID> extends CrudRepository<T, ID> {
/**
* Returns all entities sorted by the given options.

83
src/main/java/org/springframework/data/gemfire/repository/Wrapper.java
View File

@@ -15,88 +15,17 @@
*/
package org.springframework.data.gemfire.repository;
import java.io.Serializable;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import lombok.NonNull;
import lombok.Value;
/**
* Simple value object to hold an entity alongside an external key the entity shall be stored under.
*
* @author Oliver Gierke
*/
public final class Wrapper<T, KEY extends Serializable> {
private final KEY key;
private final T entity;
/**
* The entity to handle as well as the key.
*
* @param entity the application domain object/entity to wrap.
* @param key must not be {@literal null}.
*/
public Wrapper(T entity, KEY key) {
Assert.notNull(key);
this.entity = entity;
this.key = key;
}
/**
* @return the key
*/
public KEY getKey() {
return key;
}
/**
* @return the entity
*/
public T getEntity() {
return entity;
}
/*
* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object value) {
if (value == this) {
return true;
}
if (!(value instanceof Wrapper)) {
return false;
}
Wrapper<?, ?> that = (Wrapper<?, ?>) value;
return (this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.entity, that.entity));
}
/*
* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
int result = 17;
result += 31 * key.hashCode();
result += 31 * ObjectUtils.nullSafeHashCode(entity);
return result;
}
/*
* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return ObjectUtils.nullSafeToString(getEntity());
}
@Value
public class Wrapper<T, KEY> {
T entity;
@NonNull KEY key;
}

4
src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
View File

@@ -16,8 +16,6 @@
package org.springframework.data.gemfire.repository.query;
import java.io.Serializable;
import org.springframework.data.gemfire.mapping.GemfirePersistentEntity;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.repository.core.support.PersistentEntityInformation;
@@ -32,7 +30,7 @@ import org.springframework.data.repository.core.support.PersistentEntityInformat
* @see org.springframework.data.gemfire.repository.query.GemfireEntityInformation
* @see org.springframework.data.repository.core.support.PersistentEntityInformation
*/
public class DefaultGemfireEntityInformation<T, ID extends Serializable> extends PersistentEntityInformation<T, ID>
public class DefaultGemfireEntityInformation<T, ID> extends PersistentEntityInformation<T, ID>
implements GemfireEntityInformation<T, ID> {
private final GemfirePersistentEntity<T> persistentEntity;

4
src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.gemfire.repository.query;
import java.io.Serializable;
import org.apache.geode.cache.Region;
import org.springframework.data.repository.core.EntityInformation;
@@ -25,7 +23,7 @@ import org.springframework.data.repository.core.EntityInformation;
*
* @author Oliver Gierke
*/
public interface GemfireEntityInformation<T, ID extends Serializable> extends EntityInformation<T, ID> {
public interface GemfireEntityInformation<T, ID> extends EntityInformation<T, ID> {
/**
* Returns the name of the {@link Region} the entity is held in.

5
src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
View File

@@ -16,7 +16,7 @@
package org.springframework.data.gemfire.repository.support;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.*;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -81,7 +81,8 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
*/
@Override
@SuppressWarnings("unchecked")
public <T, ID extends Serializable> GemfireEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
public <T, ID> GemfireEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
GemfirePersistentEntity<T> entity = (GemfirePersistentEntity<T>) mappingContext.getPersistentEntity(domainClass)
.orElseThrow(() -> newIllegalArgumentException("Unable to resolve PersistentEntity for type [%s]", domainClass));

65
src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java
View File

@@ -16,10 +16,7 @@
package org.springframework.data.gemfire.repository.support;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +38,8 @@ import org.springframework.data.gemfire.repository.Wrapper;
import org.springframework.data.gemfire.repository.query.QueryString;
import org.springframework.data.gemfire.util.CollectionUtils;
import org.springframework.data.repository.core.EntityInformation;
import org.springframework.data.util.StreamUtils;
import org.springframework.data.util.Streamable;
import org.springframework.util.Assert;
/**
@@ -81,8 +80,8 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
*/
@Override
public <U extends T> U save(U entity) {
ID id = entityInformation.getId(entity).orElseThrow(
() -> newIllegalArgumentException("ID for entity [%s] is required", entity));
ID id = entityInformation.getRequiredId(entity);
template.put(id, entity);
@@ -94,16 +93,14 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
* @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
*/
@Override
public <U extends T> Iterable<U> save(Iterable<U> entities) {
public <U extends T> Iterable<U> saveAll(Iterable<U> entities) {
Map<ID, U> entitiesToSave = new HashMap<>();
for (U entity : entities) {
ID id = entityInformation.getId(entity).orElseThrow(
() -> newIllegalArgumentException("ID for entity [%s] is required", entity));
entitiesToSave.put(id, entity);
}
entities.forEach(entity -> {
entitiesToSave.put(entityInformation.getRequiredId(entity), entity);
});
template.putAll(entitiesToSave);
return entitiesToSave.values();
@@ -134,20 +131,19 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#existsById(java.lang.Object)
*/
@Override
public boolean exists(ID id) {
return findOne(id).isPresent();
public boolean existsById(ID id) {
return findById(id).isPresent();
}
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object)
*/
@Override
@SuppressWarnings("unchecked")
public Optional<T> findOne(ID id) {
public Optional<T> findById(ID id) {
return Optional.ofNullable(template.get(id));
}
@@ -180,16 +176,12 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
* @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable)
*/
@Override
@SuppressWarnings("unchecked")
public Collection<T> findAll(Iterable<ID> ids) {
List<ID> parameters = new ArrayList<>();
for (ID id : ids) {
parameters.add(id);
}
public Collection<T> findAllById(Iterable<ID> ids) {
List<ID> parameters = Streamable.of(ids).stream().collect(StreamUtils.toUnmodifiableList());
return CollectionUtils.<ID, T>nullSafeMap(template.getAll(parameters)).values().stream()
.filter(Objects::nonNull).collect(Collectors.toList());
@@ -197,10 +189,10 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object)
*/
@Override
public void delete(ID id) {
public void deleteById(ID id) {
template.remove(id);
}
@@ -210,7 +202,7 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
*/
@Override
public void delete(T entity) {
delete(entityInformation.getId(entity).orElseThrow(() -> new IllegalArgumentException("ID is required")));
deleteById(entityInformation.getRequiredId(entity));
}
/*
@@ -218,10 +210,8 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
* @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
*/
@Override
public void delete(Iterable<? extends T> entities) {
for (T entity : entities) {
delete(entity);
}
public void deleteAll(Iterable<? extends T> entities) {
entities.forEach(this::delete);
}
/*
@@ -229,7 +219,7 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
* @see org.apache.geode.cache.Region#getAttributes()
* @see org.apache.geode.cache.RegionAttributes#getDataPolicy()
*/
boolean isPartitioned(Region region) {
boolean isPartitioned(Region<?, ?> region) {
return (region != null && region.getAttributes() != null
&& isPartitioned(region.getAttributes().getDataPolicy()));
}
@@ -247,7 +237,7 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
* @see org.apache.geode.cache.Region#getRegionService()
* @see org.apache.geode.cache.Cache#getCacheTransactionManager()
*/
boolean isTransactionPresent(Region region) {
boolean isTransactionPresent(Region<?, ?> region) {
return (region.getRegionService() instanceof Cache
&& isTransactionPresent(((Cache) region.getRegionService()).getCacheTransactionManager()));
}
@@ -261,8 +251,7 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
}
/* (non-Javadoc) */
@SuppressWarnings("unchecked")
void doRegionClear(Region region) {
<K> void doRegionClear(Region<K, ?> region) {
region.removeAll(region.keySet());
}