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 2015/03/20 00:26:26 UTC
[09/50] [abbrv] incubator-usergrid git commit: Core tests passing.
Core tests passing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7925a4b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7925a4b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7925a4b8
Branch: refs/heads/USERGRID-480
Commit: 7925a4b8353c9bded60188685a2109cba5024faa
Parents: fa69be8
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 3 13:53:18 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 3 13:53:18 2015 -0700
----------------------------------------------------------------------
...MvccEntitySerializationStrategyImplTest.java | 4 +-
...ntitySerializationStrategyProxyV1_3Test.java | 3 -
...ccEntitySerializationStrategyV1ImplTest.java | 71 +++++++++++++
...ccEntitySerializationStrategyV2ImplTest.java | 67 ++++++++++++
...ccEntitySerializationStrategyV3ImplTest.java | 9 +-
.../MvccEntitySerializationStrategyV3Test.java | 103 -------------------
.../data/newimpls/AbstractMigrationPlugin.java | 1 +
.../persistence/graph/guice/GraphModule.java | 14 ++-
.../impl/EdgeDataMigrationImpl.java | 79 +++++++-------
.../EdgeMetadataSerializationProxyImpl.java | 13 +--
.../graph/guice/TestGraphModule.java | 35 +++----
.../EdgeMetaDataSerializationProxyV1Test.java | 12 ++-
.../EdgeMetaDataSerializationProxyV2Test.java | 21 ++--
.../EdgeMetaDataSerializationV1Test.java | 7 +-
.../EdgeMetaDataSerializationV2Test.java | 7 +-
.../persistence/map/guice/TestMapModule.java | 9 +-
.../index/guice/TestIndexModule.java | 10 +-
.../queue/guice/TestQueueModule.java | 9 +-
18 files changed, 252 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index ac67558..f76230d 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -423,7 +423,7 @@ public abstract class MvccEntitySerializationStrategyImplTest {
serializationStrategy.delete( context, id, version3 ).execute();
- assertFalse("Not loaded", serializationStrategy.load( context, id ).isPresent());
+ assertFalse( "Not loaded", serializationStrategy.load( context, id ).isPresent() );
}
@@ -465,7 +465,7 @@ public abstract class MvccEntitySerializationStrategyImplTest {
/**
- * We no longer support partial writes, ensure that an exception is thrown when this occurs
+ * We no longer support partial writes, ensure that an exception is thrown when this occurs after v3
* @throws ConnectionException
*/
@Test(expected = UnsupportedOperationException.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyV1_3Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyV1_3Test.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyV1_3Test.java
index 81113b1..5c8a61f 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyV1_3Test.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyV1_3Test.java
@@ -47,9 +47,6 @@ public class MvccEntitySerializationStrategyProxyV1_3Test extends MvccEntitySeri
@Inject
private MvccEntitySerializationStrategyV1Impl mvccEntitySerializationStrategyV1;
- @Inject
- private VersionedMigrationSet<MvccEntitySerializationStrategy> migrationSet;
-
@Override
protected MvccEntitySerializationStrategy getMvccEntitySerializationStrategy() {
return serializationStrategy;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1ImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1ImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1ImplTest.java
index d4d6fb5..4e0c8cc 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1ImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1ImplTest.java
@@ -20,14 +20,34 @@
package org.apache.usergrid.persistence.collection.serialization.impl;
+import java.util.UUID;
+
+import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.usergrid.persistence.collection.CollectionScope;
+import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
+import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
+import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl;
import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy;
+import org.apache.usergrid.persistence.collection.util.EntityUtils;
import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.test.UseModules;
+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.field.BooleanField;
+import org.apache.usergrid.persistence.model.field.DoubleField;
+import org.apache.usergrid.persistence.model.field.IntegerField;
+import org.apache.usergrid.persistence.model.field.LongField;
+import org.apache.usergrid.persistence.model.field.StringField;
+import org.apache.usergrid.persistence.model.field.UUIDField;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+import com.google.common.base.Optional;
import com.google.inject.Inject;
+import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
@RunWith( ITRunner.class )
@@ -43,4 +63,55 @@ public class MvccEntitySerializationStrategyV1ImplTest extends MvccEntitySeriali
protected MvccEntitySerializationStrategy getMvccEntitySerializationStrategy() {
return serializationStrategy;
}
+
+
+
+ /**
+ * We no longer support partial writes, ensure that an exception is thrown when this occurs after v3
+ * @throws com.netflix.astyanax.connectionpool.exceptions.ConnectionException
+ */
+ @Test
+ public void writeLoadDeletePartial() throws ConnectionException {
+
+ final Id organizationId = new SimpleId( "organization" );
+ final Id applicationId = new SimpleId( "application" );
+ final String name = "test";
+
+ CollectionScope context = new CollectionScopeImpl( organizationId, applicationId, name );
+
+
+ final UUID entityId = UUIDGenerator.newTimeUUID();
+ final UUID version = UUIDGenerator.newTimeUUID();
+ final String type = "test";
+
+ final Id id = new SimpleId( entityId, type );
+
+ Entity entity = new Entity( id );
+
+ EntityUtils.setVersion( entity, version );
+
+
+ BooleanField boolField = new BooleanField( "boolean", false );
+ DoubleField doubleField = new DoubleField( "double", 1d );
+ IntegerField intField = new IntegerField( "long", 1 );
+ LongField longField = new LongField( "int", 1l );
+ StringField stringField = new StringField( "name", "test" );
+ UUIDField uuidField = new UUIDField( "uuid", UUIDGenerator.newTimeUUID() );
+
+ entity.setField( boolField );
+ entity.setField( doubleField );
+ entity.setField( intField );
+ entity.setField( longField );
+ entity.setField( stringField );
+ entity.setField( uuidField );
+
+
+ MvccEntity saved = new MvccEntityImpl( id, version, MvccEntity.Status.PARTIAL, Optional.of( entity ) );
+
+
+ //persist the entity
+ serializationStrategy.write( context, saved ).execute();
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2ImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2ImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2ImplTest.java
index 97bcb1f..b91c453 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2ImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2ImplTest.java
@@ -20,14 +20,34 @@
package org.apache.usergrid.persistence.collection.serialization.impl;
+import java.util.UUID;
+
+import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.usergrid.persistence.collection.CollectionScope;
+import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
+import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
+import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl;
import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy;
+import org.apache.usergrid.persistence.collection.util.EntityUtils;
import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.test.UseModules;
+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.field.BooleanField;
+import org.apache.usergrid.persistence.model.field.DoubleField;
+import org.apache.usergrid.persistence.model.field.IntegerField;
+import org.apache.usergrid.persistence.model.field.LongField;
+import org.apache.usergrid.persistence.model.field.StringField;
+import org.apache.usergrid.persistence.model.field.UUIDField;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+import com.google.common.base.Optional;
import com.google.inject.Inject;
+import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
@RunWith( ITRunner.class )
@@ -43,5 +63,52 @@ public class MvccEntitySerializationStrategyV2ImplTest extends MvccEntitySeriali
return serializationStrategy;
}
+ /**
+ * We no longer support partial writes, ensure that an exception is thrown when this occurs after v3
+ * @throws com.netflix.astyanax.connectionpool.exceptions.ConnectionException
+ */
+ @Test
+ public void writeLoadDeletePartial() throws ConnectionException {
+
+ final Id organizationId = new SimpleId( "organization" );
+ final Id applicationId = new SimpleId( "application" );
+ final String name = "test";
+
+ CollectionScope context = new CollectionScopeImpl( organizationId, applicationId, name );
+
+
+ final UUID entityId = UUIDGenerator.newTimeUUID();
+ final UUID version = UUIDGenerator.newTimeUUID();
+ final String type = "test";
+
+ final Id id = new SimpleId( entityId, type );
+
+ Entity entity = new Entity( id );
+
+ EntityUtils.setVersion( entity, version );
+
+
+ BooleanField boolField = new BooleanField( "boolean", false );
+ DoubleField doubleField = new DoubleField( "double", 1d );
+ IntegerField intField = new IntegerField( "long", 1 );
+ LongField longField = new LongField( "int", 1l );
+ StringField stringField = new StringField( "name", "test" );
+ UUIDField uuidField = new UUIDField( "uuid", UUIDGenerator.newTimeUUID() );
+
+ entity.setField( boolField );
+ entity.setField( doubleField );
+ entity.setField( intField );
+ entity.setField( longField );
+ entity.setField( stringField );
+ entity.setField( uuidField );
+
+
+ MvccEntity saved = new MvccEntityImpl( id, version, MvccEntity.Status.PARTIAL, Optional.of( entity ) );
+
+
+ //persist the entity
+ serializationStrategy.write( context, saved ).execute();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3ImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3ImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3ImplTest.java
index b30e901..e5ea409 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3ImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3ImplTest.java
@@ -21,13 +21,11 @@ import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
/**
- * Classy class class.
+ * Same tests as v2, we just override some methods to ensure they throw the correct exceptions
*/
-
-
@RunWith( ITRunner.class )
@UseModules( TestCollectionModule.class )
-public class MvccEntitySerializationStrategyV3ImplTest extends MvccEntitySerializationStrategyV3Test {
+public class MvccEntitySerializationStrategyV3ImplTest extends MvccEntitySerializationStrategyV2Test {
@Inject
private MvccEntitySerializationStrategyV3Impl serializationStrategy;
@@ -70,4 +68,7 @@ public class MvccEntitySerializationStrategyV3ImplTest extends MvccEntitySeriali
serializationStrategy.loadDescendingHistory( context, entityId, version1, 20 );
}
+
+
}
+
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Test.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Test.java
deleted file mode 100644
index 137bb1f..0000000
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Test.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.apache.usergrid.persistence.collection.serialization.impl;
-
-import com.google.inject.Inject;
-import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
-import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.MvccEntity;
-import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
-import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl;
-import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.collection.util.EntityHelper;
-import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
-import org.apache.usergrid.persistence.core.guicyfig.SetConfigTestBypass;
-import org.apache.usergrid.persistence.core.util.ValidationUtils;
-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.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.UUID;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Classy class class.
- */
-public abstract class MvccEntitySerializationStrategyV3Test extends MvccEntitySerializationStrategyImplTest{
- @Inject
- protected SerializationFig serializationFig;
-
- @Inject
- protected CassandraFig cassandraFig;
-
- private int setMaxEntitySize;
-
- @Before
- public void setUp() {
- setMaxEntitySize = serializationFig.getMaxEntitySize();
- }
-
-
- @After
- public void tearDown() {
- SetConfigTestBypass.setValueByPass(serializationFig, "getMaxEntitySize", setMaxEntitySize + "");
- }
-
- /**
- * Tests an entity with more than 65535 bytes worth of data is successfully stored and retrieved
- */
- @Test
- public void largeEntityWriteRead() throws ConnectionException {
- final int setSize = 65535 * 2;
-
-
- //this is the size it works out to be when serialized, we want to allow this size
-
- SetConfigTestBypass.setValueByPass( serializationFig, "getMaxEntitySize", 65535 * 10 + "" );
- final Entity entity = EntityHelper.generateEntity(setSize);
-
- //now we have one massive, entity, save it and retrieve it.
- CollectionScope context =
- new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "parent" ), "tests" );
-
-
- final Id id = entity.getId();
- ValidationUtils.verifyIdentity(id);
- final UUID version = UUIDGenerator.newTimeUUID();
- final MvccEntity.Status status = MvccEntity.Status.COMPLETE;
-
- final MvccEntity mvccEntity = new MvccEntityImpl( id, version, status, entity );
-
-
- getMvccEntitySerializationStrategy().write( context, mvccEntity ).execute();
-
- //now load it
- final MvccEntity loadedEntity =
- getMvccEntitySerializationStrategy().load( context, id ).get();
-
-
- assertLargeEntity( mvccEntity, loadedEntity );
-
-
- MvccEntity returned =
- serializationStrategy.load( context, Collections.singleton(id), version ).getEntity( id );
-
- assertLargeEntity( mvccEntity, returned );
- }
-
-
-
- protected void assertLargeEntity( final MvccEntity expected, final MvccEntity returned ) {
-
- org.junit.Assert.assertEquals( "The loaded entity should match the stored entity", expected, returned );
-
- EntityHelper.verifyDeepEquals( expected.getEntity().get(), returned.getEntity().get() );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/newimpls/AbstractMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/newimpls/AbstractMigrationPlugin.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/newimpls/AbstractMigrationPlugin.java
index 7b3aa00..17d88d0 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/newimpls/AbstractMigrationPlugin.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/newimpls/AbstractMigrationPlugin.java
@@ -115,6 +115,7 @@ public abstract class AbstractMigrationPlugin<T> implements MigrationPlugin {
//run the migration
final int newSystemVersion = migrationToExecute.migrate( version, entityIdScopeDataMigrationProvider, po );
+ //write the version
migrationInfoSerialization.setVersion( getName(), newSystemVersion );
//signal we've run a migration and return
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/guice/GraphModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/guice/GraphModule.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/guice/GraphModule.java
index 84fbaac..67459b2 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/guice/GraphModule.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/guice/GraphModule.java
@@ -85,7 +85,7 @@ import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
-public class GraphModule extends AbstractModule {
+public abstract class GraphModule extends AbstractModule {
@Override
protected void configure() {
@@ -190,6 +190,9 @@ public class GraphModule extends AbstractModule {
bind( EdgeMetadataSerializationV2Impl.class );
bind(EdgeMetadataSerialization.class).annotatedWith( ProxyImpl.class ).to( EdgeMetadataSerializationProxyImpl.class );
+ //invoke the migration plugin config
+ configureMigrationProvider();
+
}
@@ -232,6 +235,15 @@ public class GraphModule extends AbstractModule {
}
+ /**
+ * Gives callers the ability to to configure an instance of
+ *
+ * MigrationDataProvider<ApplicationScope> for providing data migrations
+ */
+ public abstract void configureMigrationProvider();
+
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeDataMigrationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeDataMigrationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeDataMigrationImpl.java
index 862c796..49a954d 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeDataMigrationImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeDataMigrationImpl.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
import rx.Observable;
import rx.functions.Action1;
import rx.functions.Func1;
+import rx.functions.Func2;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
@@ -82,53 +83,53 @@ public class EdgeDataMigrationImpl implements DataMigration2<ApplicationScope> {
final MigrationRelationship<EdgeMetadataSerialization>
migration = allVersions.getMigrationRelationship( currentVersion );
- migrationDataProvider.getData().flatMap(new Func1<ApplicationScope, Observable<?>>() {
+ final Observable<List<Edge>> observable = migrationDataProvider.getData().flatMap(new Func1<ApplicationScope, Observable<List<Edge>>>() {
@Override
- public Observable call(final ApplicationScope applicationScope) {
- final GraphManager gm = graphManagerFactory.createEdgeManager(applicationScope);
- final Observable<Edge> edgesFromSource = edgesFromSourceObservable.edgesFromSource(gm, applicationScope.getApplication());
- logger.info("Migrating edges scope {}", applicationScope);
+ public Observable<List<Edge>> call(final ApplicationScope applicationScope) {
+ final GraphManager gm = graphManagerFactory.createEdgeManager( applicationScope );
+ final Observable<Edge> edgesFromSource =
+ edgesFromSourceObservable.edgesFromSource( gm, applicationScope.getApplication() );
+ logger.info( "Migrating edges scope {}", applicationScope );
//get each edge from this node as a source
return edgesFromSource
- //for each edge, re-index it in v2 every 1000 edges or less
- .buffer( 1000 )
- //do the writes of 1k in parallel
- .parallel( new Func1<Observable<List<Edge>>, Observable>() {
+ //for each edge, re-index it in v2 every 1000 edges or less
+ .buffer( 1000 ).parallel( new Func1<Observable<List<Edge>>, Observable<List<Edge>>>() {
@Override
- public Observable call( final Observable<List<Edge>> listObservable ) {
+ public Observable<List<Edge>> call( final Observable<List<Edge>> listObservable ) {
return listObservable.doOnNext( new Action1<List<Edge>>() {
- @Override
- public void call( List<Edge> edges ) {
- final MutationBatch batch = keyspace.prepareMutationBatch();
-
- for ( Edge edge : edges ) {
- logger.info( "Migrating meta for edge {}", edge );
- final MutationBatch edgeBatch =
- migration.to.writeEdge( applicationScope, edge );
- batch.mergeShallow( edgeBatch );
- }
-
- try {
- batch.execute();
- }
- catch ( ConnectionException e ) {
- throw new RuntimeException( "Unable to perform migration", e );
- }
-
- //update the observer so the admin can see it
- final long newCount = counter.addAndGet( edges.size() );
-
- observer.update( migration.to.getImplementationVersion(),
- String.format( "Currently running. Rewritten %d edge types",
- newCount ) );
- }
- } );
+ @Override
+ public void call( List<Edge> edges ) {
+ final MutationBatch batch = keyspace.prepareMutationBatch();
+
+ for ( Edge edge : edges ) {
+ logger.info( "Migrating meta for edge {}", edge );
+ final MutationBatch edgeBatch =
+ migration.to.writeEdge( applicationScope, edge );
+ batch.mergeShallow( edgeBatch );
+ }
+
+ try {
+ batch.execute();
+ }
+ catch ( ConnectionException e ) {
+ throw new RuntimeException( "Unable to perform migration", e );
+ }
+
+ //update the observer so the admin can see it
+ final long newCount = counter.addAndGet( edges.size() );
+
+ observer.update( migration.to.getImplementationVersion(),
+ String.format( "Currently running. Rewritten %d edge types",
+ newCount ) );
+ }
+ } );
}
} );
- }
- });
+ }});
+
+ observable.longCount().toBlocking().last();
return migration.to.getImplementationVersion();
@@ -139,7 +140,7 @@ public class EdgeDataMigrationImpl implements DataMigration2<ApplicationScope> {
@Override
public boolean supports( final int currentVersion ) {
- return currentVersion <= edgeMetadataSerializationV2.getImplementationVersion();
+ return currentVersion < edgeMetadataSerializationV2.getImplementationVersion();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
index a5bde21..262d665 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
@@ -26,15 +26,18 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
-import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache;
import org.apache.usergrid.persistence.core.migration.data.newimpls.MigrationRelationship;
import org.apache.usergrid.persistence.core.migration.data.newimpls.VersionedMigrationSet;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
-import org.apache.usergrid.persistence.graph.*;
+import org.apache.usergrid.persistence.graph.Edge;
+import org.apache.usergrid.persistence.graph.SearchEdgeType;
+import org.apache.usergrid.persistence.graph.SearchIdType;
import org.apache.usergrid.persistence.graph.serialization.EdgeMetadataSerialization;
-import org.apache.usergrid.persistence.graph.serialization.EdgeMigrationStrategy;
import org.apache.usergrid.persistence.graph.serialization.impl.migration.GraphMigrationPlugin;
import org.apache.usergrid.persistence.model.entity.Id;
@@ -42,12 +45,10 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.MutationBatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
-public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerialization, EdgeMigrationStrategy {
+public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerialization {
private static final Logger logger = LoggerFactory.getLogger(EdgeMetadataSerializationProxyImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
index 63cb204..7dd2254 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
@@ -20,12 +20,12 @@ package org.apache.usergrid.persistence.graph.guice;
import org.apache.usergrid.persistence.core.guice.CommonModule;
-import org.apache.usergrid.persistence.core.guice.MaxMigrationModule;
import org.apache.usergrid.persistence.core.guice.TestModule;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemObservable;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemTestObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationsTestObservable;
+import org.apache.usergrid.persistence.core.migration.data.newimpls.MigrationDataProvider;
+import org.apache.usergrid.persistence.core.migration.data.newimpls.TestMigrationDataProvider;
+import org.apache.usergrid.persistence.core.scope.ApplicationScope;
+
+import com.google.inject.TypeLiteral;
/**
@@ -38,18 +38,17 @@ public class TestGraphModule extends TestModule {
/**
* Runtime modules
*/
- bind(ApplicationObservable.class).to(ApplicationsTestObservable.class);
-
- bind(AllEntitiesInSystemObservable.class).to(AllEntitiesInSystemTestObservable.class);
-
- install( new CommonModule());
- install( new GraphModule() );
-
-
- /**
- * Test modules
- */
- install(new MaxMigrationModule());
-
+ install( new CommonModule() );
+ install( new GraphModule() {
+
+ @Override
+ public void configureMigrationProvider() {
+ //configure our migration data provider
+
+ TestMigrationDataProvider<ApplicationScope> migrationDataProvider = new TestMigrationDataProvider<>();
+ bind( new TypeLiteral<MigrationDataProvider<ApplicationScope>>() {} )
+ .toInstance( migrationDataProvider );
+ }
+ } );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
index d6f6943..3c1b4c4 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
@@ -32,6 +32,9 @@ import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationProxyImpl;
+import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationV1Impl;
+import org.apache.usergrid.persistence.graph.serialization.impl.GraphDataVersions;
+import org.apache.usergrid.persistence.graph.serialization.impl.migration.GraphMigrationPlugin;
import com.google.inject.Inject;
@@ -51,6 +54,9 @@ public class EdgeMetaDataSerializationProxyV1Test extends EdgeMetadataSerializat
protected EdgeMetadataSerialization serialization;
@Inject
+ protected EdgeMetadataSerializationV1Impl edgeMetadataSerializationV1;
+
+ @Inject
protected MigrationInfoSerialization migrationInfoSerialization;
private int existingVersion;
@@ -62,16 +68,16 @@ public class EdgeMetaDataSerializationProxyV1Test extends EdgeMetadataSerializat
*/
@Before
public void setMigrationVersion() {
- existingVersion = migrationInfoSerialization.getVersion();
+ existingVersion = migrationInfoSerialization.getVersion( GraphMigrationPlugin.PLUGIN_NAME);
//set our version to 0 so it uses both impls of the proxy
- migrationInfoSerialization.setVersion( 0 );
+ migrationInfoSerialization.setVersion(GraphMigrationPlugin.PLUGIN_NAME, edgeMetadataSerializationV1.getImplementationVersion() );
}
@After
public void reSetMigrationVersion() {
- migrationInfoSerialization.setVersion( existingVersion );
+ migrationInfoSerialization.setVersion( GraphMigrationPlugin.PLUGIN_NAME, existingVersion );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
index 69fb72d..35a304d 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
@@ -32,6 +32,8 @@ import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationProxyImpl;
+import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationV2Impl;
+import org.apache.usergrid.persistence.graph.serialization.impl.migration.GraphMigrationPlugin;
import com.google.inject.Inject;
@@ -51,6 +53,10 @@ public class EdgeMetaDataSerializationProxyV2Test extends EdgeMetadataSerializat
protected EdgeMetadataSerialization serialization;
@Inject
+ protected EdgeMetadataSerializationV2Impl edgeMetadataSerializationV2;
+
+
+ @Inject
protected MigrationInfoSerialization migrationInfoSerialization;
private int existingVersion;
@@ -61,21 +67,24 @@ public class EdgeMetaDataSerializationProxyV2Test extends EdgeMetadataSerializat
* correctly
*/
@Before
- public void setMigrationVersion(){
- existingVersion = migrationInfoSerialization.getVersion();
+ public void setMigrationVersion() {
+ existingVersion = migrationInfoSerialization.getVersion( GraphMigrationPlugin.PLUGIN_NAME );
//set our version equal to the new version so it only delegates to the new version
- migrationInfoSerialization.setVersion( EdgeMetadataSerializationProxyImpl.MIGRATION_VERSION );
+ migrationInfoSerialization
+ .setVersion( GraphMigrationPlugin.PLUGIN_NAME, edgeMetadataSerializationV2.getImplementationVersion() );
}
+
@After
- public void reSetMigrationVersion(){
- migrationInfoSerialization.setVersion( existingVersion );
+ public void reSetMigrationVersion() {
+ migrationInfoSerialization.setVersion(GraphMigrationPlugin.PLUGIN_NAME, existingVersion );
}
+
@Override
protected EdgeMetadataSerialization getSerializationImpl() {
- assertTrue(serialization instanceof EdgeMetadataSerializationProxyImpl);
+ assertTrue( serialization instanceof EdgeMetadataSerializationProxyImpl );
return serialization;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
index 3fcff68..68a6953 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
@@ -39,7 +39,6 @@ package org.apache.usergrid.persistence.graph.serialization;/*
*/
-import org.apache.usergrid.persistence.core.guice.V1Impl;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.core.test.ITRunner;
@@ -49,21 +48,17 @@ import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSeri
import com.google.inject.Inject;
-import static org.junit.Assert.assertTrue;
-
@RunWith( ITRunner.class )
@UseModules( { TestGraphModule.class } )
public class EdgeMetaDataSerializationV1Test extends EdgeMetadataSerializationTest {
@Inject
- @V1Impl
- protected EdgeMetadataSerialization serialization;
+ protected EdgeMetadataSerializationV1Impl serialization;
@Override
protected EdgeMetadataSerialization getSerializationImpl() {
- assertTrue(serialization instanceof EdgeMetadataSerializationV1Impl );
return serialization;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
index 07396a8..9b34b4e 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
@@ -22,7 +22,6 @@
package org.apache.usergrid.persistence.graph.serialization;
-import org.apache.usergrid.persistence.core.guice.V2Impl;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.core.test.ITRunner;
@@ -32,21 +31,17 @@ import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSeri
import com.google.inject.Inject;
-import static org.junit.Assert.assertTrue;
-
@RunWith( ITRunner.class )
@UseModules( { TestGraphModule.class } )
public class EdgeMetaDataSerializationV2Test extends EdgeMetadataSerializationTest {
@Inject
- @V2Impl
- protected EdgeMetadataSerialization serialization;
+ protected EdgeMetadataSerializationV2Impl serialization;
@Override
protected EdgeMetadataSerialization getSerializationImpl() {
- assertTrue(serialization instanceof EdgeMetadataSerializationV2Impl );
return serialization;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/guice/TestMapModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/guice/TestMapModule.java b/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/guice/TestMapModule.java
index 18b79a3..19700c6 100644
--- a/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/guice/TestMapModule.java
+++ b/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/guice/TestMapModule.java
@@ -1,21 +1,14 @@
package org.apache.usergrid.persistence.map.guice;
-import org.apache.usergrid.persistence.core.guice.TestModule;
import org.apache.usergrid.persistence.core.guice.CommonModule;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemObservable;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemTestObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationsTestObservable;
+import org.apache.usergrid.persistence.core.guice.TestModule;
public class TestMapModule extends TestModule {
@Override
protected void configure() {
- bind(AllEntitiesInSystemObservable.class).to(AllEntitiesInSystemTestObservable.class);
- bind(ApplicationObservable.class).to(ApplicationsTestObservable.class);
-
install( new CommonModule());
install( new MapModule() );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/guice/TestIndexModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/guice/TestIndexModule.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/guice/TestIndexModule.java
index 96202c5..7fccd11 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/guice/TestIndexModule.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/guice/TestIndexModule.java
@@ -19,26 +19,18 @@
package org.apache.usergrid.persistence.index.guice;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
-import org.apache.usergrid.persistence.core.guice.TestModule;
import org.apache.usergrid.persistence.core.guice.CommonModule;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemObservable;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemTestObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationsTestObservable;
+import org.apache.usergrid.persistence.core.guice.TestModule;
public class TestIndexModule extends TestModule {
@Override
protected void configure() {
- bind(AllEntitiesInSystemObservable.class).to(AllEntitiesInSystemTestObservable.class);
- bind(ApplicationObservable.class).to(ApplicationsTestObservable.class);
install( new CommonModule());
// configure collections and our core astyanax framework
- install( new CollectionModule() );
install( new IndexModule() );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7925a4b8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/guice/TestQueueModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/guice/TestQueueModule.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/guice/TestQueueModule.java
index e19b6f0..8390672 100644
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/guice/TestQueueModule.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/guice/TestQueueModule.java
@@ -18,21 +18,14 @@
package org.apache.usergrid.persistence.queue.guice;
-import org.apache.usergrid.persistence.core.guice.TestModule;
import org.apache.usergrid.persistence.core.guice.CommonModule;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemObservable;
-import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemTestObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationObservable;
-import org.apache.usergrid.persistence.core.rx.ApplicationsTestObservable;
+import org.apache.usergrid.persistence.core.guice.TestModule;
public class TestQueueModule extends TestModule {
@Override
protected void configure() {
- bind(AllEntitiesInSystemObservable.class).to(AllEntitiesInSystemTestObservable.class);
- bind(ApplicationObservable.class).to(ApplicationsTestObservable.class);
-
install( new CommonModule());
install( new QueueModule() );
}