From 492a2d49144d7741d9cff24b01907e3179ed0555 Mon Sep 17 00:00:00 2001 From: Georgios Gousios Date: Tue, 13 Dec 2011 13:47:21 +0200 Subject: [PATCH] Fix naming clashes with other traits --- .../src/main/scala/gr/grnet/aquarium/actors/EventProcessor.scala | 4 ++-- logic/src/main/scala/gr/grnet/aquarium/store/EventStore.scala | 6 +++--- .../scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/logic/src/main/scala/gr/grnet/aquarium/actors/EventProcessor.scala b/logic/src/main/scala/gr/grnet/aquarium/actors/EventProcessor.scala index 7bf31f5..17dd9d5 100644 --- a/logic/src/main/scala/gr/grnet/aquarium/actors/EventProcessor.scala +++ b/logic/src/main/scala/gr/grnet/aquarium/actors/EventProcessor.scala @@ -94,14 +94,14 @@ class EventProcessor extends AkkaAMQP with Loggable { def exists(event: ResourceEvent): Boolean = { Store.getEventStore match { - case Some(x) => x.findById(event.id).isEmpty + case Some(x) => x.findEventById(event.id).isEmpty case None => false } } def persist(event: ResourceEvent): Boolean = { Store.getEventStore match { - case Some(x) => x.store(event) match { + case Some(x) => x.storeEvent(event) match { case Just(x) => true case x: Failed => logger.error("Could not save event: %s".format(event)) diff --git a/logic/src/main/scala/gr/grnet/aquarium/store/EventStore.scala b/logic/src/main/scala/gr/grnet/aquarium/store/EventStore.scala index 5a551ac..3859908 100644 --- a/logic/src/main/scala/gr/grnet/aquarium/store/EventStore.scala +++ b/logic/src/main/scala/gr/grnet/aquarium/store/EventStore.scala @@ -45,9 +45,9 @@ import gr.grnet.aquarium.logic.events.AquariumEvent * @author Georgios Gousios . */ trait EventStore { - def store[A <: AquariumEvent](event: A): Maybe[RecordID] + def storeEvent[A <: AquariumEvent](event: A): Maybe[RecordID] - def findById[A <: AquariumEvent](id: String): Option[A] + def findEventById[A <: AquariumEvent](id: String): Option[A] - def findByUserId[A <: AquariumEvent](userId: String)(sortWith: Option[(A, A) => Boolean]): List[A] + def findEventsByUserId[A <: AquariumEvent](userId: Long)(sortWith: Option[(A, A) => Boolean]): List[A] } \ No newline at end of file diff --git a/logic/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala b/logic/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala index 30cd1e3..2553bbd 100644 --- a/logic/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala +++ b/logic/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala @@ -91,7 +91,7 @@ class MongoDBStore(host: String, port: String, */ //EventStore methods - def store[A <: AquariumEvent](event: A): Maybe[RecordID] = { + def storeEvent[A <: AquariumEvent](event: A): Maybe[RecordID] = { try { // Store val obj = JSON.parse(event.toJson).asInstanceOf[DBObject] @@ -118,7 +118,7 @@ class MongoDBStore(host: String, port: String, } } - def findById[A <: AquariumEvent](id: String): Option[A] = { + def findEventById[A <: AquariumEvent](id: String): Option[A] = { val q = new BasicDBObject() q.put("id", id) @@ -130,7 +130,7 @@ class MongoDBStore(host: String, port: String, None } - def findByUserId[A <: AquariumEvent](userId: String) + def findEventsByUserId[A <: AquariumEvent](userId: Long) (sortWith: Option[(A, A) => Boolean]): List[A] = { List() } -- 1.7.10.4