Fix unique values code to use GuiceActorProducer correctly.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/775257d2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/775257d2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/775257d2 Branch: refs/heads/master Commit: 775257d27bfd3a3354fc5da4803530636413c76d Parents: 041109f Author: Dave Johnson <[email protected]> Authored: Tue Oct 11 10:01:03 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Oct 11 10:01:03 2016 -0400 ---------------------------------------------------------------------- .../collection/uniquevalues/UniqueValueActor.java | 11 +++++------ .../collection/uniquevalues/UniqueValuesRouter.java | 8 ++++---- .../collection/uniquevalues/UniqueValuesServiceImpl.java | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/775257d2/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValueActor.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValueActor.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValueActor.java index 74f45eb..93b6ddb 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValueActor.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValueActor.java @@ -17,6 +17,7 @@ package org.apache.usergrid.persistence.collection.uniquevalues; import akka.actor.UntypedActor; +import com.google.inject.Inject; import org.apache.commons.lang3.RandomStringUtils; import org.apache.usergrid.persistence.actorsystem.ActorSystemManager; import org.apache.usergrid.persistence.core.scope.ApplicationScope; @@ -34,8 +35,6 @@ public class UniqueValueActor extends UntypedActor { private final String name = RandomStringUtils.randomAlphanumeric( 4 ); - //private MetricsService metricsService; - private final ActorSystemManager actorSystemManager; private final UniqueValuesTable table; @@ -43,11 +42,11 @@ public class UniqueValueActor extends UntypedActor { private int count = 0; - public UniqueValueActor() { + @Inject + public UniqueValueActor( UniqueValuesTable table, ActorSystemManager actorSystemManager ) { - // TODO: is there a way to avoid this ugly kludge? see also: ClusterSingletonRouter - this.table = UniqueValuesServiceImpl.injector.getInstance( UniqueValuesTable.class ); - this.actorSystemManager = UniqueValuesServiceImpl.injector.getInstance( ActorSystemManager.class ); + this.table = table; + this.actorSystemManager = actorSystemManager; } @Override http://git-wip-us.apache.org/repos/asf/usergrid/blob/775257d2/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesRouter.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesRouter.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesRouter.java index 355320b..17cbbb5 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesRouter.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesRouter.java @@ -24,6 +24,7 @@ import akka.routing.FromConfig; import com.google.inject.Inject; import com.google.inject.Injector; import org.apache.commons.lang.RandomStringUtils; +import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,10 +41,9 @@ public class UniqueValuesRouter extends UntypedActor { @Inject public UniqueValuesRouter() { - router = getContext().actorOf( - FromConfig.getInstance().props( - Props.create( UniqueValueActor.class) - .withDispatcher("akka.blocking-io-dispatcher")), "router"); + router = getContext().actorOf( FromConfig.getInstance().props( + Props.create( GuiceActorProducer.class, UniqueValueActor.class) + .withDispatcher("akka.blocking-io-dispatcher")), "router"); } @Override http://git-wip-us.apache.org/repos/asf/usergrid/blob/775257d2/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java index 4562998..47a5156 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java @@ -52,7 +52,6 @@ import java.util.concurrent.TimeUnit; public class UniqueValuesServiceImpl implements UniqueValuesService { private static final Logger logger = LoggerFactory.getLogger( UniqueValuesServiceImpl.class ); - static Injector injector; UniqueValuesFig uniqueValuesFig; ActorSystemManager actorSystemManager; UniqueValuesTable table; @@ -66,13 +65,14 @@ public class UniqueValuesServiceImpl implements UniqueValuesService { ActorSystemManager actorSystemManager, UniqueValuesTable table ) { - injector = inj; this.actorSystemManager = actorSystemManager; this.uniqueValuesFig = uniqueValuesFig; this.table = table; ReservationCache.init( uniqueValuesFig.getUniqueValueCacheTtl() ); this.reservationCache = ReservationCache.getInstance(); + + GuiceActorProducer.INJECTOR = inj; }
