Merge branch 'feature/device-service' of https://github.com/jazzm0/microservices-demo into feature/device-service

src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java

@@ -45,8 +45,8 @@ public class Device {
     }
 
     @JsonProperty("born")
-    public Instant getBorn() {
+    public String getBorn() {
-        return born;
+        return born.toString();
     }
 
     @JsonProperty("healthScore")

src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/DeviceEvent.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.time.Instant;
 
+
 public class DeviceEvent implements IoTMessage {
 
     @JsonProperty("id")
@@ -45,8 +46,8 @@ public class DeviceEvent implements IoTMessage {
     }
 
     @JsonProperty("born")
-    public Instant getBorn() {
+    public String getBorn() {
-        return born;
+        return born.toString();
     }
 
     @JsonProperty("healthScore")
@@ -55,8 +56,8 @@ public class DeviceEvent implements IoTMessage {
     }
 
     @JsonProperty("eventTime")
-    public Instant getEventTime() {
+    public String getEventTime() {
-        return eventTime;
+        return eventTime.toString();
     }
 
     @JsonProperty("isAlive")

src/tamagotchi-service/src/test/java/com/sap/tamagotchi/model/OwnerTest.java

@@ -1,7 +1,5 @@
 package com.sap.tamagotchi.model;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class OwnerTest {
 
 }