diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:36:18 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:39:03 +0200 |
| commit | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch) | |
| tree | 2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/api/resource | |
| parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
| parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
| download | traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip | |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/api/resource')
| -rw-r--r-- | src/org/traccar/api/resource/DeviceResource.java | 3 | ||||
| -rw-r--r-- | src/org/traccar/api/resource/UserResource.java | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java index 5c58d3b32..18c4cb0ce 100644 --- a/src/org/traccar/api/resource/DeviceResource.java +++ b/src/org/traccar/api/resource/DeviceResource.java @@ -17,9 +17,8 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; +import org.traccar.model.Device; -import java.sql.SQLException; -import java.util.Collection; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java index 9eb0d9597..0b307ab88 100644 --- a/src/org/traccar/api/resource/UserResource.java +++ b/src/org/traccar/api/resource/UserResource.java @@ -15,8 +15,10 @@ */ package org.traccar.api.resource; -import java.sql.SQLException; -import java.util.Collection; +import org.traccar.Context; +import org.traccar.api.BaseResource; +import org.traccar.model.User; + import javax.annotation.security.PermitAll; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -28,10 +30,8 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - -import org.traccar.Context; -import org.traccar.api.BaseResource; -import org.traccar.model.User; +import java.sql.SQLException; +import java.util.Collection; @Path("users") @Produces(MediaType.APPLICATION_JSON) |