From b9ff1a5ee5d3e1418e8d5bfe4e2cee48ec12bc30 Mon Sep 17 00:00:00 2001
From: Diego Parra <dparra@despegar.com>
Date: Fri, 10 May 2013 11:53:10 -0300
Subject: refactor ActorSystem to ActorSystemHolder

---
 src/main/scala/akka/ActorSystem.scala       | 9 ---------
 src/main/scala/akka/ActorSystemHolder.scala | 9 +++++++++
 src/main/scala/akka/MailboxAspect.scala     | 2 +-
 src/main/scala/akka/PoolMonitorAspect.scala | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/main/scala/akka/ActorSystem.scala
 create mode 100644 src/main/scala/akka/ActorSystemHolder.scala

(limited to 'src')

diff --git a/src/main/scala/akka/ActorSystem.scala b/src/main/scala/akka/ActorSystem.scala
deleted file mode 100644
index 7c381e68..00000000
--- a/src/main/scala/akka/ActorSystem.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package akka
-
-import org.aspectj.lang.Aspects
-
-trait ActorSystem {
-  lazy val actorSystemAspect = Aspects.aspectOf(classOf[ActorSystemAspect])
-  lazy val actorSystem = actorSystemAspect.currentActorSystem
-  implicit val dispatcher = actorSystem.dispatcher
-}
\ No newline at end of file
diff --git a/src/main/scala/akka/ActorSystemHolder.scala b/src/main/scala/akka/ActorSystemHolder.scala
new file mode 100644
index 00000000..0be6c89e
--- /dev/null
+++ b/src/main/scala/akka/ActorSystemHolder.scala
@@ -0,0 +1,9 @@
+package akka
+
+import org.aspectj.lang.Aspects
+
+trait ActorSystemHolder {
+  lazy val actorSystemAspect = Aspects.aspectOf(classOf[ActorSystemAspect])
+  lazy val actorSystem = actorSystemAspect.currentActorSystem
+  lazy implicit val dispatcher = actorSystem.dispatcher
+}
\ No newline at end of file
diff --git a/src/main/scala/akka/MailboxAspect.scala b/src/main/scala/akka/MailboxAspect.scala
index f52a2eee..a823d5b9 100644
--- a/src/main/scala/akka/MailboxAspect.scala
+++ b/src/main/scala/akka/MailboxAspect.scala
@@ -5,7 +5,7 @@ import scala.concurrent.duration._
 import com.newrelic.api.agent.NewRelic
 
 @Aspect("perthis(mailboxMonitor())")
-class MailboxAspect extends ActorSystem {
+class MailboxAspect extends ActorSystemHolder {
 
   @Pointcut("execution(akka.dispatch.Mailbox.new(..)) && !within(MailboxAspect)")
   protected def mailboxMonitor():Unit = {}
diff --git a/src/main/scala/akka/PoolMonitorAspect.scala b/src/main/scala/akka/PoolMonitorAspect.scala
index 36861a93..20d002a2 100644
--- a/src/main/scala/akka/PoolMonitorAspect.scala
+++ b/src/main/scala/akka/PoolMonitorAspect.scala
@@ -5,7 +5,7 @@ import scala.concurrent.duration._
 import com.newrelic.api.agent.NewRelic
 
 @Aspect("perthis(poolMonitor())")
-class PoolMonitorAspect extends ActorSystem {
+class PoolMonitorAspect extends ActorSystemHolder {
 
   @Pointcut("execution(scala.concurrent.forkjoin.ForkJoinPool.new(..)) && !within(PoolMonitorAspect)")
   protected def poolMonitor:Unit = {}
-- 
cgit v1.2.3