You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/22 16:36:23 UTC
[24/50] incubator-usergrid git commit: Merge branch
'two-dot-o-events' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-events
Merge branch 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes to StaleEntityCleapupTest, which is looking good now, also some import cleanups.
test fixes
Conflicts:
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/216e0505
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/216e0505
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/216e0505
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 216e0505b0b3d1b52c18043554f8b365ae2c38ee
Parents: 3294f00 3d3bbed
Author: grey <gr...@apigee.com>
Authored: Tue Nov 4 15:52:43 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Nov 4 15:52:43 2014 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/GuiceModule.java | 1 -
.../events/EntityVersionCreatedHandler.java | 9 +----
.../corepersistence/StaleIndexCleanupTest.java | 37 ++++++++------------
.../corepersistence/TestGuiceModule.java | 2 --
.../collection/EntityCollectionManager.java | 1 -
.../impl/EntityVersionCreatedTaskTest.java | 21 -----------
.../index/impl/EsEntityIndexBatchImpl.java | 5 ---
7 files changed, 15 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/216e0505/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
index 525c3a2,266b0f9..e47d460
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
@@@ -21,7 -21,8 +21,6 @@@ package org.apache.usergrid.persistence
import java.util.Collection;
import org.apache.usergrid.persistence.core.util.Health;
-
-import org.apache.usergrid.persistence.collection.event.EntityDeleted;
-
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.field.Field;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/216e0505/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCreatedTaskTest.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCreatedTaskTest.java
index 3ba8fe1,92bb3ce..90055a4
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCreatedTaskTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCreatedTaskTest.java
@@@ -17,19 -17,11 +17,10 @@@
*/
package org.apache.usergrid.persistence.collection.impl;
- import com.google.common.base.Optional;
--import com.google.common.util.concurrent.ListenableFuture;
- import com.netflix.astyanax.Keyspace;
- import com.netflix.astyanax.MutationBatch;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
- import java.util.ArrayList;
- import java.util.HashSet;
import java.util.Iterator;
- import java.util.List;
- import java.util.NoSuchElementException;
import java.util.Set;
- import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import org.apache.usergrid.persistence.collection.CollectionScope;
@@@ -47,16 -31,11 +30,12 @@@ import org.apache.usergrid.persistence.
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
- import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Test;
- import static org.mockito.Matchers.any;
- import static org.mockito.Matchers.same;
import static org.mockito.Mockito.mock;
- import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;