Migrate remaining int keys

2 files changed, 28 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/config/Config.java b/src/main/java/org/traccar/config/Config.java
index 54e6efd06..815a6e86a 100644
--- a/src/main/java/org/traccar/config/Config.java
+++ b/src/main/java/org/traccar/config/Config.java
@@ -112,11 +112,6 @@ public class Config {
         }
     }
 
-    @Deprecated
-    public int getInteger(String key) {
-        return getInteger(key, 0);
-    }
-
     public int getInteger(ConfigKey<Integer> key, int defaultValue) {
         return getInteger(key.getKey(), defaultValue);
     }
diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index f1efa7515..3f09190a1 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -45,6 +45,20 @@ public final class Keys {
             Collections.singletonList(KeyType.GLOBAL));
 
     /**
+     * Default protocol mask to use. Currently used only by Skypatrol protocol.
+     */
+    public static final ConfigSuffix<Integer> PROTOCOL_MASK = new ConfigSuffix<>(
+            ".mask",
+            Collections.singletonList(KeyType.GLOBAL));
+
+    /**
+     * Custom message length. Currently used only by H2 protocol for specifying binary message length.
+     */
+    public static final ConfigSuffix<Integer> PROTOCOL_MESSAGE_LENGTH = new ConfigSuffix<>(
+            ".messageLength",
+            Collections.singletonList(KeyType.GLOBAL));
+
+    /**
      * Server wide connection timeout value in seconds. See protocol timeout for more information.
      */
     public static final ConfigKey<Integer> SERVER_TIMEOUT = new ConfigKey<>(
@@ -751,6 +765,20 @@ public final class Keys {
             Collections.singletonList(KeyType.GLOBAL));
 
     /**
+     * Default MCC value to use if device doesn't report MCC.
+     */
+    public static final ConfigKey<Integer> GEOLOCATION_MCC = new ConfigKey<>(
+            "geolocation.mcc",
+            Collections.singletonList(KeyType.GLOBAL));
+
+    /**
+     * Default MNC value to use if device doesn't report MNC.
+     */
+    public static final ConfigKey<Integer> GEOLOCATION_MNC = new ConfigKey<>(
+            "geolocation.mnc",
+            Collections.singletonList(KeyType.GLOBAL));
+
+    /**
      * Boolean flag to enable speed limit API to get speed limit values depending on location. Default value is false.
      */
     public static final ConfigKey<Boolean> SPEED_LIMIT_ENABLE = new ConfigKey<>(