usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [1/3] incubator-usergrid git commit: Moved files to reflect their public/internal usage
Date Thu, 02 Apr 2015 21:06:06 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/USERGRID-536 2699dd30f -> f1f87b085


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1f87b08/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexMigrationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexMigrationTest.java
b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexMigrationTest.java
index 1203e38..6ce6459 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexMigrationTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexMigrationTest.java
@@ -21,22 +21,16 @@ package org.apache.usergrid.persistence.index.impl;
 
 import com.google.inject.Inject;
 import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
-import org.apache.usergrid.persistence.core.migration.data.MigrationDataProvider;
 import org.apache.usergrid.persistence.core.migration.data.ProgressObserver;
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
-import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
 import org.apache.usergrid.persistence.core.test.UseModules;
 import org.apache.usergrid.persistence.index.*;
 import org.apache.usergrid.persistence.index.guice.TestIndexModule;
 import org.apache.usergrid.persistence.index.migration.EsIndexDataMigrationImpl;
 import org.apache.usergrid.persistence.index.migration.IndexDataVersions;
-import org.apache.usergrid.persistence.index.migration.LegacyIndexIdentifier;
-import org.apache.usergrid.persistence.model.entity.SimpleId;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.UUID;
-
 import static junit.framework.Assert.fail;
 import static junit.framework.TestCase.assertEquals;
 
@@ -51,7 +45,7 @@ public class IndexMigrationTest extends BaseIT{
     @Inject
     public IndexFig fig;
     @Inject
-    public IndexIdentifier indexIdentifier;
+    public FailureMonitorImpl.IndexIdentifier indexIdentifier;
 
     @Inject
     public IndexCache indexCache;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1f87b08/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
index b8bf873..2ae13e0 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/query/tree/GrammarTreeTest.java
@@ -30,11 +30,11 @@ import org.junit.Test;
 
 import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
 import org.apache.usergrid.persistence.index.exceptions.QueryParseException;
-import org.apache.usergrid.persistence.index.impl.IndexScopeImpl;
+import org.apache.usergrid.persistence.index.impl.SearchEdgeImpl;
 import org.apache.usergrid.persistence.index.impl.SearchRequestBuilderStrategy;
 import org.apache.usergrid.persistence.index.query.ParsedQuery;
 import org.apache.usergrid.persistence.index.query.ParsedQueryBuilder;
-import org.apache.usergrid.persistence.index.query.SelectFieldMapping;
+import org.apache.usergrid.persistence.index.SelectFieldMapping;
 import org.apache.usergrid.persistence.index.query.tree.AndOperand;
 import org.apache.usergrid.persistence.index.query.tree.ContainsOperand;
 import org.apache.usergrid.persistence.index.query.tree.CpQueryFilterLexer;
@@ -438,7 +438,7 @@ public class GrammarTreeTest {
         SearchRequestBuilderStrategy builderStrategy =
                 new SearchRequestBuilderStrategy( null, new ApplicationScopeImpl( new SimpleId(
"test" ) ), null, 100 );
         QueryBuilder qb =
-                builderStrategy.createQueryBuilder( new IndexScopeImpl( new SimpleId( "owner"
), "app" ), query );
+                builderStrategy.createQueryBuilder( new SearchEdgeImpl( new SimpleId( "owner"
), "app" ), query );
     }
 
 


Mime
View raw message