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/22 23:05:48 UTC
[3/4] git commit: Fixed issues surrounding EntityDeletedImpl and
EntityVersionDeletedImpl.
Fixed issues surrounding EntityDeletedImpl and EntityVersionDeletedImpl.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31e2061a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31e2061a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31e2061a
Branch: refs/heads/two-dot-o-events
Commit: 31e2061add13c157251b8a4d401bab6bc2652c8b
Parents: fa26627
Author: grey <gr...@apigee.com>
Authored: Mon Oct 20 13:10:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Oct 20 13:10:55 2014 -0700
----------------------------------------------------------------------
.../events/EntityDeletedImpl.java | 5 ++---
.../events/EntityVersionDeletedImpl.java | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31e2061a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
index bd21dc3..bb30c8c 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
@@ -48,10 +48,9 @@ import org.slf4j.LoggerFactory;
public class EntityDeletedImpl implements EntityDeleted {
private static final Logger logger = LoggerFactory.getLogger( EntityDeletedImpl.class );
- private final EntityIndexBatch entityIndex;
- public EntityDeletedImpl(EntityIndexBatch entityIndex){
- this.entityIndex = entityIndex;
+ public EntityDeletedImpl(){
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31e2061a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
index b1edc62..56011a0 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
@@ -18,10 +18,14 @@
package org.apache.usergrid.corepersistence.events;
+import org.apache.usergrid.corepersistence.CpEntityManagerFactory;
+import org.apache.usergrid.corepersistence.CpSetup;
+import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.event.EntityVersionDeleted;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexBatch;
import org.apache.usergrid.persistence.index.IndexScope;
import org.apache.usergrid.persistence.index.impl.IndexScopeImpl;
@@ -32,23 +36,33 @@ import rx.schedulers.Schedulers;
import java.util.List;
+import com.google.inject.Inject;
+
/**
* Purge old entity versions
*/
public class EntityVersionDeletedImpl implements EntityVersionDeleted{
- private final EntityIndexBatch entityIndexBatch;
private final SerializationFig serializationFig;
- public EntityVersionDeletedImpl(EntityIndexBatch entityIndexBatch, SerializationFig fig){
- this.entityIndexBatch = entityIndexBatch;
+ @Inject
+ public EntityVersionDeletedImpl(SerializationFig fig){
this.serializationFig = fig;
}
@Override
public void versionDeleted(
final CollectionScope scope, final Id entityId, final List<MvccEntity> entityVersions) {
+
+ CpEntityManagerFactory emf = (CpEntityManagerFactory)
+ CpSetup.getInjector().getInstance( EntityManagerFactory.class );
+
+ final EntityIndex ei = emf.getManagerCache().getEntityIndex(scope);
+
+ final EntityIndexBatch entityIndexBatch = ei.createBatch();
+
+
final IndexScope indexScope = new IndexScopeImpl(
new SimpleId(scope.getOwner().getUuid(),scope.getOwner().getType()),
scope.getName()