From e8a758072e9368f6977880e1aa607351d7cf619a Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 27 Jul 2017 13:16:59 +0500
Subject: Implement BaseObjectResource generic and combine PUT/POST/DELETE
 functions

---
 src/org/traccar/api/resource/DeviceResource.java | 49 +++---------------------
 1 file changed, 6 insertions(+), 43 deletions(-)

(limited to 'src/org/traccar/api/resource/DeviceResource.java')

diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index a473b7bde..1c2c653a4 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -16,19 +16,15 @@
 package org.traccar.api.resource;
 
 import org.traccar.Context;
-import org.traccar.api.BaseResource;
+import org.traccar.api.BaseObjectResource;
 import org.traccar.database.DeviceManager;
 import org.traccar.model.Device;
 import org.traccar.model.DeviceTotalDistance;
-import org.traccar.model.User;
 
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
-import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
@@ -43,7 +39,11 @@ import java.util.Set;
 @Path("devices")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class DeviceResource extends BaseResource {
+public class DeviceResource extends BaseObjectResource<Device> {
+
+    public DeviceResource() {
+        super(Device.class);
+    }
 
     @GET
     public Collection<Device> get(
@@ -80,43 +80,6 @@ public class DeviceResource extends BaseResource {
         return deviceManager.getItems(result);
     }
 
-    @POST
-    public Response add(Device entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceLimit(getUserId());
-        Context.getDeviceManager().addItem(entity);
-        Context.getDataManager().linkObject(User.class, getUserId(), entity.getClass(), entity.getId(), true);
-        Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
-        Context.getPermissionsManager().refreshAllExtendedPermissions();
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @PUT
-    public Response update(Device entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getId());
-        Context.getDeviceManager().updateItem(entity);
-        Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
-        Context.getPermissionsManager().refreshAllExtendedPermissions();
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @DELETE
-    public Response remove(@PathParam("id") long id) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), id);
-        Context.getDeviceManager().removeItem(id);
-        Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
-        Context.getPermissionsManager().refreshAllExtendedPermissions();
-        Context.getAliasesManager().removeDevice(id);
-        return Response.noContent().build();
-    }
-
     @Path("{id}/distance")
     @PUT
     public Response updateTotalDistance(DeviceTotalDistance entity) throws SQLException {
-- 
cgit v1.2.3