aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Valley <ed.valley@yandex.com>2019-07-11 02:39:05 -0400
committerEdward Valley <ed.valley@yandex.com>2019-07-11 02:39:05 -0400
commitc00703abad85ae27dbd26ffffd6908813bcb5e49 (patch)
tree274288bce147487ca04cc43de125ad7c365e68b4
parent35b6dc85f8c0c23ede5ece005bdc893c4320b8f3 (diff)
downloadtrackermap-server-c00703abad85ae27dbd26ffffd6908813bcb5e49.tar.gz
trackermap-server-c00703abad85ae27dbd26ffffd6908813bcb5e49.tar.bz2
trackermap-server-c00703abad85ae27dbd26ffffd6908813bcb5e49.zip
Changes after fifth review
-rw-r--r--src/main/java/org/traccar/database/DeviceManager.java1
-rw-r--r--src/test/java/org/traccar/TestIdentityManager.java5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index 231be7b07..62e6de080 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -115,6 +115,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
return devicesByUniqueId.get(uniqueId);
}
+ @Override
public String getDevicePassword(long id, String defaultPassword) {
String password = getById(id).getString(Command.KEY_DEVICE_PASSWORD);
diff --git a/src/test/java/org/traccar/TestIdentityManager.java b/src/test/java/org/traccar/TestIdentityManager.java
index 1f7867875..98297c53c 100644
--- a/src/test/java/org/traccar/TestIdentityManager.java
+++ b/src/test/java/org/traccar/TestIdentityManager.java
@@ -29,10 +29,7 @@ public final class TestIdentityManager implements IdentityManager {
return createDevice();
}
- public String getDevicePassword(long id) {
- return null;
- }
-
+ @Override
public String getDevicePassword(long id, String defaultPassword) {
return defaultPassword;
}