Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
</licenses>

<properties>
<spring.version>4.2.0.RELEASE</spring.version>
<spring.version>4.3.1.RELEASE</spring.version>
<spring-data.version>Gosling-SR1</spring-data.version>
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<aws-java-sdk.version>1.10.39</aws-java-sdk.version>
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
<aws-java-sdk.version>1.11.15</aws-java-sdk.version>
<mockito.version>1.10.19</mockito.version>

<cdi.version>1.2</cdi.version>
<logback.version>1.1.3</logback.version>
<logback.version>1.1.7</logback.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ public interface DynamoDBOperations {

public void save(Object entity);
public void batchSave(List<?> entities);
public void batchSave(Iterable<?> entities);

public void delete(Object entity);
public void batchDelete(List<?> entities);
public void batchDelete(Iterable<?> entities);

public <T> String getOverriddenTableName(Class<T> domainClass, String tableName);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.socialsignin.spring.data.dynamodb.core;

import java.util.Iterator;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -135,17 +136,24 @@ public void save(Object entity) {
}

@Override
@Deprecated
public void batchSave(List<?> entities) {
for (Object entity : entities)
{
maybeEmitEvent(new BeforeSaveEvent<Object>(entity));
}
dynamoDBMapper.batchSave(entities);
for (Object entity : entities)
{
maybeEmitEvent(new AfterSaveEvent<Object>(entity));
}
Iterable<?> iterableEntities = entities;
batchSave(iterableEntities);
}

@Override
public void batchSave(Iterable<?> entities) {
Iterator<?> iteratorBefore = entities.iterator();
while( iteratorBefore.hasNext() ){
maybeEmitEvent(new BeforeSaveEvent<Object>(iteratorBefore.next()));
}
dynamoDBMapper.batchSave(entities);
Iterator<?> iteratorAfter = entities.iterator();
while( iteratorAfter.hasNext() ){
maybeEmitEvent(new BeforeSaveEvent<Object>(iteratorAfter.next()));
}
}

@Override
public void delete(Object entity) {
Expand All @@ -156,17 +164,23 @@ public void delete(Object entity) {
}

@Override
@Deprecated
public void batchDelete(List<?> entities) {
for (Object entity : entities)
{
maybeEmitEvent(new BeforeDeleteEvent<Object>(entity));
}
dynamoDBMapper.batchDelete(entities);
for (Object entity : entities)
{
maybeEmitEvent(new AfterDeleteEvent<Object>(entity));
}

Iterable<?> iterableEntities = entities;
batchDelete(iterableEntities);
}

@Override
public void batchDelete(Iterable<?> entities) {
Iterator<?> iteratorBefore = entities.iterator();
while( iteratorBefore.hasNext() ){
maybeEmitEvent(new BeforeDeleteEvent<Object>(iteratorBefore.next()));
}
dynamoDBMapper.batchDelete(entities);
Iterator<?> iteratorAfter = entities.iterator();
while( iteratorAfter.hasNext() ){
maybeEmitEvent(new AfterDeleteEvent<Object>(iteratorAfter.next()));
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,9 @@ public <S extends T> S save(S entity) {
}

@Override
public <S extends T> List<S> save(Iterable<S> entities) {
final List<S> entityList = new ArrayList<S>();
for (S entity : entities) {
entityList.add(entity);
}
dynamoDBOperations.batchSave(entityList);
return entityList;
public <S extends T> Iterable<S> save(Iterable<S> entities) {
dynamoDBOperations.batchSave(entities);
return entities;
}

@Override
Expand Down Expand Up @@ -201,12 +197,7 @@ public void delete(T entity) {
public void delete(Iterable<? extends T> entities) {

Assert.notNull(entities, "The given Iterable of entities not be null!");

List<T> entityList = new ArrayList<T>();
for (T entity : entities) {
entityList.add(entity);
}
dynamoDBOperations.batchDelete(entityList);
dynamoDBOperations.batchDelete(entities);
}

@Override
Expand Down