aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/api/resource
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-09-30 23:06:59 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-09-30 23:06:59 -0700
commitef5f959f737a6277b146e5eb4e34827638b1f93c (patch)
tree05dae02283339e64ace42ff062281a68a4f14df8 /src/main/java/org/traccar/api/resource
parent1e06b00e5f6068a191d0652798f12df77f0b0e0a (diff)
downloadtrackermap-server-ef5f959f737a6277b146e5eb4e34827638b1f93c.tar.gz
trackermap-server-ef5f959f737a6277b146e5eb4e34827638b1f93c.tar.bz2
trackermap-server-ef5f959f737a6277b146e5eb4e34827638b1f93c.zip
Various minor code cleanup
Diffstat (limited to 'src/main/java/org/traccar/api/resource')
-rw-r--r--src/main/java/org/traccar/api/resource/DeviceResource.java2
-rw-r--r--src/main/java/org/traccar/api/resource/UserResource.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/api/resource/DeviceResource.java b/src/main/java/org/traccar/api/resource/DeviceResource.java
index f9c9a139d..7006cdb84 100644
--- a/src/main/java/org/traccar/api/resource/DeviceResource.java
+++ b/src/main/java/org/traccar/api/resource/DeviceResource.java
@@ -52,7 +52,7 @@ public class DeviceResource extends BaseObjectResource<Device> {
@QueryParam("uniqueId") List<String> uniqueIds,
@QueryParam("id") List<Long> deviceIds) throws SQLException {
DeviceManager deviceManager = Context.getDeviceManager();
- Set<Long> result = null;
+ Set<Long> result;
if (all) {
if (Context.getPermissionsManager().getUserAdmin(getUserId())) {
result = deviceManager.getAllItems();
diff --git a/src/main/java/org/traccar/api/resource/UserResource.java b/src/main/java/org/traccar/api/resource/UserResource.java
index 0b42d8d92..813ace6d6 100644
--- a/src/main/java/org/traccar/api/resource/UserResource.java
+++ b/src/main/java/org/traccar/api/resource/UserResource.java
@@ -48,7 +48,7 @@ public class UserResource extends BaseObjectResource<User> {
@GET
public Collection<User> get(@QueryParam("userId") long userId) throws SQLException {
UsersManager usersManager = Context.getUsersManager();
- Set<Long> result = null;
+ Set<Long> result;
if (Context.getPermissionsManager().getUserAdmin(getUserId())) {
if (userId != 0) {
result = usersManager.getUserItems(userId);