ID as a suffix is ID and not Id

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
index 38d0e6b..41863bd 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
@@ -578,9 +578,9 @@ trait Accounting extends DSLUtils with Loggable {
           sourceEventIDs = rel,
           value = c.cost,
           reason = c.reason,
-          userId = event.userId,
+          userId = event.userID,
           resource = event.resource,
-          instanceId = event.instanceId,
+          instanceId = event.instanceID,
           finalized = isFinal
         )
     }

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala b/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
index 4ee4d31..5269a31 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
@@ -71,7 +71,7 @@ case class NewWalletEntry(userId: String,
 
   def currentResourceEvent = resourceEvents.head
   def resource = currentResourceEvent.resource
-  def instanceId = currentResourceEvent.instanceId
+  def instanceId = currentResourceEvent.instanceID
   def chargslotCount = chargeslots.length
   def isOutOfSync = currentResourceEvent.isOutOfSyncForBillingMonth(yearOfBillingMonth, billingMonth)
 

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala b/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
index 80d4e72..e34bb0d 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
@@ -53,10 +53,10 @@ case class ResourceEvent(
     override val id: String,           // The id at the client side (the sender) TODO: Rename to remoteId or something...
     override val occurredMillis: Long, // When it occurred at client side (the sender)
     override val receivedMillis: Long, // When it was received by Aquarium
-    userId: String,                    // The user for which this resource is relevant
-    clientId: String,                  // The unique client identifier (usually some hash)
+    userID: String,                    // The user for which this resource is relevant
+    clientID: String,                  // The unique client identifier (usually some hash)
     resource: String,                  // String representation of the resource type (e.g. "bndup", "vmtime").
-    instanceId: String,                // String representation of the resource instance id
+    instanceID: String,                // String representation of the resource instance id
     eventVersion: String,
     value: Double,
     details: ResourceEvent.Details)
@@ -67,7 +67,7 @@ case class ResourceEvent(
   }
 
   def safeResource   = if(resource eq null)   "" else resource
-  def safeInstanceId = if(instanceId eq null) "" else instanceId
+  def safeInstanceId = if(instanceID eq null) "" else instanceID
 
   def hasResource   = !safeResource.isEmpty
   def hasInstanceId = !safeInstanceId.isEmpty
@@ -127,7 +127,7 @@ case class ResourceEvent(
   }
 
   def toDebugString(useOnlyInstanceId: Boolean = false): String = {
-    val instanceInfo = if(useOnlyInstanceId) instanceId else "%s::%s".format(resource, instanceId)
+    val instanceInfo = if(useOnlyInstanceId) instanceID else "%s::%s".format(resource, instanceID)
     val occurredFormatted = new MutableDateCalc(occurredMillis).toYYYYMMDDHHMMSS
     if(occurredMillis == receivedMillis) {
       "%sEVENT(%s, [%s], %s, %s, %s, %s, %s)".format(
@@ -137,8 +137,8 @@ case class ResourceEvent(
         value,
         instanceInfo,
         details,
-        userId,
-        clientId
+        userID,
+        clientID
       )
     } else {
       "%sEVENT(%s, [%s], [%s], %s, %s, %s, %s, %s)".format(
@@ -149,8 +149,8 @@ case class ResourceEvent(
         value,
         instanceInfo,
         details,
-        userId,
-        clientId
+        userID,
+        clientID
       )
     }
   }

diff --git a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
index 88b4831..3d06de5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
@@ -90,9 +90,9 @@ object LocalFSEventStore extends Loggable {
           "rc-%s-[%s]-[%s]-[%s]-[%s].%s.json".format(
             occurredString,
             event.id,
-            event.userId,
+            event.userID,
             event.resource,
-            event.instanceId,
+            event.instanceID,
             uid))
 
         writeToFile(parsedJsonFile, event.toJson)

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 9be96b2..18d2748 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
@@ -206,7 +206,7 @@ class MemStore extends UserStateStore
 
   def findResourceEventsByUserId(userId: String)
                                 (sortWith: Option[(ResourceEvent, ResourceEvent) => Boolean]): List[ResourceEvent] = {
-    val byUserId = _resourceEvents.filter(_.userId == userId).toArray
+    val byUserId = _resourceEvents.filter(_.userID == userId).toArray
     val sorted = sortWith match {
       case Some(sorter) ⇒
         byUserId.sortWith(sorter)
@@ -219,7 +219,7 @@ class MemStore extends UserStateStore
 
   def findResourceEventsByUserIdAfterTimestamp(userId: String, timestamp: Long): List[ResourceEvent] = {
     _resourceEvents.filter { ev ⇒
-      ev.userId == userId &&
+      ev.userID == userId &&
       (ev.occurredMillis > timestamp)
     }.toList
   }
@@ -235,7 +235,7 @@ class MemStore extends UserStateStore
                                           startTimeMillis: Long,
                                           stopTimeMillis: Long): List[ResourceEvent] = {
     _resourceEvents.filter { ev ⇒
-      ev.userId == userId &&
+      ev.userID == userId &&
       ev.isReceivedWithinMillis(startTimeMillis, stopTimeMillis)
     }.toList
   }

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
index d1d3681..642fc25 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
@@ -286,7 +286,7 @@ case class LatestResourceEventsWorker(latestEventsMap: FullMutableResourceTypeMa
     LatestResourceEventsSnapshot(latestEventsMap.valuesIterator.toList, snapshotTime)
 
   def updateResourceEvent(resourceEvent: ResourceEvent): Unit = {
-    latestEventsMap((resourceEvent.resource, resourceEvent.instanceId)) = resourceEvent
+    latestEventsMap((resourceEvent.resource, resourceEvent.instanceID)) = resourceEvent
   }
   
   def findResourceEvent(resource: String, instanceId: String): Maybe[ResourceEvent] = {
@@ -405,7 +405,7 @@ case class IgnoredFirstResourceEventsWorker(ignoredFirstEventsMap: FullMutableRe
   }
 
   def updateResourceEvent(resourceEvent: ResourceEvent): Unit = {
-    ignoredFirstEventsMap((resourceEvent.resource, resourceEvent.instanceId)) = resourceEvent
+    ignoredFirstEventsMap((resourceEvent.resource, resourceEvent.instanceID)) = resourceEvent
   }
 
   def size = ignoredFirstEventsMap.size

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
index 1470e0b..17d3fb5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
@@ -151,7 +151,7 @@ class UserActor extends AquariumActor
 
   def onProcessResourceEvent(event: ProcessResourceEvent): Unit = {
     val resourceEvent = event.rce
-    if(resourceEvent.userId != this._userId) {
+    if(resourceEvent.userID != this._userId) {
       ERROR("Received %s but my userId = %s".format(event, this._userId))
     } else {
       //ensureUserState()

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
index 7d5bd88..52796c5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
@@ -101,7 +101,7 @@ class UserActorManager extends AquariumActor with Loggable {
       _forwardToUserActor(userId, m)
 
     case m @ ProcessResourceEvent(resourceEvent) ⇒
-      _forwardToUserActor(resourceEvent.userId, m)
+      _forwardToUserActor(resourceEvent.userID, m)
 
     case m @ ProcessUserEvent(userEvent) ⇒
       _forwardToUserActor(userEvent.userID, m)

diff --git a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
index 48ccc9a..1ecd015 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
@@ -167,7 +167,7 @@ trait RandomEventGenerator extends AkkaAMQP {
       n =>
         var event = nextResourceEvent
         publisher ! Message(event.toBytes,
-          "%s.%s.%s".format("",event.clientId, event.resource))
+          "%s.%s.%s".format("",event.clientID, event.resource))
     }
   }
 }

diff --git a/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala b/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
index 338e2c1..0dc28d2 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
@@ -90,13 +90,13 @@ with RandomEventGenerator with StoreConfigurator {
     }
 
     val mostUsedId = events
-      .map{x => x.userId}
+      .map{x => x.userID}
       .groupBy(identity)
       .mapValues(_.size)
       .foldLeft(("",0))((acc, kv) => if (kv._2 > acc._2) kv else acc)._1
 
     val result = store.findResourceEventsByUserId(mostUsedId)(None)
-    assertEquals(events.filter(p => p.userId.equals(mostUsedId)).size, result.size)
+    assertEquals(events.filter(p => p.userID.equals(mostUsedId)).size, result.size)
   }
 
   @Test