Merge pull request #3399 from Abyss777/optimize_get

Combine some GET functions

1 files changed, 2 insertions, 50 deletions

diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index 185f4a0dc..91aa54c5e 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -16,69 +16,21 @@
  */
 package org.traccar.api.resource;
 
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
 import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import org.traccar.Context;
-import org.traccar.api.BaseObjectResource;
-import org.traccar.database.DriversManager;
+import org.traccar.api.ExtendedObjectResource;
 import org.traccar.model.Driver;
 
 @Path("drivers")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class DriverResource extends BaseObjectResource<Driver> {
+public class DriverResource extends ExtendedObjectResource<Driver> {
 
     public DriverResource() {
         super(Driver.class);
     }
 
-    @GET
-    public Collection<Driver> get(
-            @QueryParam("all") boolean all, @QueryParam("userId") long userId, @QueryParam("groupId") long groupId,
-            @QueryParam("deviceId") long deviceId, @QueryParam("refresh") boolean refresh) throws SQLException {
-
-        DriversManager driversManager = Context.getDriversManager();
-        if (refresh) {
-            driversManager.refreshItems();
-        }
-
-        Set<Long> result = new HashSet<>();
-        if (all) {
-            if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result.addAll(driversManager.getAllItems());
-            } else {
-                Context.getPermissionsManager().checkManager(getUserId());
-                result.addAll(driversManager.getManagedItems(getUserId()));
-            }
-        } else {
-            if (userId == 0) {
-                userId = getUserId();
-            }
-            Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result.addAll(driversManager.getUserItems(userId));
-        }
-
-        if (groupId != 0) {
-            Context.getPermissionsManager().checkGroup(getUserId(), groupId);
-            result.retainAll(driversManager.getGroupItems(groupId));
-        }
-
-        if (deviceId != 0) {
-            Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            result.retainAll(driversManager.getDeviceItems(deviceId));
-        }
-        return driversManager.getItems(result);
-
-    }
-
 }