From 6c444343d14bd3158bb27285efbcb17141166bff Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 1 Dec 2015 11:30:03 +1300
Subject: Remove response builder utility class

---
 src/org/traccar/api/resource/DeviceResource.java | 8 ++++----
 src/org/traccar/api/resource/UserResource.java   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/org/traccar/api/resource')

diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index 98f1d1cca..50589171d 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -34,7 +34,7 @@ import org.traccar.model.User;
 @Path("devices")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class DeviceResource extends BaseResource<Device, Long> {
+public class DeviceResource extends BaseResource<Device> {
 
     @GET
     @RolesAllowed(User.ROLE_ADMIN)
@@ -47,7 +47,7 @@ public class DeviceResource extends BaseResource<Device, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public Device getEntity(@PathParam("id") Long id) {
+    public Device getEntity(@PathParam("id") long id) {
         return super.getEntity(id);
     }
 
@@ -62,7 +62,7 @@ public class DeviceResource extends BaseResource<Device, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public Response putEntity(@PathParam("id") Long id, Device entity) {
+    public Response putEntity(@PathParam("id") long id, Device entity) {
         return super.putEntity(id, entity);
     }
 
@@ -70,7 +70,7 @@ public class DeviceResource extends BaseResource<Device, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public Response deleteEntity(@PathParam("id") Long id) {
+    public Response deleteEntity(@PathParam("id") long id) {
         return super.deleteEntity(id);
     }
 
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index d2964c983..8e17787c2 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -33,7 +33,7 @@ import org.traccar.model.User;
 @Path("users")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class UserResource extends BaseResource<User, Long> {
+public class UserResource extends BaseResource<User> {
 
     @GET
     @RolesAllowed(User.ROLE_ADMIN)
@@ -46,7 +46,7 @@ public class UserResource extends BaseResource<User, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public User getEntity(@PathParam("id") Long id) {
+    public User getEntity(@PathParam("id") long id) {
         return super.getEntity(id);
     }
 
@@ -61,7 +61,7 @@ public class UserResource extends BaseResource<User, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public Response putEntity(@PathParam("id") Long id, User entity) {
+    public Response putEntity(@PathParam("id") long id, User entity) {
         return super.putEntity(id, entity);
     }
 
@@ -69,7 +69,7 @@ public class UserResource extends BaseResource<User, Long> {
     @Path("{id}")
     @RolesAllowed(User.ROLE_USER)
     @Override
-    public Response deleteEntity(@PathParam("id") Long id) {
+    public Response deleteEntity(@PathParam("id") long id) {
         return super.deleteEntity(id);
     }
 
-- 
cgit v1.2.3