fixed device resource, had wrong path annotation

Author: armzilla

…ain/java/com/armzilla/ha/dao/Device.java …ain/java/com/armzilla/ha/api/Device.javasrc/main/java/com/armzilla/ha/dao/Device.java renamed to src/main/java/com/armzilla/ha/api/Device.java src/main/java/com/armzilla/ha/dao/Device.java renamed to src/main/java/com/armzilla/ha/api/Device.java

@@ -1,4 +1,4 @@
-package com.armzilla.ha.dao;
+package com.armzilla.ha.api;
 
 /**
  * Created by arm on 4/13/15.

src/main/java/com/armzilla/ha/dao/DeviceDescriptor.java

@@ -6,21 +6,10 @@
 /**
  * Created by arm on 4/13/15.
  */
-@Document(indexName = "documentdescriptor", type = "document", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "device", type = "devicedescriptor", shards = 1, replicas = 0, refreshInterval = "-1")
 public class DeviceDescriptor{
     @Id
     private String id;
-
-    public DeviceDescriptor(){}
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     private String name;
     private String deviceType;
     private String offUrl;
@@ -57,4 +46,12 @@ public String getOnUrl() {
     public void setOnUrl(String onUrl) {
         this.onUrl = onUrl;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

src/main/java/com/armzilla/ha/dao/DeviceRepository.java

@@ -10,6 +10,6 @@
 public interface DeviceRepository extends ElasticsearchRepository<DeviceDescriptor, String> {
     List<DeviceDescriptor> findByDeviceType(String type);
     List<DeviceDescriptor> findAll();
-    DeviceDescriptor findById(String id);
+    DeviceDescriptor findOne(String id);
 
 }

src/main/java/com/armzilla/ha/devicemanagmeent/DeviceResource.java

@@ -1,17 +1,17 @@
 package com.armzilla.ha.devicemanagmeent;
 
-import com.armzilla.ha.dao.Device;
+import com.armzilla.ha.api.Device;
 import com.armzilla.ha.dao.DeviceDescriptor;
 import com.armzilla.ha.dao.DeviceRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.websocket.server.PathParam;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -48,12 +48,23 @@ public ResponseEntity<List<DeviceDescriptor>> findAllDevices() {
     }
 
     @RequestMapping(value = "/{lightId}", method = RequestMethod.GET, produces = "application/json")
-    public ResponseEntity<DeviceDescriptor> findByDeviceId(@PathParam("lightId") String id){
-        DeviceDescriptor descriptor = deviceRepository.findById(id);
+    public ResponseEntity<DeviceDescriptor> findByDevicId(@PathVariable("lightId") String id){
+        DeviceDescriptor descriptor = deviceRepository.findOne(id);
         if(descriptor == null){
             return new ResponseEntity<>(null, null, HttpStatus.NOT_FOUND);
         }
         return new ResponseEntity<>(descriptor, null, HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/{lightId}", method = RequestMethod.DELETE, produces = "application/json")
+    public ResponseEntity<String> deleteDeviceById(@PathVariable("lightId") String id){
+        DeviceDescriptor deleted = deviceRepository.findOne(id);
+        if(deleted == null){
+            return new ResponseEntity<>(null, null, HttpStatus.NOT_FOUND);
+        }
+        deviceRepository.delete(deleted);
+        return new ResponseEntity<>(null, null, HttpStatus.NO_CONTENT);
+    }
+
+
 }

src/main/java/com/armzilla/ha/hue/HueMulator.java

@@ -77,7 +77,7 @@ public ResponseEntity<HueApiResponse> getApi(@PathVariable(value = "userId") Str
     @RequestMapping(value = "/{userId}/lights/{lightId}", method = RequestMethod.GET, produces = "application/json")
     public ResponseEntity<DeviceResponse> getLigth(@PathVariable(value = "lightId") String lightId, @PathVariable(value = "userId") String userId, HttpServletRequest request) {
         log.info("hue light requested: " + lightId + " from " + request.getRemoteAddr());
-        DeviceDescriptor device = repository.findById(lightId);
+        DeviceDescriptor device = repository.findOne(lightId);
         if (device == null) {
             return new ResponseEntity<>(null, null, HttpStatus.NOT_FOUND);
         } else {
@@ -109,7 +109,7 @@ public ResponseEntity<String> stateChange(@PathVariable(value = "lightId") Strin
         } else {
             setting = "[{\"success\":{\"/lights/" + lightId + "/state/on\":false}}]";
         }
-        DeviceDescriptor device = repository.findById(lightId);
+        DeviceDescriptor device = repository.findOne(lightId);
         if (device == null) {
             return new ResponseEntity<>(null, null, HttpStatus.NOT_FOUND);
         }