aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-01 16:21:35 +1200
committerGitHub <noreply@github.com>2017-08-01 16:21:35 +1200
commit06df08150504f86cc7e34c1ef90277c87ba55b99 (patch)
tree92caf0de95aa57185417433851a019529c2348a7 /src/org/traccar/api
parentbf8a7aac4921d17c086e6d35e44a1bc2e37888b8 (diff)
parent0c15d55ada982b404c9863a8409bb4e91aa59ace (diff)
downloadtrackermap-server-06df08150504f86cc7e34c1ef90277c87ba55b99.tar.gz
trackermap-server-06df08150504f86cc7e34c1ef90277c87ba55b99.tar.bz2
trackermap-server-06df08150504f86cc7e34c1ef90277c87ba55b99.zip
Merge pull request #3402 from Abyss777/construct_requests
Implement SQL requests construction
Diffstat (limited to 'src/org/traccar/api')
-rw-r--r--src/org/traccar/api/resource/EventResource.java2
-rw-r--r--src/org/traccar/api/resource/PositionResource.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index b7fda6f73..a7cf9edbd 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -23,7 +23,7 @@ public class EventResource extends BaseResource {
@Path("{id}")
@GET
public Event get(@PathParam("id") long id) throws SQLException {
- Event event = Context.getDataManager().getEvent(id);
+ Event event = Context.getDataManager().getObject(Event.class, id);
Context.getPermissionsManager().checkDevice(getUserId(), event.getDeviceId());
if (event.getGeofenceId() != 0) {
Context.getPermissionsManager().checkPermission(Geofence.class, getUserId(), event.getGeofenceId());
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index 6dab51744..c031b842f 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -54,7 +54,7 @@ public class PositionResource extends BaseResource {
if (!positionIds.isEmpty()) {
ArrayList<Position> positions = new ArrayList<>();
for (Long positionId : positionIds) {
- Position position = Context.getDataManager().getPosition(positionId);
+ Position position = Context.getDataManager().getObject(Position.class, positionId);
Context.getPermissionsManager().checkDevice(getUserId(), position.getDeviceId());
positions.add(position);
}