aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-20 22:15:47 +1200
committerGitHub <noreply@github.com>2017-09-20 22:15:47 +1200
commit06bdcf65a08b233f6c56ddf4774287c0c0232597 (patch)
treeaaf585157b84016713eaf74e54d7d1807f74398b /src
parent849878cf105baed2348c605f7232012efb294480 (diff)
parentb7a5bb6d48ba0363e9437f44eaa546de16f27aef (diff)
downloadtraccar-server-06bdcf65a08b233f6c56ddf4774287c0c0232597.tar.gz
traccar-server-06bdcf65a08b233f6c56ddf4774287c0c0232597.tar.bz2
traccar-server-06bdcf65a08b233f6c56ddf4774287c0c0232597.zip
Merge pull request #3538 from Abyss777/move_command_types
Move Commandtypes API to Commands
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/api/resource/CommandResource.java14
-rw-r--r--src/org/traccar/api/resource/CommandTypeResource.java47
2 files changed, 14 insertions, 47 deletions
diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java
index 6a258497f..8da9f8447 100644
--- a/src/org/traccar/api/resource/CommandResource.java
+++ b/src/org/traccar/api/resource/CommandResource.java
@@ -1,5 +1,7 @@
/*
* Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
+ * Copyright 2017 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.
@@ -19,6 +21,7 @@ import org.traccar.Context;
import org.traccar.api.ExtendedObjectResource;
import org.traccar.database.CommandsManager;
import org.traccar.model.Command;
+import org.traccar.model.Typed;
import java.sql.SQLException;
import java.util.Collection;
@@ -72,4 +75,15 @@ public class CommandResource extends ExtendedObjectResource<Command> {
return Response.ok(entity).build();
}
+ @GET
+ @Path("types")
+ public Collection<Typed> get(@QueryParam("deviceId") long deviceId,
+ @QueryParam("textChannel") boolean textChannel) {
+ if (deviceId != 0) {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+ return Context.getCommandsManager().getCommandTypes(deviceId, textChannel);
+ } else {
+ return Context.getCommandsManager().getAllCommandTypes();
+ }
+ }
}
diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java
deleted file mode 100644
index 0a904bd8a..000000000
--- a/src/org/traccar/api/resource/CommandTypeResource.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
- * Copyright 2017 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.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.Typed;
-
-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.MediaType;
-import java.util.Collection;
-
-@Path("commandtypes")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class CommandTypeResource extends BaseResource {
-
- @GET
- public Collection<Typed> get(@QueryParam("deviceId") long deviceId,
- @QueryParam("textChannel") boolean textChannel) {
- if (deviceId != 0) {
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- return Context.getCommandsManager().getCommandTypes(deviceId, textChannel);
- } else {
- return Context.getCommandsManager().getAllCommandTypes();
- }
- }
-
-}