From 45a98c81bc5c9510dfe25f91b0e84d7608eaf7eb Mon Sep 17 00:00:00 2001
From: Anton Tananaev <atananaev@lyft.com>
Date: Mon, 28 Dec 2020 14:34:05 -0800
Subject: Refactor double keys

---
 src/main/java/org/traccar/config/Config.java | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 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 1231918c6..c6d87bfd6 100644
--- a/src/main/java/org/traccar/config/Config.java
+++ b/src/main/java/org/traccar/config/Config.java
@@ -134,16 +134,22 @@ public class Config {
         return hasKey(key) ? Long.parseLong(getString(key)) : defaultValue;
     }
 
-    public double getDouble(ConfigKey key) {
-        return getDouble(key, 0.0);
-    }
-
-    public double getDouble(ConfigKey key, double defaultValue) {
-        return hasKey(key.getKey()) ? Double.parseDouble(getString(key.getKey())) : defaultValue;
+    public double getDouble(ConfigKey<Double> key) {
+        String value = getString(key.getKey());
+        if (value != null) {
+            return Double.parseDouble(value);
+        } else {
+            Double defaultValue = key.getDefaultValue();
+            if (defaultValue != null) {
+                return defaultValue;
+            } else {
+                return 0;
+            }
+        }
     }
 
     @VisibleForTesting
-    public void setString(ConfigKey key, String value) {
+    public void setString(ConfigKey<?> key, String value) {
         properties.put(key.getKey(), value);
     }
 
-- 
cgit v1.2.3