aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-07-13 22:38:13 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-07-13 22:38:13 +1200
commitabb2f8614b7fbc25892e277b55fa216c7d81fd54 (patch)
treefea9e46e90d734c8052d81120c65fd50f492ee30 /src/org/traccar/http
parent8e033d5d4efa6a88f25e86517f858b696b76546c (diff)
downloadtrackermap-server-abb2f8614b7fbc25892e277b55fa216c7d81fd54.tar.gz
trackermap-server-abb2f8614b7fbc25892e277b55fa216c7d81fd54.tar.bz2
trackermap-server-abb2f8614b7fbc25892e277b55fa216c7d81fd54.zip
Use switch statemens with strings
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r--src/org/traccar/http/CommandsServlet.java28
-rw-r--r--src/org/traccar/http/DeviceServlet.java26
-rw-r--r--src/org/traccar/http/MainServlet.java28
-rw-r--r--src/org/traccar/http/PositionServlet.java11
-rw-r--r--src/org/traccar/http/ServerServlet.java18
-rw-r--r--src/org/traccar/http/UserServlet.java28
6 files changed, 83 insertions, 56 deletions
diff --git a/src/org/traccar/http/CommandsServlet.java b/src/org/traccar/http/CommandsServlet.java
index bf40b79e6..8b3d43fe7 100644
--- a/src/org/traccar/http/CommandsServlet.java
+++ b/src/org/traccar/http/CommandsServlet.java
@@ -1,29 +1,29 @@
package org.traccar.http;
-import org.traccar.Context;
-import org.traccar.database.ActiveDevice;
-import org.traccar.command.CommandType;
-import org.traccar.command.GpsCommand;
-
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 {
- if (command.equals("/send")) {
- send(req, resp);
- }
- else if (command.equals("/raw")) {
- sendRawCommand(req, resp);
- }
- else {
- return false;
+
+ switch (command) {
+ case "/send":
+ send(req, resp);
+ return true;
+ case "/raw":
+ sendRawCommand(req, resp);
+ return true;
+ default:
+ return false;
}
- return true;
}
private void send(HttpServletRequest req, HttpServletResponse resp) throws Exception {
diff --git a/src/org/traccar/http/DeviceServlet.java b/src/org/traccar/http/DeviceServlet.java
index 2a3e15a80..d1af1c106 100644
--- a/src/org/traccar/http/DeviceServlet.java
+++ b/src/org/traccar/http/DeviceServlet.java
@@ -24,16 +24,22 @@ public class DeviceServlet extends BaseServlet {
@Override
protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- if (command.equals("/get")) {
- get(req, resp);
- } else if (command.equals("/add")) {
- add(req, resp);
- } else if (command.equals("/update")) {
- update(req, resp);
- } else if (command.equals("/remove")) {
- remove(req, resp);
- } else {
- return false;
+
+ switch (command) {
+ case "/get":
+ get(req, resp);
+ break;
+ case "/add":
+ add(req, resp);
+ break;
+ case "/update":
+ update(req, resp);
+ break;
+ case "/remove":
+ remove(req, resp);
+ break;
+ default:
+ return false;
}
return true;
}
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index 18430f0c3..29eaaec33 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -26,18 +26,24 @@ public class MainServlet extends BaseServlet {
@Override
protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- if (command.equals("/session")) {
- session(req, resp);
- } else if (command.equals("/login")) {
- login(req, resp);
- } else if (command.equals("/logout")) {
- logout(req, resp);
- } else if (command.equals("/register")) {
- register(req, resp);
- } else {
- return false;
+
+ switch (command) {
+ case "/session":
+ session(req, resp);
+ break;
+ case "/login":
+ login(req, resp);
+ break;
+ case "/logout":
+ logout(req, resp);
+ break;
+ case "/register":
+ register(req, resp);
+ break;
+ default:
+ return false;
}
- return true;
+ return true;
}
private void session(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
diff --git a/src/org/traccar/http/PositionServlet.java b/src/org/traccar/http/PositionServlet.java
index 57b411a79..6f973be3c 100644
--- a/src/org/traccar/http/PositionServlet.java
+++ b/src/org/traccar/http/PositionServlet.java
@@ -23,10 +23,15 @@ public class PositionServlet extends BaseServlet {
@Override
protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- if (command.equals("/get")) {
- get(req, resp);
+
+ switch (command) {
+ case "/get":
+ get(req, resp);
+ break;
+ default:
+ return false;
}
- return true;
+ return true;
}
private void get(HttpServletRequest req, HttpServletResponse resp) throws Exception {
diff --git a/src/org/traccar/http/ServerServlet.java b/src/org/traccar/http/ServerServlet.java
index d814769a8..836a109fc 100644
--- a/src/org/traccar/http/ServerServlet.java
+++ b/src/org/traccar/http/ServerServlet.java
@@ -24,14 +24,18 @@ public class ServerServlet extends BaseServlet {
@Override
protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- if (command.equals("/get")) {
- get(req, resp);
- } else if (command.equals("/update")) {
- update(req, resp);
- } else {
- return false;
+
+ switch (command) {
+ case "/get":
+ get(req, resp);
+ break;
+ case "/update":
+ update(req, resp);
+ break;
+ default:
+ return false;
}
- return true;
+ return true;
}
private void get(HttpServletRequest req, HttpServletResponse resp) throws Exception {
diff --git a/src/org/traccar/http/UserServlet.java b/src/org/traccar/http/UserServlet.java
index 71af74485..976a62890 100644
--- a/src/org/traccar/http/UserServlet.java
+++ b/src/org/traccar/http/UserServlet.java
@@ -24,18 +24,24 @@ public class UserServlet extends BaseServlet {
@Override
protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- if (command.equals("/get")) {
- get(req, resp);
- } else if (command.equals("/add")) {
- add(req, resp);
- } else if (command.equals("/update")) {
- update(req, resp);
- } else if (command.equals("/remove")) {
- remove(req, resp);
- } else {
- return false;
+
+ switch (command) {
+ case "/get":
+ get(req, resp);
+ break;
+ case "/add":
+ add(req, resp);
+ break;
+ case "/update":
+ update(req, resp);
+ break;
+ case "/remove":
+ remove(req, resp);
+ break;
+ default:
+ return false;
}
- return true;
+ return true;
}
private void get(HttpServletRequest req, HttpServletResponse resp) throws Exception {