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

This commit is contained in:
Steinwagner 2019-12-11 10:23:58 +01:00
commit 4a81928c6a
3 changed files with 7 additions and 8 deletions

View file

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

View file

@ -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() {
return born;
public String getBorn() {
return born.toString();
}
@JsonProperty("healthScore")
@ -55,8 +56,8 @@ public class DeviceEvent implements IoTMessage {
}
@JsonProperty("eventTime")
public Instant getEventTime() {
return eventTime;
public String getEventTime() {
return eventTime.toString();
}
@JsonProperty("isAlive")

View file

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