Pass a JSONObject instead of a Map in the constructor. Save 'json' to return as String.

Author: ul-jf

src/main/java/io/ipgeolocation/api/UserAgent.java

@@ -1,85 +1,83 @@
 package io.ipgeolocation.api;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.util.Objects.isNull;
+import java.util.Objects;
+import org.json.JSONObject;
 
 public class UserAgent {
+  private final String userAgentString;
+  private final String name;
+  private final String type;
+  private final String version;
+  private final String versionMajor;
+  public UserAgentDevice device;
+  private UserAgentEngine engine;
+  private UserAgentOperatingSystem operatingSystem;
+  private final JSONObject json;
+
+  UserAgent(JSONObject json) {
+    if (Objects.isNull(json)) {
+      throw new IllegalArgumentException("'json' must not be null");
+    }
 
-    private String userAgentString;
-    private String name;
-    private String type;
-    private String version;
-    private String versionMajor;
-    public UserAgentDevice device;
-    private UserAgentEngine engine;
-    private UserAgentOperatingSystem operatingSystem;
-
-    public UserAgent() {
+    if (json.isEmpty()) {
+      throw new IllegalArgumentException("'json' must not be empty");
     }
 
-    public UserAgent(Map<String, Object> json) {
-        if (isNull(json)) {
-            throw new IllegalArgumentException("'json' must not be null.");
-        }
-
-        if (json.isEmpty()) {
-            throw new IllegalArgumentException("'json' must not be empty.");
-        }
-
-        this.userAgentString = (String) json.get("userAgentString");
-        this.name = (String) json.get("name");
-        this.type = (String) json.get("type");
-        this.version = (String) json.get("version");
-        this.versionMajor = (String) json.get("versionMajor");
-        if (json.get("device") instanceof HashMap) {
-            Map<String, Object> deviceJson = (HashMap) json.get("device");
-            this.device = new UserAgentDevice(deviceJson);
-        }
-
-        if (json.get("engine") instanceof HashMap) {
-            Map<String, Object> engineJson = (HashMap) json.get("engine");
-            this.engine = new UserAgentEngine(engineJson);
-        }
-
-        if (json.get("operatingSystem") instanceof HashMap) {
-            Map<String, Object> operatingSystemJson = (HashMap) json.get("operatingSystem");
-            this.operatingSystem = new UserAgentOperatingSystem(operatingSystemJson);
-        }
+    this.userAgentString = json.getString("userAgentString");
+    this.name = json.getString("name");
+    this.type = json.getString("type");
+    this.version = json.getString("version");
+    this.versionMajor = json.getString("versionMajor");
 
+    if (json.has("device")) {
+      this.device = new UserAgentDevice(json.getJSONObject("device"));
     }
 
-    public String getUserAgentString() {
-        return userAgentString;
+    if (json.has("engine")) {
+      this.engine = new UserAgentEngine(json.getJSONObject("engine"));
     }
 
-    public String getName() {
-        return name;
+    if (json.has("operatingSystem")) {
+      this.operatingSystem = new UserAgentOperatingSystem(json.getJSONObject("operatingSystem"));
     }
 
-    public String getType() {
-        return type;
-    }
+    this.json = json;
+  }
 
-    public String getVersion() {
-        return version;
-    }
+  public String getUserAgentString() {
+    return userAgentString;
+  }
 
-    public String getVersionMajor() {
-        return versionMajor;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public UserAgentDevice getDevice() {
-        return device;
-    }
+  public String getType() {
+    return type;
+  }
 
-    public UserAgentEngine getEngine() {
-        return engine;
-    }
+  public String getVersion() {
+    return version;
+  }
 
-    public UserAgentOperatingSystem getOperatingSystem() {
-        return operatingSystem;
-    }
+  public String getVersionMajor() {
+    return versionMajor;
+  }
+
+  public UserAgentDevice getDevice() {
+    return device;
+  }
+
+  public UserAgentEngine getEngine() {
+    return engine;
+  }
+
+  public UserAgentOperatingSystem getOperatingSystem() {
+    return operatingSystem;
+  }
 
+  @Override
+  public String toString() {
+    return json.toString(2);
+  }
 }