You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/10/24 18:23:06 UTC
git commit: Wired in EntityDeletedFactory and changed implementations
to support using the factory.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-events 5f28208f5 -> 6e5b185e9
Wired in EntityDeletedFactory and changed implementations to support using the factory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6e5b185e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6e5b185e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6e5b185e
Branch: refs/heads/two-dot-o-events
Commit: 6e5b185e9d1760b474f4cf8d746ebec5a47a5768
Parents: 5f28208
Author: grey <gr...@apigee.com>
Authored: Fri Oct 24 09:23:06 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Oct 24 09:23:06 2014 -0700
----------------------------------------------------------------------
.../persistence/collection/EntityDeletedFactory.java | 2 +-
.../persistence/collection/guice/CollectionModule.java | 12 +++++++++++-
.../collection/impl/EntityCollectionManagerImpl.java | 2 +-
.../persistence/collection/impl/EntityDeletedTask.java | 12 +++++++-----
4 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6e5b185e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
index 5d6cecb..3c673ee 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
@@ -29,6 +29,6 @@ import java.util.UUID;
* Creates EntityDeletedTask instances
*/
public interface EntityDeletedFactory {
- public EntityDeletedTask getTask( final Id entityId, final UUID version );
+ public EntityDeletedTask getTask(final CollectionScope collectionScope, final Id entityId, final UUID version );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6e5b185e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
index c2f5d0d..263d2a1 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
@@ -29,6 +29,7 @@ import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerSync;
+import org.apache.usergrid.persistence.collection.EntityDeletedFactory;
import org.apache.usergrid.persistence.collection.EntityVersionCleanupFactory;
import org.apache.usergrid.persistence.collection.event.EntityDeleted;
import org.apache.usergrid.persistence.collection.event.EntityVersionCreated;
@@ -82,6 +83,9 @@ public class CollectionModule extends AbstractModule {
install ( new FactoryModuleBuilder()
.build( EntityVersionCleanupFactory.class ));
+ install ( new FactoryModuleBuilder()
+ .build( EntityDeletedFactory.class));
+
//bind empty list. including modules can add impelmentations
Multibinder.newSetBinder( binder(), EntityVersionDeleted.class );
Multibinder.newSetBinder( binder(), EntityVersionCreated.class );
@@ -104,7 +108,13 @@ public class CollectionModule extends AbstractModule {
@Provides
- public List<EntityVersionDeleted> emptySetInitialization(){
+ public List<EntityVersionDeleted> emptyEntityVersionDeletedInitialization(){
+ return Collections.EMPTY_LIST;
+
+ }
+
+ @Provides
+ public List<EntityDeleted> emptyEntityDeletedInitialization(){
return Collections.EMPTY_LIST;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6e5b185e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 37b2fca..5a816b5 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@ -195,7 +195,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
@Override
public Void call(final CollectionIoEvent<MvccEntity> mvccEntityCollectionIoEvent) {
MvccEntity entity = mvccEntityCollectionIoEvent.getEvent();
- Task<Void> task = entityDeletedFactory.getTask(entity.getId(),entity.getVersion());
+ Task<Void> task = entityDeletedFactory.getTask(collectionScope,entity.getId(),entity.getVersion());
taskExecutor.submit(task);
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6e5b185e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
index a082039..52962c9 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
@@ -20,6 +20,7 @@
package org.apache.usergrid.persistence.collection.impl;
+import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.netflix.astyanax.MutationBatch;
import org.apache.usergrid.persistence.collection.CollectionScope;
@@ -47,17 +48,18 @@ public class EntityDeletedTask implements Task<Void> {
private MvccLogEntrySerializationStrategy logEntrySerializationStrategy;
private MvccEntitySerializationStrategy entitySerializationStrategy;
private List<EntityDeleted> listeners;
- private CollectionScope collectionScope;
- private Id entityId;
- private UUID version;
+ private final CollectionScope collectionScope;
+ private final Id entityId;
+ private final UUID version;
private static final Logger LOG = LoggerFactory.getLogger(EntityDeletedTask.class);
+ @Inject
public EntityDeletedTask(EntityVersionCleanupFactory entityVersionCleanupFactory,
final MvccLogEntrySerializationStrategy logEntrySerializationStrategy,
final MvccEntitySerializationStrategy entitySerializationStrategy,
final List<EntityDeleted> listeners,
- CollectionScope collectionScope,
- @Assisted Id entityId, @Assisted UUID version){
+ @Assisted final CollectionScope collectionScope,
+ @Assisted final Id entityId, @Assisted final UUID version){
this.entityVersionCleanupFactory = entityVersionCleanupFactory;
this.logEntrySerializationStrategy = logEntrySerializationStrategy;
this.entitySerializationStrategy = entitySerializationStrategy;