Still some intermittent failures in the queue module, but now able to get through ALL Usergrid tests w/Qakka
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ee0dda4c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ee0dda4c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ee0dda4c Branch: refs/heads/usergrid-1318-queue Commit: ee0dda4cca0ff5cd56b9574f998222f439fa948c Parents: ffeadb2 Author: Dave Johnson <[email protected]> Authored: Wed Sep 14 16:08:30 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed Sep 14 16:08:30 2016 -0400 ---------------------------------------------------------------------- .../index/guice/TestIndexModule.java | 2 + stack/corepersistence/queue/pom.xml | 2 +- .../usergrid/persistence/qakka/QakkaModule.java | 6 +- .../qakka/api/impl/GuiceWebModule.java | 41 ++++++++++ .../qakka/api/impl/StartupListener.java | 3 +- .../persistence/queue/guice/QueueModule.java | 84 +------------------- .../persistence/qakka/AbstractTest.java | 3 +- .../qakka/core/QueueMessageManagerTest.java | 3 +- .../distributed/QueueActorServiceTest.java | 3 +- .../actors/QueueActorHelperTest.java | 3 +- .../distributed/actors/ShardAllocatorTest.java | 3 +- .../queue/LegacyQueueManagerTest.java | 2 +- .../usergrid/persistence/queue/TestModule.java | 42 ++++++++++ stack/pom.xml | 2 +- 14 files changed, 101 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/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 410f0e3..3bc6193 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,6 +19,7 @@ package org.apache.usergrid.persistence.index.guice; +import org.apache.usergrid.persistence.actorsystem.ActorSystemModule; import org.safehaus.guicyfig.GuicyFigModule; import org.apache.usergrid.persistence.core.guice.CommonModule; @@ -37,6 +38,7 @@ public class TestIndexModule extends TestModule { @Override protected void configure() { + install( new ActorSystemModule()); install( new CommonModule()); // configure collections and our core astyanax framework http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml index 48417d5..488d9f2 100644 --- a/stack/corepersistence/queue/pom.xml +++ b/stack/corepersistence/queue/pom.xml @@ -37,7 +37,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> <servlet.version>3.0.1</servlet.version> - <jersey.version>2.23.1</jersey.version> + <jersey.version>2.21</jersey.version> <guice-bridge.version>2.4.0</guice-bridge.version> </properties> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/QakkaModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/QakkaModule.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/QakkaModule.java index 6a60c97..0c37e82 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/QakkaModule.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/QakkaModule.java @@ -23,8 +23,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Key; import com.google.inject.multibindings.Multibinder; import com.netflix.config.ConfigurationManager; -import org.apache.usergrid.persistence.actorsystem.ActorSystemModule; -import org.apache.usergrid.persistence.core.guice.CommonModule; import org.apache.usergrid.persistence.core.migration.schema.Migration; import org.apache.usergrid.persistence.qakka.api.URIStrategy; import org.apache.usergrid.persistence.qakka.api.impl.URIStrategyLocalhost; @@ -67,15 +65,13 @@ public class QakkaModule extends AbstractModule { // load properties from one properties file using Netflix Archaius so that GuicyFig will see them ConfigurationManager.loadCascadedPropertiesFromResources( "qakka" ); } catch (IOException e) { - throw new RuntimeException( "Cannot qakka.properties file", e ); + logger.warn("Unable to load qakka.properties"); } } @Override protected void configure() { - install( new CommonModule() ); - install( new ActorSystemModule() ); install( new GuicyFigModule( QakkaFig.class ) ); bind( App.class ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/GuiceWebModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/GuiceWebModule.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/GuiceWebModule.java new file mode 100644 index 0000000..619fbc1 --- /dev/null +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/GuiceWebModule.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. The ASF licenses this file to You + * under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +package org.apache.usergrid.persistence.qakka.api.impl; + +import com.google.inject.AbstractModule; +import org.apache.usergrid.persistence.actorsystem.ActorSystemModule; +import org.apache.usergrid.persistence.core.guice.CommonModule; +import org.apache.usergrid.persistence.qakka.QakkaModule; +import org.apache.usergrid.persistence.queue.guice.QueueModule; + + +/** + * Created by Dave Johnson ([email protected]) on 9/14/16. + */ +public class GuiceWebModule extends AbstractModule { + + + @Override + protected void configure() { + install( new CommonModule() ); + install( new ActorSystemModule() ); + install( new QakkaModule() ); + } + +} http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/StartupListener.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/StartupListener.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/StartupListener.java index d97363a..5e308d5 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/StartupListener.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/impl/StartupListener.java @@ -24,7 +24,6 @@ import com.google.inject.Injector; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import org.apache.usergrid.persistence.qakka.App; -import org.apache.usergrid.persistence.qakka.QakkaModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; @@ -48,7 +47,7 @@ public class StartupListener extends GuiceServletContextListener { INJECTOR = Guice.createInjector( new ServletModule() { @Override protected void configureServlets() { - install( new QakkaModule() ); + install( new GuiceWebModule() ); } } ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java index d2247c1..fff187e 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java @@ -19,55 +19,19 @@ package org.apache.usergrid.persistence.queue.guice; import com.google.inject.AbstractModule; -import com.google.inject.Key; import com.google.inject.assistedinject.FactoryModuleBuilder; -import com.google.inject.multibindings.Multibinder; -import org.apache.usergrid.persistence.actorsystem.ActorSystemModule; -import org.apache.usergrid.persistence.core.guice.CommonModule; -import org.apache.usergrid.persistence.core.migration.schema.Migration; -import org.apache.usergrid.persistence.qakka.App; -import org.apache.usergrid.persistence.qakka.MetricsService; -import org.apache.usergrid.persistence.qakka.QakkaFig; import org.apache.usergrid.persistence.qakka.QakkaModule; -import org.apache.usergrid.persistence.qakka.api.URIStrategy; -import org.apache.usergrid.persistence.qakka.api.impl.URIStrategyLocalhost; -import org.apache.usergrid.persistence.qakka.core.*; -import org.apache.usergrid.persistence.qakka.core.impl.QueueManagerImpl; -import org.apache.usergrid.persistence.qakka.core.impl.QueueMessageManagerImpl; -import org.apache.usergrid.persistence.qakka.distributed.DistributedQueueService; -import org.apache.usergrid.persistence.qakka.distributed.actors.QueueActorHelper; -import org.apache.usergrid.persistence.qakka.distributed.impl.DistributedQueueServiceImpl; -import org.apache.usergrid.persistence.qakka.distributed.impl.QueueActorRouterProducer; -import org.apache.usergrid.persistence.qakka.distributed.impl.QueueSenderRouterProducer; -import org.apache.usergrid.persistence.qakka.distributed.impl.QueueWriterRouterProducer; -import org.apache.usergrid.persistence.qakka.serialization.auditlog.AuditLogSerialization; -import org.apache.usergrid.persistence.qakka.serialization.auditlog.impl.AuditLogSerializationImpl; -import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMessageSerialization; -import org.apache.usergrid.persistence.qakka.serialization.queuemessages.impl.QueueMessageSerializationImpl; -import org.apache.usergrid.persistence.qakka.serialization.queues.QueueSerialization; -import org.apache.usergrid.persistence.qakka.serialization.queues.impl.QueueSerializationImpl; -import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardCounterSerialization; -import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardSerialization; -import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardStrategy; -import org.apache.usergrid.persistence.qakka.serialization.sharding.impl.ShardCounterSerializationImpl; -import org.apache.usergrid.persistence.qakka.serialization.sharding.impl.ShardSerializationImpl; -import org.apache.usergrid.persistence.qakka.serialization.sharding.impl.ShardStrategyImpl; -import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferLogSerialization; -import org.apache.usergrid.persistence.qakka.serialization.transferlog.impl.TransferLogSerializationImpl; import org.apache.usergrid.persistence.queue.LegacyQueueFig; import org.apache.usergrid.persistence.queue.LegacyQueueManager; import org.apache.usergrid.persistence.queue.LegacyQueueManagerFactory; import org.apache.usergrid.persistence.queue.LegacyQueueManagerInternalFactory; import org.apache.usergrid.persistence.queue.impl.QakkaQueueManager; import org.apache.usergrid.persistence.queue.impl.QueueManagerFactoryImpl; -import org.apache.usergrid.persistence.queue.impl.SNSQueueManagerImpl; import org.safehaus.guicyfig.GuicyFigModule; /** * Simple module for wiring our collection api - * - * @author tnine */ public class QueueModule extends AbstractModule { @@ -77,56 +41,10 @@ public class QueueModule extends AbstractModule { install(new GuicyFigModule(LegacyQueueFig.class)); - bindQakka(); - bind(LegacyQueueManagerFactory.class).to(QueueManagerFactoryImpl.class); install( new FactoryModuleBuilder().implement(LegacyQueueManager.class, QakkaQueueManager.class) .build(LegacyQueueManagerInternalFactory.class)); - } - - private void bindQakka() { - - install( new CommonModule() ); - install( new ActorSystemModule() ); - install( new GuicyFigModule( QakkaFig.class ) ); - - bind( App.class ); - - bind( CassandraClient.class ).to( CassandraClientImpl.class ); - bind( MetricsService.class ).to( App.class ); - - bind( QueueManager.class ).to( QueueManagerImpl.class ); - bind( QueueSerialization.class ).to( QueueSerializationImpl.class ); - - bind( QueueMessageManager.class ).to( QueueMessageManagerImpl.class ); - bind( QueueMessageSerialization.class ).to( QueueMessageSerializationImpl.class ); - - bind( ShardSerialization.class ).to( ShardSerializationImpl.class ); - bind( ShardStrategy.class ).to( ShardStrategyImpl.class ); - - bind( ShardCounterSerialization.class ).to( ShardCounterSerializationImpl.class ); - - bind( TransferLogSerialization.class ).to( TransferLogSerializationImpl.class ); - bind( AuditLogSerialization.class ).to( AuditLogSerializationImpl.class ); - bind( DistributedQueueService.class ).to( DistributedQueueServiceImpl.class ); - - bind( QueueActorRouterProducer.class ); - bind( QueueWriterRouterProducer.class ); - bind( QueueSenderRouterProducer.class ); - bind( QueueActorHelper.class ); - - bind( Regions.class ); - bind( URIStrategy.class ).to( URIStrategyLocalhost.class ); - - Multibinder<Migration> migrationBinder = Multibinder.newSetBinder( binder(), Migration.class ); - - migrationBinder.addBinding().to( Key.get( AuditLogSerialization.class ) ); - //migrationBinder.addBinding().to( Key.get( MessageCounterSerialization.class ) ); - migrationBinder.addBinding().to( Key.get( QueueMessageSerialization.class ) ); - migrationBinder.addBinding().to( Key.get( QueueSerialization.class ) ); - migrationBinder.addBinding().to( Key.get( ShardCounterSerialization.class ) ); - migrationBinder.addBinding().to( Key.get( ShardSerialization.class ) ); - migrationBinder.addBinding().to( Key.get( TransferLogSerialization.class ) ); + install( new QakkaModule() ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java index 887d9ee..4c3e480 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java @@ -23,6 +23,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.usergrid.persistence.core.migration.schema.MigrationException; import org.apache.usergrid.persistence.core.migration.schema.MigrationManager; +import org.apache.usergrid.persistence.queue.TestModule; import org.apache.usergrid.persistence.queue.guice.QueueModule; import org.junit.BeforeClass; import org.slf4j.Logger; @@ -43,7 +44,7 @@ public class AbstractTest { public AbstractTest() { if ( getInjector() == null ) { - setInjector( Guice.createInjector( new QakkaModule() ) ); + setInjector( Guice.createInjector( new TestModule() ) ); MigrationManager migrationManager = getInjector().getInstance( MigrationManager.class ); try { migrationManager.migrate(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java index d03e702..5a0feba 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java @@ -41,6 +41,7 @@ import org.apache.usergrid.persistence.qakka.serialization.queuemessages.Databas import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMessageSerialization; import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferLog; import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferLogSerialization; +import org.apache.usergrid.persistence.queue.TestModule; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; @@ -63,7 +64,7 @@ public class QueueMessageManagerTest extends AbstractTest { @Override protected Injector getInjector() { - return Guice.createInjector( new QakkaModule() ); + return Guice.createInjector( new TestModule() ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java index 4b01ffa..182d5d6 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java @@ -38,6 +38,7 @@ import org.apache.usergrid.persistence.qakka.serialization.queuemessages.Databas import org.apache.usergrid.persistence.qakka.serialization.queuemessages.DatabaseQueueMessageBody; import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMessageSerialization; import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferLogSerialization; +import org.apache.usergrid.persistence.queue.TestModule; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -55,7 +56,7 @@ public class QueueActorServiceTest extends AbstractTest { @Override protected Injector getInjector() { - return Guice.createInjector( new QakkaModule() ); + return Guice.createInjector( new TestModule() ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java index 99ca4ea..77c11e4 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java @@ -33,6 +33,7 @@ import org.apache.usergrid.persistence.qakka.serialization.auditlog.AuditLogSeri import org.apache.usergrid.persistence.qakka.serialization.queuemessages.DatabaseQueueMessage; import org.apache.usergrid.persistence.qakka.distributed.DistributedQueueService; import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMessageSerialization; +import org.apache.usergrid.persistence.queue.TestModule; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; @@ -45,7 +46,7 @@ public class QueueActorHelperTest extends AbstractTest { @Override protected Injector getInjector() { - return Guice.createInjector( new QakkaModule() ); + return Guice.createInjector( new TestModule() ); } @Test http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java index dc6d891..d486c80 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java @@ -39,6 +39,7 @@ import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardCounter import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardIterator; import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardSerialization; import org.apache.usergrid.persistence.qakka.distributed.DistributedQueueService; +import org.apache.usergrid.persistence.queue.TestModule; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; @@ -55,7 +56,7 @@ public class ShardAllocatorTest extends AbstractTest { @Override protected Injector getInjector() { - return Guice.createInjector( new QakkaModule() ); + return Guice.createInjector( new TestModule() ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java index 0fe183c..bc01b23 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java @@ -50,7 +50,7 @@ public class LegacyQueueManagerTest extends AbstractTest { // give each test its own injector @Override protected Injector getInjector() { - return Guice.createInjector( new QueueModule() ); + return Guice.createInjector( new TestModule() ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/TestModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/TestModule.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/TestModule.java new file mode 100644 index 0000000..9d2ed24 --- /dev/null +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/TestModule.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. The ASF licenses this file to You + * under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +package org.apache.usergrid.persistence.queue; + +import com.google.inject.AbstractModule; +import org.apache.usergrid.persistence.actorsystem.ActorSystemModule; +import org.apache.usergrid.persistence.core.guice.CommonModule; +import org.apache.usergrid.persistence.queue.guice.QueueModule; + + +/** + * Created by Dave Johnson ([email protected]) on 9/14/16. + */ +public class TestModule extends AbstractModule { + + + @Override + protected void configure() { + + install( new CommonModule() ); + install( new ActorSystemModule() ); + install( new QueueModule() ); + + } + +} http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee0dda4c/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index d739bb4..e86580a 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -110,7 +110,7 @@ <jackson-version>1.9.9</jackson-version> <jackson-2-version>2.3.3</jackson-2-version> <jclouds.version>1.9.0</jclouds.version> - <jersey-version>2.23.1</jersey-version> + <jersey-version>2.21</jersey-version> <junit-version>4.12</junit-version> <log4j-version>1.2.16</log4j-version> <org.springframework.version>3.2.13.RELEASE</org.springframework.version>
