aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/api')
-rw-r--r--src/org/traccar/api/resource/AttributeResource.java2
-rw-r--r--src/org/traccar/api/resource/CalendarResource.java9
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java4
-rw-r--r--src/org/traccar/api/resource/DriverResource.java2
-rw-r--r--src/org/traccar/api/resource/GeofenceResource.java2
-rw-r--r--src/org/traccar/api/resource/GroupResource.java2
-rw-r--r--src/org/traccar/api/resource/PositionResource.java2
-rw-r--r--src/org/traccar/api/resource/UserResource.java2
8 files changed, 14 insertions, 11 deletions
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index 7b81d3ffb..c12fcd9e6 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -81,7 +81,7 @@ public class AttributeResource extends BaseResource {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
result.retainAll(attributesManager.getDeviceItems(deviceId));
}
- return attributesManager.getItems(Attribute.class, result);
+ return attributesManager.getItems(result);
}
diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index a0f8656af..f8d78a847 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -18,6 +18,7 @@ package org.traccar.api.resource;
import java.sql.SQLException;
import java.util.Collection;
+import java.util.Set;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -47,20 +48,22 @@ public class CalendarResource extends BaseResource {
@QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
CalendarManager calendarManager = Context.getCalendarManager();
+ Set<Long> result = null;
if (all) {
if (Context.getPermissionsManager().isAdmin(getUserId())) {
- return calendarManager.getItems(Calendar.class, calendarManager.getAllItems());
+ result = calendarManager.getAllItems();
} else {
Context.getPermissionsManager().checkManager(getUserId());
- return calendarManager.getItems(Calendar.class, calendarManager.getManagedItems(getUserId()));
+ result = calendarManager.getManagedItems(getUserId());
}
} else {
if (userId == 0) {
userId = getUserId();
}
Context.getPermissionsManager().checkUser(getUserId(), userId);
- return calendarManager.getItems(Calendar.class, calendarManager.getUserItems(userId));
+ result = calendarManager.getUserItems(userId);
}
+ return calendarManager.getItems(result);
}
@POST
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index c621d4304..a473b7bde 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -68,7 +68,7 @@ public class DeviceResource extends BaseResource {
} else {
result = new HashSet<Long>();
for (String uniqueId : uniqueIds) {
- Device device = deviceManager.getDeviceByUniqueId(uniqueId);
+ Device device = deviceManager.getByUniqueId(uniqueId);
Context.getPermissionsManager().checkDevice(getUserId(), device.getId());
result.add(device.getId());
}
@@ -77,7 +77,7 @@ public class DeviceResource extends BaseResource {
result.add(deviceId);
}
}
- return deviceManager.getItems(Device.class, result);
+ return deviceManager.getItems(result);
}
@POST
diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index 72eadb711..d44979998 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -79,7 +79,7 @@ public class DriverResource extends BaseResource {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
result.retainAll(driversManager.getDeviceItems(deviceId));
}
- return driversManager.getItems(Driver.class, result);
+ return driversManager.getItems(result);
}
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index 47f889e9c..9a110fbcf 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -78,7 +78,7 @@ public class GeofenceResource extends BaseResource {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
result.retainAll(geofenceManager.getDeviceItems(deviceId));
}
- return geofenceManager.getItems(Geofence.class, result);
+ return geofenceManager.getItems(result);
}
diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/org/traccar/api/resource/GroupResource.java
index f832660b2..4482f06c0 100644
--- a/src/org/traccar/api/resource/GroupResource.java
+++ b/src/org/traccar/api/resource/GroupResource.java
@@ -60,7 +60,7 @@ public class GroupResource extends BaseResource {
Context.getPermissionsManager().checkUser(getUserId(), userId);
result = groupsManager.getUserItems(userId);
}
- return groupsManager.getItems(Group.class, result);
+ return groupsManager.getItems(result);
}
@POST
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index 9d3cd9ae6..6dab51744 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -87,7 +87,7 @@ public class PositionResource extends BaseResource {
@QueryParam("deviceId") long deviceId, @QueryParam("from") String from, @QueryParam("to") String to)
throws SQLException {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- GpxBuilder gpx = new GpxBuilder(Context.getIdentityManager().getDeviceById(deviceId).getName());
+ GpxBuilder gpx = new GpxBuilder(Context.getIdentityManager().getById(deviceId).getName());
gpx.addPositions(Context.getDataManager().getPositions(
deviceId, DateUtil.parseDate(from), DateUtil.parseDate(to)));
return Response.ok(gpx.build()).header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_GPX).build();
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index 9998ed346..deb2dd2b4 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -58,7 +58,7 @@ public class UserResource extends BaseResource {
} else {
throw new SecurityException("Admin or manager access required");
}
- return usersManager.getItems(User.class, result);
+ return usersManager.getItems(result);
}
@PermitAll