aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-10 10:57:01 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-12-10 10:57:01 +1300
commit33d6d288d07fdd24fa8a6307d3eff8d371f5932a (patch)
tree3f1b59269c012f559c05037263fc43134499f17b /src
parent2263d424eb10a1ac56818ecea575723a3d380705 (diff)
downloadtrackermap-server-33d6d288d07fdd24fa8a6307d3eff8d371f5932a.tar.gz
trackermap-server-33d6d288d07fdd24fa8a6307d3eff8d371f5932a.tar.bz2
trackermap-server-33d6d288d07fdd24fa8a6307d3eff8d371f5932a.zip
Return JSON response by default
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/api/resource/EventResource.java1
-rw-r--r--src/org/traccar/api/resource/PositionResource.java3
-rw-r--r--src/org/traccar/api/resource/ReportResource.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index c0a8f968d..0ef5456af 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -29,4 +29,5 @@ public class EventResource extends BaseResource {
}
return event;
}
+
}
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index 84f406bee..9d3cd9ae6 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.List;
@Path("positions")
+@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public class PositionResource extends BaseResource {
@@ -46,7 +47,6 @@ public class PositionResource extends BaseResource {
public static final String CONTENT_DISPOSITION_VALUE_GPX = "attachment; filename=positions.gpx";
@GET
- @Produces(MediaType.APPLICATION_JSON)
public Collection<Position> getJson(
@QueryParam("deviceId") long deviceId, @QueryParam("id") List<Long> positionIds,
@QueryParam("from") String from, @QueryParam("to") String to)
@@ -92,4 +92,5 @@ public class PositionResource extends BaseResource {
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/ReportResource.java b/src/org/traccar/api/resource/ReportResource.java
index e37d6f01d..a1b35d64e 100644
--- a/src/org/traccar/api/resource/ReportResource.java
+++ b/src/org/traccar/api/resource/ReportResource.java
@@ -27,6 +27,7 @@ import org.traccar.reports.model.TripReport;
import org.traccar.reports.Route;
@Path("reports")
+@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public class ReportResource extends BaseResource {
@@ -35,7 +36,6 @@ public class ReportResource extends BaseResource {
@Path("route")
@GET
- @Produces(MediaType.APPLICATION_JSON)
public Collection<Position> getRoute(
@QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
@QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {
@@ -59,7 +59,6 @@ public class ReportResource extends BaseResource {
@Path("events")
@GET
- @Produces(MediaType.APPLICATION_JSON)
public Collection<Event> getEvents(
@QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
@QueryParam("type") final List<String> types,
@@ -85,7 +84,6 @@ public class ReportResource extends BaseResource {
@Path("summary")
@GET
- @Produces(MediaType.APPLICATION_JSON)
public Collection<SummaryReport> getSummary(
@QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
@QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {