From 2377f5746ffb8a3364ad65a382ca5fce3fe11e87 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 27 Dec 2020 17:59:19 -0800 Subject: Remove GPX and CSV export --- .../org/traccar/api/resource/PositionResource.java | 33 ----- src/main/java/org/traccar/web/CsvBuilder.java | 161 --------------------- src/main/java/org/traccar/web/GpxBuilder.java | 69 --------- 3 files changed, 263 deletions(-) delete mode 100644 src/main/java/org/traccar/web/CsvBuilder.java delete mode 100644 src/main/java/org/traccar/web/GpxBuilder.java diff --git a/src/main/java/org/traccar/api/resource/PositionResource.java b/src/main/java/org/traccar/api/resource/PositionResource.java index e93feaccf..998d59706 100644 --- a/src/main/java/org/traccar/api/resource/PositionResource.java +++ b/src/main/java/org/traccar/api/resource/PositionResource.java @@ -18,18 +18,13 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; import org.traccar.model.Position; -import org.traccar.web.CsvBuilder; -import org.traccar.web.GpxBuilder; 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.HttpHeaders; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; @@ -42,11 +37,6 @@ import java.util.List; @Consumes(MediaType.APPLICATION_JSON) public class PositionResource extends BaseResource { - public static final String TEXT_CSV = "text/csv"; - public static final String CONTENT_DISPOSITION_VALUE_CSV = "attachment; filename=positions.csv"; - public static final String GPX = "application/gpx+xml"; - public static final String CONTENT_DISPOSITION_VALUE_GPX = "attachment; filename=positions.gpx"; - @GET public Collection getJson( @QueryParam("deviceId") long deviceId, @QueryParam("id") List positionIds, @@ -72,27 +62,4 @@ public class PositionResource extends BaseResource { } } - @GET - @Produces(TEXT_CSV) - public Response getCsv( - @QueryParam("deviceId") long deviceId, @QueryParam("from") Date from, @QueryParam("to") Date to) - throws SQLException { - Context.getPermissionsManager().checkDevice(getUserId(), deviceId); - CsvBuilder csv = new CsvBuilder(); - csv.addHeaderLine(new Position()); - csv.addArray(Context.getDataManager().getPositions(deviceId, from, to)); - return Response.ok(csv.build()).header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_CSV).build(); - } - - @GET - @Produces(GPX) - public Response getGpx( - @QueryParam("deviceId") long deviceId, @QueryParam("from") Date from, @QueryParam("to") Date to) - throws SQLException { - Context.getPermissionsManager().checkDevice(getUserId(), deviceId); - GpxBuilder gpx = new GpxBuilder(Context.getIdentityManager().getById(deviceId).getName()); - gpx.addPositions(Context.getDataManager().getPositions(deviceId, from, to)); - return Response.ok(gpx.build()).header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_GPX).build(); - } - } diff --git a/src/main/java/org/traccar/web/CsvBuilder.java b/src/main/java/org/traccar/web/CsvBuilder.java deleted file mode 100644 index b962be072..000000000 --- a/src/main/java/org/traccar/web/CsvBuilder.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2016 Anton Tananaev (anton@traccar.org) - * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.web; - -import java.beans.Introspector; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.traccar.Context; -import org.traccar.helper.DateUtil; - -public class CsvBuilder { - - private static final Logger LOGGER = LoggerFactory.getLogger(CsvBuilder.class); - - private static final String LINE_ENDING = "\r\n"; - private static final String SEPARATOR = ";"; - - private StringBuilder builder = new StringBuilder(); - - private void addLineEnding() { - builder.append(LINE_ENDING); - } - - private void addSeparator() { - builder.append(SEPARATOR); - } - - private SortedSet getSortedMethods(Object object) { - Method[] methodArray = object.getClass().getMethods(); - SortedSet methods = new TreeSet<>((m1, m2) -> { - if (m1.getName().equals("getAttributes") && !m1.getName().equals(m2.getName())) { - return 1; - } - if (m2.getName().equals("getAttributes") && !m1.getName().equals(m2.getName())) { - return -1; - } - return m1.getName().compareTo(m2.getName()); - }); - methods.addAll(Arrays.asList(methodArray)); - return methods; - } - - public void addLine(Object object) { - - SortedSet methods = getSortedMethods(object); - - for (Method method : methods) { - if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) { - try { - if (method.getReturnType().equals(boolean.class)) { - builder.append(method.invoke(object)); - addSeparator(); - } else if (method.getReturnType().equals(int.class)) { - builder.append(method.invoke(object)); - addSeparator(); - } else if (method.getReturnType().equals(long.class)) { - builder.append(method.invoke(object)); - addSeparator(); - } else if (method.getReturnType().equals(double.class)) { - builder.append(method.invoke(object)); - addSeparator(); - } else if (method.getReturnType().equals(String.class)) { - builder.append((String) method.invoke(object)); - addSeparator(); - } else if (method.getReturnType().equals(Date.class)) { - Date value = (Date) method.invoke(object); - builder.append(DateUtil.formatDate(value)); - addSeparator(); - } else if (method.getReturnType().equals(Map.class)) { - Map value = (Map) method.invoke(object); - if (value != null) { - try { - String map = Context.getObjectMapper().writeValueAsString(value); - map = map.replaceAll("[\\{\\}\"]", ""); - map = map.replaceAll(",", " "); - builder.append(map); - addSeparator(); - } catch (JsonProcessingException e) { - LOGGER.warn("Map JSON formatting error", e); - } - } - } - } catch (IllegalAccessException | InvocationTargetException error) { - LOGGER.warn("Reflection invocation error", error); - } - } - } - addLineEnding(); - } - - public void addHeaderLine(Object object) { - - SortedSet methods = getSortedMethods(object); - - for (Method method : methods) { - if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) { - String name = Introspector.decapitalize(method.getName().substring(3)); - if (!name.equals("class")) { - builder.append(name); - addSeparator(); - } - } - } - addLineEnding(); - } - - public void addArray(Collection array) { - for (Object object : array) { - switch (object.getClass().getSimpleName().toLowerCase()) { - case "string": - builder.append(object.toString()); - addLineEnding(); - break; - case "long": - builder.append((long) object); - addLineEnding(); - break; - case "double": - builder.append((double) object); - addLineEnding(); - break; - case "boolean": - builder.append((boolean) object); - addLineEnding(); - break; - default: - addLine(object); - break; - } - } - } - - public String build() { - return builder.toString(); - } - -} diff --git a/src/main/java/org/traccar/web/GpxBuilder.java b/src/main/java/org/traccar/web/GpxBuilder.java deleted file mode 100644 index aeb40a0fa..000000000 --- a/src/main/java/org/traccar/web/GpxBuilder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2016 Anton Tananaev (anton@traccar.org) - * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.web; - -import java.util.Collection; - -import org.traccar.helper.DateUtil; -import org.traccar.helper.UnitsConverter; -import org.traccar.model.Position; - -public class GpxBuilder { - - private StringBuilder builder = new StringBuilder(); - private static final String HEADER = "" - + "\n"; - private static final String NAME = "%1$s%n"; - private static final String POINT = "" - + "" - + "%4$f" - + "%5$f" - + "%6$f" - + "%n"; - private static final String FOOTER = ""; - - public GpxBuilder() { - builder.append(HEADER); - builder.append("\n"); - } - - public GpxBuilder(String name) { - builder.append(HEADER); - builder.append(String.format(NAME, name)); - } - - public void addPosition(Position position) { - builder.append(String.format(POINT, position.getLatitude(), position.getLongitude(), - DateUtil.formatDate(position.getFixTime()), position.getAltitude(), - position.getCourse(), UnitsConverter.mpsFromKnots(position.getSpeed()))); - } - - public void addPositions(Collection positions) { - for (Position position : positions) { - addPosition(position); - } - } - - public String build() { - builder.append(FOOTER); - return builder.toString(); - } - -} -- cgit v1.2.3