From c00703abad85ae27dbd26ffffd6908813bcb5e49 Mon Sep 17 00:00:00 2001 From: Edward Valley Date: Thu, 11 Jul 2019 02:39:05 -0400 Subject: Changes after fifth review --- src/main/java/org/traccar/database/DeviceManager.java | 1 + src/test/java/org/traccar/TestIdentityManager.java | 5 +---- 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 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; } -- cgit v1.2.3