diff --git a/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java b/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java index ca9a347..4a55ce1 100644 --- a/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java +++ b/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java @@ -11,7 +11,7 @@ import java.util.Map; public class EthersexMixerImpl implements EthersexMixer, ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(EthersexMixerImpl.class); - private boolean hasDataChanged = true; +// private boolean hasDataChanged = true; @Override public final boolean updateDevice(BuntiDevice device, Map options) { diff --git a/src/main/java/de/ctdo/bunti/web/DevicesController.java b/src/main/java/de/ctdo/bunti/web/DevicesController.java index 5e7dfa2..43e1623 100644 --- a/src/main/java/de/ctdo/bunti/web/DevicesController.java +++ b/src/main/java/de/ctdo/bunti/web/DevicesController.java @@ -19,17 +19,20 @@ public class DevicesController { } @RequestMapping(value = "", method = RequestMethod.GET) - public @ResponseBody Collection getAll() { + @ResponseBody + public Collection getAll() { return devicesDAO.getAllDevices(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public @ResponseBody BuntiDevice getDeviceById(@PathVariable("id") int id) { + @ResponseBody + public BuntiDevice getDeviceById(@PathVariable("id") int id) { return devicesDAO.getDeviceById(id); } @RequestMapping(value = "", method = RequestMethod.POST) - public @ResponseBody BuntiDevice setDevices(@RequestBody BuntiDevice device) { + @ResponseBody + public BuntiDevice setDevices(@RequestBody BuntiDevice device) { devicesDAO.addDevice(device); return device; } diff --git a/src/main/java/de/ctdo/bunti/web/RoomsController.java b/src/main/java/de/ctdo/bunti/web/RoomsController.java index dcd4c00..0bb9ee3 100644 --- a/src/main/java/de/ctdo/bunti/web/RoomsController.java +++ b/src/main/java/de/ctdo/bunti/web/RoomsController.java @@ -21,18 +21,20 @@ public class RoomsController { } @RequestMapping(value = "", method = RequestMethod.GET) - public @ResponseBody Collection getAll() { + @ResponseBody + public Collection getAll() { return roomsDAO.getRooms(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public @ResponseBody Room getRoomById(@PathVariable("id") int id) { + @ResponseBody + public Room getRoomById(@PathVariable("id") int id) { return roomsDAO.getRoom(id); } @RequestMapping(value = "/{id}/devices", method = RequestMethod.GET) - public @ResponseBody - List getDevicesFromRoom(@PathVariable("id") int id) { + @ResponseBody + public List getDevicesFromRoom(@PathVariable("id") int id) { Room room = roomsDAO.getRoom(id); if(room != null) {