From 51704590a835057bf4850a5eaf8c5037d20f648a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <atananaev@lyft.com>
Date: Mon, 28 Dec 2020 17:02:23 -0800
Subject: Migrate long config keys

---
 src/main/java/org/traccar/config/Config.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/org/traccar/config/Config.java')

diff --git a/src/main/java/org/traccar/config/Config.java b/src/main/java/org/traccar/config/Config.java
index 6cc21cbeb..713f5c607 100644
--- a/src/main/java/org/traccar/config/Config.java
+++ b/src/main/java/org/traccar/config/Config.java
@@ -117,17 +117,17 @@ public class Config {
     }
 
     public long getLong(ConfigKey<Long> key) {
-        return getLong(key.getKey());
-    }
-
-    @Deprecated
-    public long getLong(String key) {
-        return getLong(key, 0);
-    }
-
-    @Deprecated
-    public long getLong(String key, long defaultValue) {
-        return hasKey(key) ? Long.parseLong(getString(key)) : defaultValue;
+        String value = getString(key.getKey());
+        if (value != null) {
+            return Long.parseLong(value);
+        } else {
+            Long defaultValue = key.getDefaultValue();
+            if (defaultValue != null) {
+                return defaultValue;
+            } else {
+                return 0;
+            }
+        }
     }
 
     public double getDouble(ConfigKey<Double> key) {
-- 
cgit v1.2.3