Make timestamp a property and add an eventType method

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
index 73a8042..94959a5 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
@@ -33,7 +33,10 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package logic.events
+
+import util.shortClassNameOf
 
 import net.liftweb.json.{Xml, Printer, Extraction, JsonAST}
 
@@ -43,7 +46,7 @@ import net.liftweb.json.{Xml, Printer, Extraction, JsonAST}
  * @author Georgios Gousios <gousiosg@gmail.com>
  */
 
-abstract class AquariumEvent(timestamp: Long) {
+abstract class AquariumEvent(val timestamp: Long) {
 
   def validate: Boolean
 
@@ -61,4 +64,6 @@ abstract class AquariumEvent(timestamp: Long) {
   }
 
   def toXml = Xml.toXml(toJValue).toString()
+
+  def eventType: String = shortClassNameOf(this)
 }

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
index e5a8d59..306f853 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
@@ -50,7 +50,7 @@ case class ResourceEvent(
   userId: Long,
   cliendId: Long,
   resource: String,
-  timestamp: Long,
+  override val timestamp: Long,
   eventVersion: Short,
   details: Map[String, String]
 ) extends AquariumEvent(timestamp) {