diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-17 16:28:36 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-17 16:28:36 +1200 |
commit | 3f6f92cedd969e741e65bb6e14737b98722b214e (patch) | |
tree | 97b19d441bb9f79c73db493d6ad52b2e422ec1ba /src/org/traccar/web/CommandsServlet.java | |
parent | b6ba5a8ac60e8013e22ed44b15ffdc5ad8097060 (diff) | |
download | trackermap-server-3f6f92cedd969e741e65bb6e14737b98722b214e.tar.gz trackermap-server-3f6f92cedd969e741e65bb6e14737b98722b214e.tar.bz2 trackermap-server-3f6f92cedd969e741e65bb6e14737b98722b214e.zip |
Start re-factoring commands
Diffstat (limited to 'src/org/traccar/web/CommandsServlet.java')
-rw-r--r-- | src/org/traccar/web/CommandsServlet.java | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/org/traccar/web/CommandsServlet.java b/src/org/traccar/web/CommandsServlet.java deleted file mode 100644 index b12c0fa53..000000000 --- a/src/org/traccar/web/CommandsServlet.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.traccar.web; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.traccar.Context; -import org.traccar.command.CommandType; -import org.traccar.command.GpsCommand; -import org.traccar.database.ActiveDevice; - -public class CommandsServlet extends BaseServlet { - - @Override - protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception { - - switch (command) { - case "/send": - send(req, resp); - return true; - case "/raw": - sendRawCommand(req, resp); - return true; - default: - return false; - } - } - - private void send(HttpServletRequest req, HttpServletResponse resp) throws Exception { - GpsCommand command = JsonConverter.<GpsCommand>enumObjectFromJson(req.getReader(), new EnumFactory(CommandType.class, "type")); - - String uniqueId = command.getUniqueId(); - - ActiveDevice activeDevice = Context.getConnectionManager().getActiveDevice(uniqueId); - if(activeDevice == null) { - throw new RuntimeException("The device has not yet registered to the server"); - } - - activeDevice.sendCommand(command); - - sendResponse(resp.getWriter(), JsonConverter.objectToJson(new Object())); - } - - private void sendRawCommand(HttpServletRequest req, HttpServletResponse resp) throws Exception { - JsonObject json = Json.createReader(req.getReader()).readObject(); - String uniqueId = json.getString("uniqueId"); - - ActiveDevice activeDevice = Context.getConnectionManager().getActiveDevice(uniqueId); - if(activeDevice == null) { - throw new RuntimeException("The device has not yet registered to the server"); - } - - String command = json.getString("command"); - activeDevice.write(command); - - sendResponse(resp.getWriter(), JsonConverter.objectToJson(new Object())); - } -} |