You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/09/30 21:18:54 UTC
[09/10] usergrid git commit: Change to use proper Guice injection
instead of static injector kludge.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a19ba9a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueReaderTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueReaderTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueReaderTest.java
index 19c1211..ba3c0f8 100644
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueReaderTest.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueReaderTest.java
@@ -22,8 +22,11 @@ package org.apache.usergrid.persistence.qakka.distributed.actors;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.actorsystem.ActorSystemFig;
+import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer;
import org.apache.usergrid.persistence.qakka.QakkaFig;
import org.apache.usergrid.persistence.qakka.core.CassandraClientImpl;
import org.apache.usergrid.persistence.qakka.serialization.sharding.Shard;
@@ -52,10 +55,7 @@ public class QueueReaderTest extends AbstractTest {
@Test
public void testBasicOperation() throws Exception {
- CassandraClient cassandraClient = getInjector().getInstance( CassandraClientImpl.class );
-
-
- getInjector().getInstance( App.class ); // init the INJECTOR
+ Injector injector = getInjector();
QakkaFig qakkaFig = getInjector().getInstance( QakkaFig.class );
ActorSystemFig actorSystemFig = getInjector().getInstance( ActorSystemFig.class );
@@ -94,7 +94,8 @@ public class QueueReaderTest extends AbstractTest {
// run the QueueRefresher to fill up the in-memory queue
ActorSystem system = ActorSystem.create("Test-" + queueName);
- ActorRef queueReaderRef = system.actorOf( Props.create( QueueRefresher.class, queueName ), "queueReader");
+ ActorRef queueReaderRef = system.actorOf(
+ Props.create( GuiceActorProducer.class, injector, QueueRefresher.class ), "queueReader");
QueueRefreshRequest refreshRequest = new QueueRefreshRequest( queueName, false );
// need to wait for refresh to complete
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a19ba9a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueTimeouterTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueTimeouterTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueTimeouterTest.java
index e3541a4..3079773 100644
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueTimeouterTest.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueTimeouterTest.java
@@ -22,8 +22,10 @@ package org.apache.usergrid.persistence.qakka.distributed.actors;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
+import com.google.inject.Injector;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.actorsystem.ActorSystemFig;
+import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer;
import org.apache.usergrid.persistence.qakka.AbstractTest;
import org.apache.usergrid.persistence.qakka.App;
import org.apache.usergrid.persistence.qakka.QakkaFig;
@@ -58,7 +60,7 @@ public class QueueTimeouterTest extends AbstractTest {
CassandraClient cassandraClient = getInjector().getInstance( CassandraClientImpl.class );
- getInjector().getInstance( App.class ); // init the INJECTOR
+ Injector injector = getInjector();
QakkaFig qakkaFig = getInjector().getInstance( QakkaFig.class );
ActorSystemFig actorSystemFig = getInjector().getInstance( ActorSystemFig.class );
@@ -110,7 +112,8 @@ public class QueueTimeouterTest extends AbstractTest {
// run timeouter actor
ActorSystem system = ActorSystem.create("Test-" + queueName);
- ActorRef timeouterRef = system.actorOf( Props.create( QueueTimeouter.class, queueName ), "timeouter");
+ ActorRef timeouterRef = system.actorOf( Props.create(
+ GuiceActorProducer.class, injector, QueueTimeouter.class), "timeouter");
QueueTimeoutRequest qtr = new QueueTimeoutRequest( queueName );
timeouterRef.tell( qtr, null ); // tell sends message, returns immediately
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a19ba9a/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 7fd664f..b602177 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
@@ -28,6 +28,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.actorsystem.ActorSystemFig;
+import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer;
import org.apache.usergrid.persistence.qakka.AbstractTest;
import org.apache.usergrid.persistence.qakka.App;
import org.apache.usergrid.persistence.qakka.QakkaModule;
@@ -111,7 +112,8 @@ public class ShardAllocatorTest extends AbstractTest {
// Run shard allocator actor by sending message to it
ActorSystem system = ActorSystem.create("Test-" + queueName);
- ActorRef shardAllocRef = system.actorOf( Props.create( ShardAllocator.class, queueName ), "shardallocator");
+ ActorRef shardAllocRef = system.actorOf( Props.create(
+ GuiceActorProducer.class, injector, ShardAllocator.class), "shardallocator");
ShardCheckRequest checkRequest = new ShardCheckRequest( queueName );
shardAllocRef.tell( checkRequest, null ); // tell sends message, returns immediately
@@ -187,26 +189,32 @@ public class ShardAllocatorTest extends AbstractTest {
queueManager.createQueue( new Queue( queueName ));
- // Create 4000 messages
+ try {
- int numMessages = 4000;
+ // Create 4000 messages
- for ( int i=0; i<numMessages; i++ ) {
- queueMessageManager.sendMessages(
+ int numMessages = 4000;
+
+ for (int i = 0; i < numMessages; i++) {
+ queueMessageManager.sendMessages(
queueName,
Collections.singletonList( region ),
null, // delay
null, // expiration
"application/json",
DataType.serializeValue( "{}", ProtocolVersion.NEWEST_SUPPORTED ) );
- }
+ }
- distributedQueueService.refresh();
- Thread.sleep(3000);
+ distributedQueueService.refresh();
+ Thread.sleep( 3000 );
- // Test that 8 shards were created
+ // Test that 8 shards were created
- Assert.assertTrue("num shards >= 7",
- countShards( cassandraClient, shardCounterSer, queueName, region, Shard.Type.DEFAULT ) >= 7 );
+ Assert.assertTrue( "num shards >= 7",
+ countShards( cassandraClient, shardCounterSer, queueName, region, Shard.Type.DEFAULT ) >= 7 );
+
+ } finally {
+ queueManager.deleteQueue( queueName );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a19ba9a/stack/corepersistence/queue/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/resources/log4j.properties b/stack/corepersistence/queue/src/test/resources/log4j.properties
index b207ea3..e1cbda4 100644
--- a/stack/corepersistence/queue/src/test/resources/log4j.properties
+++ b/stack/corepersistence/queue/src/test/resources/log4j.properties
@@ -28,6 +28,6 @@ log4j.logger.org.glassfish=WARN
#log4j.logger.org.apache.usergrid.persistence.actorsystem=DEBUG
#log4j.logger.org.apache.usergrid.persistence.qakka=DEBUG
-log4j.logger.org.apache.usergrid.persistence.qakka=DEBUG
-log4j.logger.org.apache.usergrid.persistence.queue=DEBUG
-log4j.logger.org.apache.usergrid.corepersistence.asyncevents=DEBUG
+log4j.logger.org.apache.usergrid.persistence.qakka.distributed.actors=DEBUG
+log4j.logger.org.apache.usergrid.persistence.queue=INFO
+log4j.logger.org.apache.usergrid.corepersistence.asyncevents=INFO