[01/25] incubator-usergrid git commit: First pass of changing interface to only use ApplicationScope. Implementation should be legacy compatible

[sfeldman]

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev cdcb4aeb5 -> 3c0a8a8d3


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c39be5da/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/UniqueValueEntryMock.java
----------------------------------------------------------------------
diff --git 
a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/UniqueValueEntryMock.java
 
b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/UniqueValueEntryMock.java
index 8da6ef5..c06479b 100644
--- 
a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/UniqueValueEntryMock.java
+++ 
b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/UniqueValueEntryMock.java
@@ -42,27 +42,17 @@ package org.apache.usergrid.persistence.collection.util;/*
 
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
-import java.util.TreeMap;
 import java.util.UUID;
 
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
 import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.MvccLogEntry;
-import 
org.apache.usergrid.persistence.collection.mvcc.MvccLogEntrySerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
 import 
org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
-import 
org.apache.usergrid.persistence.collection.serialization.impl.UniqueFieldEntrySerializer;
 import 
org.apache.usergrid.persistence.collection.serialization.impl.UniqueValueImpl;
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.field.StringField;
-import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 
 import com.fasterxml.uuid.UUIDComparator;
 import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;