From 83db076e2d098b5a6ae06fa61f3f0defdd96a844 Mon Sep 17 00:00:00 2001 From: Tibor Tarnai Date: Tue, 10 Dec 2019 16:09:46 +0100 Subject: [PATCH] extend --- .../sap/tamagotchi/controller/DeviceController.java | 10 ++++++++++ .../com/sap/tamagotchi/model/CreateDevicePayload.java | 4 ++++ .../src/main/java/com/sap/tamagotchi/model/Owner.java | 4 ++++ .../com/sap/tamagotchi/service/TamagotchiService.java | 9 +++++++++ 4 files changed, 27 insertions(+) create mode 100644 src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/CreateDevicePayload.java create mode 100644 src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/controller/DeviceController.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/controller/DeviceController.java index 4866888..223f943 100644 --- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/controller/DeviceController.java +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/controller/DeviceController.java @@ -1,5 +1,6 @@ package com.sap.tamagotchi.controller; +import java.util.Collection; import java.util.concurrent.atomic.AtomicLong; import com.sap.tamagotchi.model.Device; @@ -25,4 +26,13 @@ public class DeviceController { public Device getDevice(String deviceId) { return tamagotchiService.getDevice(deviceId); } + + @RequestMapping("devices") + public Collection getDevices() { + return tamagotchiService.getDevices(); + } + //TODO postmapping create + //request payload + // owner String + // color } diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/CreateDevicePayload.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/CreateDevicePayload.java new file mode 100644 index 0000000..3c891d3 --- /dev/null +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/CreateDevicePayload.java @@ -0,0 +1,4 @@ +package com.sap.tamagotchi.model; + +public class CreateDevicePayload { +} diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java new file mode 100644 index 0000000..46e5d61 --- /dev/null +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java @@ -0,0 +1,4 @@ +package com.sap.tamagotchi.model; + +public class Owner { +} diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java index b4c7371..ef46e91 100644 --- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java @@ -1,6 +1,8 @@ package com.sap.tamagotchi.service; import com.sap.tamagotchi.model.Device; +import com.sap.tamagotchi.publisher.PublisherService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collection; @@ -10,8 +12,15 @@ import java.util.Map; @Service public class TamagotchiService { + private final PublisherService publisherService; + private final Map deviceRegistry = new HashMap<>(); + @Autowired + public TamagotchiService(PublisherService publisherService) { + this.publisherService = publisherService; + } + public Device getDevice(String deviceId) { return deviceRegistry.get(deviceId); }