From 59416923dcb3a756eaf532cc4259f2f6625c0762 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 31 Mar 2019 22:35:39 -0700 Subject: Convert project to gradle --- src/org/traccar/web/ConsoleServlet.java | 61 ----------- src/org/traccar/web/CsvBuilder.java | 164 ------------------------------ src/org/traccar/web/GpxBuilder.java | 69 ------------- src/org/traccar/web/WebServer.java | 173 -------------------------------- 4 files changed, 467 deletions(-) delete mode 100644 src/org/traccar/web/ConsoleServlet.java delete mode 100644 src/org/traccar/web/CsvBuilder.java delete mode 100644 src/org/traccar/web/GpxBuilder.java delete mode 100644 src/org/traccar/web/WebServer.java (limited to 'src/org/traccar/web') diff --git a/src/org/traccar/web/ConsoleServlet.java b/src/org/traccar/web/ConsoleServlet.java deleted file mode 100644 index 2b38a935a..000000000 --- a/src/org/traccar/web/ConsoleServlet.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2015 - 2016 Anton Tananaev (anton@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 org.h2.server.web.ConnectionInfo; -import org.h2.server.web.WebServlet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.traccar.Context; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class ConsoleServlet extends WebServlet { - - private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleServlet.class); - - @Override - public void init() { - super.init(); - - try { - Field field = WebServlet.class.getDeclaredField("server"); - field.setAccessible(true); - org.h2.server.web.WebServer server = (org.h2.server.web.WebServer) field.get(this); - - ConnectionInfo connectionInfo = new ConnectionInfo("Traccar|" - + Context.getConfig().getString("database.driver") + "|" - + Context.getConfig().getString("database.url") + "|" - + Context.getConfig().getString("database.user")); - - Method method; - - method = org.h2.server.web.WebServer.class.getDeclaredMethod("updateSetting", ConnectionInfo.class); - method.setAccessible(true); - method.invoke(server, connectionInfo); - - method = org.h2.server.web.WebServer.class.getDeclaredMethod("setAllowOthers", boolean.class); - method.setAccessible(true); - method.invoke(server, true); - - } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { - LOGGER.warn("Console reflection error", e); - } - } - -} diff --git a/src/org/traccar/web/CsvBuilder.java b/src/org/traccar/web/CsvBuilder.java deleted file mode 100644 index 3fe7e408f..000000000 --- a/src/org/traccar/web/CsvBuilder.java +++ /dev/null @@ -1,164 +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.Comparator; -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<>(new Comparator() { - @Override - public int compare(Method m1, Method 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/org/traccar/web/GpxBuilder.java b/src/org/traccar/web/GpxBuilder.java deleted file mode 100644 index 638d100e5..000000000 --- a/src/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(); - } - -} diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java deleted file mode 100644 index 70fef4ed3..000000000 --- a/src/org/traccar/web/WebServer.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright 2012 - 2019 Anton Tananaev (anton@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 org.eclipse.jetty.http.HttpMethod; -import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.proxy.AsyncProxyServlet; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.ErrorHandler; -import org.eclipse.jetty.server.handler.HandlerList; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.glassfish.jersey.jackson.JacksonFeature; -import org.glassfish.jersey.server.ResourceConfig; -import org.glassfish.jersey.servlet.ServletContainer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.traccar.config.Config; -import org.traccar.api.AsyncSocketServlet; -import org.traccar.api.CorsResponseFilter; -import org.traccar.api.MediaFilter; -import org.traccar.api.ObjectMapperProvider; -import org.traccar.api.ResourceErrorHandler; -import org.traccar.api.SecurityRequestFilter; -import org.traccar.api.resource.ServerResource; - -import javax.servlet.DispatcherType; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.net.InetSocketAddress; -import java.util.EnumSet; - -public class WebServer { - - private static final Logger LOGGER = LoggerFactory.getLogger(WebServer.class); - - private Server server; - - private void initServer(Config config) { - - String address = config.getString("web.address"); - int port = config.getInteger("web.port", 8082); - if (address == null) { - server = new Server(port); - } else { - server = new Server(new InetSocketAddress(address, port)); - } - } - - public WebServer(Config config) { - - initServer(config); - - ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); - - int sessionTimeout = config.getInteger("web.sessionTimeout"); - if (sessionTimeout > 0) { - servletHandler.getSessionHandler().setMaxInactiveInterval(sessionTimeout); - } - - initApi(config, servletHandler); - - if (config.getBoolean("web.console")) { - servletHandler.addServlet(new ServletHolder(new ConsoleServlet()), "/console/*"); - } - - initWebApp(config, servletHandler); - - servletHandler.setErrorHandler(new ErrorHandler() { - @Override - protected void handleErrorPage( - HttpServletRequest request, Writer writer, int code, String message) throws IOException { - writer.write("Error" - + code + " - " + HttpStatus.getMessage(code) + ""); - } - }); - - HandlerList handlers = new HandlerList(); - initClientProxy(config, handlers); - handlers.addHandler(servletHandler); - server.setHandler(handlers); - } - - private void initClientProxy(Config config, HandlerList handlers) { - int port = config.getInteger("osmand.port"); - if (port != 0) { - ServletContextHandler servletHandler = new ServletContextHandler() { - @Override - public void doScope( - String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - if (target.equals("/") && request.getMethod().equals(HttpMethod.POST.asString())) { - super.doScope(target, baseRequest, request, response); - } - } - }; - ServletHolder servletHolder = new ServletHolder(new AsyncProxyServlet.Transparent()); - servletHolder.setInitParameter("proxyTo", "http://localhost:" + port); - servletHandler.addServlet(servletHolder, "/"); - handlers.addHandler(servletHandler); - } - } - - private void initWebApp(Config config, ServletContextHandler servletHandler) { - ServletHolder servletHolder = new ServletHolder(DefaultServlet.class); - servletHolder.setInitParameter("resourceBase", new File(config.getString("web.path")).getAbsolutePath()); - if (config.getBoolean("web.debug")) { - servletHandler.setWelcomeFiles(new String[] {"debug.html", "index.html"}); - } else { - String cache = config.getString("web.cacheControl"); - if (cache != null && !cache.isEmpty()) { - servletHolder.setInitParameter("cacheControl", cache); - } - servletHandler.setWelcomeFiles(new String[] {"release.html", "index.html"}); - } - servletHandler.addServlet(servletHolder, "/*"); - } - - private void initApi(Config config, ServletContextHandler servletHandler) { - servletHandler.addServlet(new ServletHolder(new AsyncSocketServlet()), "/api/socket"); - - if (config.hasKey("media.path")) { - ServletHolder servletHolder = new ServletHolder(DefaultServlet.class); - servletHolder.setInitParameter("resourceBase", new File(config.getString("media.path")).getAbsolutePath()); - servletHolder.setInitParameter("dirAllowed", config.getString("media.dirAllowed", "false")); - servletHolder.setInitParameter("pathInfoOnly", "true"); - servletHandler.addServlet(servletHolder, "/api/media/*"); - servletHandler.addFilter(MediaFilter.class, "/api/media/*", EnumSet.allOf(DispatcherType.class)); - } - - ResourceConfig resourceConfig = new ResourceConfig(); - resourceConfig.registerClasses(JacksonFeature.class, ObjectMapperProvider.class, ResourceErrorHandler.class); - resourceConfig.registerClasses(SecurityRequestFilter.class, CorsResponseFilter.class); - resourceConfig.packages(ServerResource.class.getPackage().getName()); - servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/api/*"); - } - - public void start() { - try { - server.start(); - } catch (Exception error) { - LOGGER.warn("Web server start failed", error); - } - } - - public void stop() { - try { - server.stop(); - } catch (Exception error) { - LOGGER.warn("Web server stop failed", error); - } - } - -} -- cgit v1.2.3