Defaults and more test data

diff --git a/logic/src/test/resources/data.json b/logic/src/test/resources/data.json
index 1c8b36d..123f09a 100644 (file)
--- a/logic/src/test/resources/data.json
+++ b/logic/src/test/resources/data.json
@@ -308,5 +308,50 @@
             "resource" : 4,
             "quantity" : 2
            }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 1,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509472,
+            "measurement" : 0.02
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 2,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509345,
+            "measurement" : 0.043
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 3,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509123,
+            "measurement" : 0.05
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 4,
+        "fields": {
+            "item" : 4,
+            "timestamp" : 1316509472,
+            "measurement" : 1232
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 5,
+        "fields": {
+            "item" : 4,
+            "timestamp" : 1316509372,
+            "measurement" : 432
+           }
     }
 ]
\ No newline at end of file

diff --git a/model/src/main/scala/gr/grnet/aquarium/model/RuntimeData.scala b/model/src/main/scala/gr/grnet/aquarium/model/RuntimeData.scala
index 7cb6937..68f90c8 100644 (file)
--- a/model/src/main/scala/gr/grnet/aquarium/model/RuntimeData.scala
+++ b/model/src/main/scala/gr/grnet/aquarium/model/RuntimeData.scala
@@ -1,7 +1,7 @@
 package gr.grnet.aquarium.model
 
-import java.util.Date
 import javax.persistence._
+import java.util.Date
 
 @javax.persistence.Entity
 @Table(name = "RUNTIME_DATA")
@@ -9,10 +9,10 @@ class RuntimeData extends Id {
 
   @Temporal(TemporalType.TIMESTAMP)
   @Column(name = "TIMESTAMP")
-  var timestamp : Date = _
+  var timestamp : Date = new Date()
 
   @Column(name = "MEASUREMENT")
-  var measurement : Float = _
+  var measurement : Float = 0.0F
 
   @ManyToOne(cascade = Array(CascadeType.ALL),
               targetEntity = classOf[ServiceItemConfig])