1 files changed, 39 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index 8353d0e66..d5cd094da 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,22 @@ package org.traccar.model;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class ExtendedModel extends BaseModel {
 
     private Map<String, Object> attributes = new LinkedHashMap<>();
 
+    public boolean hasAttribute(String key) {
+        return attributes.containsKey(key);
+    }
+
     public Map<String, Object> getAttributes() {
         return attributes;
     }
 
     public void setAttributes(Map<String, Object> attributes) {
-        this.attributes = attributes;
+        this.attributes = Objects.requireNonNullElseGet(attributes, LinkedHashMap::new);
     }
 
     public void set(String key, Boolean value) {
@@ -84,17 +89,27 @@ public class ExtendedModel extends BaseModel {
         }
     }
 
-    public String getString(String key) {
+    public String getString(String key, String defaultValue) {
         if (attributes.containsKey(key)) {
-            return (String) attributes.get(key);
+            Object value = attributes.get(key);
+            return value != null ? value.toString() : null;
         } else {
-            return null;
+            return defaultValue;
         }
     }
 
+    public String getString(String key) {
+        return getString(key, null);
+    }
+
     public double getDouble(String key) {
         if (attributes.containsKey(key)) {
-            return ((Number) attributes.get(key)).doubleValue();
+            Object value = attributes.get(key);
+            if (value instanceof Number) {
+                return ((Number) attributes.get(key)).doubleValue();
+            } else {
+                return Double.parseDouble(value.toString());
+            }
         } else {
             return 0.0;
         }
@@ -102,7 +117,12 @@ public class ExtendedModel extends BaseModel {
 
     public boolean getBoolean(String key) {
         if (attributes.containsKey(key)) {
-            return (Boolean) attributes.get(key);
+            Object value = attributes.get(key);
+            if (value instanceof Boolean) {
+                return (Boolean) attributes.get(key);
+            } else {
+                return Boolean.parseBoolean(value.toString());
+            }
         } else {
             return false;
         }
@@ -110,7 +130,12 @@ public class ExtendedModel extends BaseModel {
 
     public int getInteger(String key) {
         if (attributes.containsKey(key)) {
-            return ((Number) attributes.get(key)).intValue();
+            Object value = attributes.get(key);
+            if (value instanceof Number) {
+                return ((Number) attributes.get(key)).intValue();
+            } else {
+                return Integer.parseInt(value.toString());
+            }
         } else {
             return 0;
         }
@@ -118,7 +143,12 @@ public class ExtendedModel extends BaseModel {
 
     public long getLong(String key) {
         if (attributes.containsKey(key)) {
-            return ((Number) attributes.get(key)).longValue();
+            Object value = attributes.get(key);
+            if (value instanceof Number) {
+                return ((Number) attributes.get(key)).longValue();
+            } else {
+                return Long.parseLong(value.toString());
+            }
         } else {
             return 0;
         }