aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/AttributeResource.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-27 13:16:59 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-27 13:54:42 +0500
commite8a758072e9368f6977880e1aa607351d7cf619a (patch)
treeabf47e3c05d0fcd6c693a02def80ebaa91217b4f /src/org/traccar/api/resource/AttributeResource.java
parent495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (diff)
downloadtrackermap-server-e8a758072e9368f6977880e1aa607351d7cf619a.tar.gz
trackermap-server-e8a758072e9368f6977880e1aa607351d7cf619a.tar.bz2
trackermap-server-e8a758072e9368f6977880e1aa607351d7cf619a.zip
Implement BaseObjectResource generic and combine PUT/POST/DELETE functions
Diffstat (limited to 'src/org/traccar/api/resource/AttributeResource.java')
-rw-r--r--src/org/traccar/api/resource/AttributeResource.java53
1 files changed, 10 insertions, 43 deletions
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index c12fcd9e6..55fd39fc6 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -22,29 +22,29 @@ import java.util.HashSet;
import java.util.Set;
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;
import javax.ws.rs.core.Response;
import org.traccar.Context;
-import org.traccar.api.BaseResource;
+import org.traccar.api.BaseObjectResource;
import org.traccar.database.AttributesManager;
import org.traccar.model.Attribute;
import org.traccar.model.Position;
-import org.traccar.model.User;
import org.traccar.processing.ComputedAttributesHandler;
@Path("attributes/computed")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
-public class AttributeResource extends BaseResource {
+public class AttributeResource extends BaseObjectResource<Attribute> {
+
+ public AttributeResource() {
+ super(Attribute.class);
+ }
@GET
public Collection<Attribute> get(
@@ -85,15 +85,11 @@ public class AttributeResource extends BaseResource {
}
- private Response add(Attribute entity) throws SQLException {
+ @POST
+ @Path("test")
+ public Response test(@QueryParam("deviceId") long deviceId, Attribute entity) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
- Context.getAttributesManager().addItem(entity);
- Context.getDataManager().linkObject(User.class, getUserId(), entity.getClass(), entity.getId(), true);
- Context.getAttributesManager().refreshUserItems();
- return Response.ok(entity).build();
- }
-
- private Response test(long deviceId, Attribute entity) {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
Position last = Context.getIdentityManager().getLastPosition(deviceId);
if (last != null) {
Object result = new ComputedAttributesHandler().computeAttribute(entity, last);
@@ -114,33 +110,4 @@ public class AttributeResource extends BaseResource {
}
}
- @POST
- public Response post(@QueryParam("deviceId") long deviceId, Attribute entity) throws SQLException {
- Context.getPermissionsManager().checkReadonly(getUserId());
- if (deviceId != 0) {
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- return test(deviceId, entity);
- } else {
- return add(entity);
- }
- }
-
- @Path("{id}")
- @PUT
- public Response update(Attribute entity) throws SQLException {
- Context.getPermissionsManager().checkReadonly(getUserId());
- Context.getPermissionsManager().checkPermission(Attribute.class, getUserId(), entity.getId());
- Context.getAttributesManager().updateItem(entity);
- return Response.ok(entity).build();
- }
-
- @Path("{id}")
- @DELETE
- public Response remove(@PathParam("id") long id) throws SQLException {
- Context.getPermissionsManager().checkReadonly(getUserId());
- Context.getPermissionsManager().checkPermission(Attribute.class, getUserId(), id);
- Context.getAttributesManager().removeItem(id);
- return Response.noContent().build();
- }
-
}