A few more renames due to the UserEvent -> IMEvent change

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index f6fa52a..667565f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -125,7 +125,7 @@ class Configurator(val props: Props) extends Loggable {
     }
   }
 
-  private[this] lazy val _userEventStoreM: Maybe[IMEventStore] = {
+  private[this] lazy val _imEventStoreM: Maybe[IMEventStore] = {
     props.get(Keys.user_event_store_class) map { className ⇒
       val instance = newInstance[IMEventStore](className)
       logger.info("Overriding IMEventStore provisioning. Implementation given by: %s".format(instance.getClass))
@@ -265,10 +265,10 @@ class Configurator(val props: Props) extends Loggable {
     }
   }
 
-  def userEventStore = {
-    _userEventStoreM match {
+  def imEventStore = {
+    _imEventStoreM match {
       case Just(es) ⇒ es
-      case _        ⇒ storeProvider.userEventStore
+      case _        ⇒ storeProvider.imEventStore
     }
   }
 

diff --git a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index 0ec0667..9f098b5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@ -85,7 +85,7 @@ with Loggable {
       createBlankState
 
     //Rebuild state from user events
-    val usersDB = _configurator.storeProvider.userEventStore
+    val usersDB = _configurator.storeProvider.imEventStore
     val userEvents = usersDB.findIMEventsByUserId(_userId)
     val numUserEvents = userEvents.size
     _userState = replayIMEvents(_userState, userEvents, from, to)

diff --git a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
index 40eb921..db6f52b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
@@ -62,14 +62,14 @@ class IMEventProcessorService extends EventProcessorService[IMEvent] {
   }
 
   override def exists(event: IMEvent) =
-    _configurator.userEventStore.findIMEventById(event.id).isJust
+    _configurator.imEventStore.findIMEventById(event.id).isJust
 
   override def persist(event: IMEvent, initialPayload: Array[Byte]) = {
     Maybe {
       LocalFSEventStore.storeIMEvent(_configurator, event, initialPayload)
     } match {
       case Just(_) ⇒
-        _configurator.userEventStore.storeIMEvent(event) match {
+        _configurator.imEventStore.storeIMEvent(event) match {
           case Just(x) => true
           case x: Failed =>
             logger.error("Could not save user event: %s".format(event))
@@ -93,7 +93,7 @@ class IMEventProcessorService extends EventProcessorService[IMEvent] {
 
     _configurator.props.getBoolean(Configurator.Keys.save_unparsed_event_im) match {
       case Just(true) ⇒
-        val recordIDM = _configurator.userEventStore.storeUnparsed(json)
+        val recordIDM = _configurator.imEventStore.storeUnparsed(json)
         logger.info("Saved unparsed {}", recordIDM)
       case _ ⇒
     }

diff --git a/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala b/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
index 433346f..275935c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
@@ -44,6 +44,6 @@ trait StoreProvider {
   def userStateStore: UserStateStore
   def resourceEventStore: ResourceEventStore
   def walletEntryStore: WalletEntryStore
-  def userEventStore: IMEventStore
+  def imEventStore: IMEventStore
   def policyStore: PolicyStore
 }
\ No newline at end of file

diff --git a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
index 0906f75..165485b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
@@ -93,7 +93,7 @@ class MemStore extends UserStateStore
 
   def walletEntryStore = this
 
-  def userEventStore = this
+  def imEventStore = this
 
   def policyStore = this
   //- StoreProvider

diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
index 206aabe..68a9227 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
@@ -76,6 +76,6 @@ class MongoDBStoreProvider extends StoreProvider with Configurable {
   def userStateStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
   def resourceEventStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
   def walletEntryStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
-  def userEventStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
+  def imEventStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
   def policyStore = new MongoDBStore(this._mongo, this._database, this._username, this._password)
 }
\ No newline at end of file