Improve code with convenience factory methods for collections

Author: purejava

pom.xml

@@ -50,8 +50,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.9</maven.compiler.source>
+    <maven.compiler.target>1.9</maven.compiler.target>
   </properties>
 
   <!-- local repo for tweetnacl-java -->

src/main/java/org/keepassxc/Connection.java

@@ -64,13 +64,12 @@ private void sendEncryptedMessage(Map<String, Object> msg) throws IOException {
         String strMsg = jsonTxt(msg);
         String encrypted = b64encode(box.box(strMsg.getBytes(), nonce));
 
-        map = new HashMap<>();
-        map.put("action", msg.get("action").toString());
-        map.put("message", encrypted);
-        map.put("nonce", b64encode(nonce));
-        map.put("clientID", clientID);
-
-        sendCleartextMessage(jsonTxt(map));
+        sendCleartextMessage(jsonTxt(Map.of(
+                "action", msg.get("action").toString(),
+                "message", encrypted,
+                "nonce", b64encode(nonce),
+                "clientID", clientID
+        )));
         incrementNonce();
 
     }
@@ -115,13 +114,12 @@ private JSONObject getEncryptedResponseAndDecrypt() throws IOException, KeepassP
      */
     protected void changePublibKeys() throws IOException, KeepassProxyAccessException {
         // Send change-public-keys request
-        map = new HashMap<>();
-        map.put("action", "change-public-keys");
-        map.put("publicKey", b64encode(keyPair.getPublicKey()));
-        map.put("nonce", b64encode(nonce));
-        map.put("clientID", clientID);
-
-        sendCleartextMessage(jsonTxt(map));
+        sendCleartextMessage(jsonTxt(Map.of(
+                "action", "change-public-keys",
+                "publicKey", b64encode(keyPair.getPublicKey()),
+                "nonce", b64encode(nonce),
+                "clientID", clientID
+        )));
         JSONObject response = getCleartextResponse();
 
         if (!response.has("success")) {
@@ -144,12 +142,11 @@ public void associate() throws IOException, KeepassProxyAccessException {
         idKeyPair = TweetNaclFast.Box.keyPair();
 
         // Send associate request
-        map = new HashMap<>();
-        map.put("action", "associate");
-        map.put("key", b64encode(keyPair.getPublicKey()));
-        map.put("idKey", b64encode(idKeyPair.getPublicKey()));
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "associate",
+                "key", b64encode(keyPair.getPublicKey()),
+                "idKey", b64encode(idKeyPair.getPublicKey())
+        ));
         JSONObject response = getEncryptedResponseAndDecrypt();
 
         associate_id = response.getString("id");
@@ -164,10 +161,7 @@ public void associate() throws IOException, KeepassProxyAccessException {
      */
     public String getDatabasehash() throws IOException, KeepassProxyAccessException {
         // Send get-databasehash request
-        map = new HashMap<>();
-        map.put("action", "get-databasehash");
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of("action", "get-databasehash"));
         JSONObject response = getEncryptedResponseAndDecrypt();
 
         return response.getString("hash");
@@ -184,12 +178,11 @@ public String getDatabasehash() throws IOException, KeepassProxyAccessException
      */
     public void testAssociate(String id, String key) throws IOException, KeepassProxyAccessException {
         // Send test-associate request
-        map = new HashMap<>();
-        map.put("action", "test-associate");
-        map.put("id", id);
-        map.put("key", key);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "test-associate",
+                "id", id,
+                "key", key
+        ));
         getEncryptedResponseAndDecrypt();
 
     }
@@ -217,14 +210,13 @@ public JSONObject getLogins(String url, String submitUrl, boolean httpAuth, List
         }
 
         // Send get-logins
-        map = new HashMap<>();
-        map.put("action", "get-logins");
-        map.put("url", url);
-        map.put("submitUrl", submitUrl);
-        map.put("httpAuth", httpAuth);
-        map.put("keys", array);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "get-logins",
+                "url", ensureNotNull(url),
+                "submitUrl", ensureNotNull(submitUrl),
+                "httpAuth", httpAuth,
+                "keys", array
+        ));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -250,19 +242,18 @@ public JSONObject getLogins(String url, String submitUrl, boolean httpAuth, List
      */
     public JSONObject setLogin(String url, String submitUrl, String id, String login, String password, String group, String groupUuid, String uuid) throws IOException, KeepassProxyAccessException {
         // Send set-login
-        map = new HashMap<>();
-        map.put("action", "set-login");
-        map.put("url", url);
-        map.put("submitUrl", submitUrl);
-        map.put("id", id);
-        map.put("nonce", b64encode(nonce));
-        map.put("login", login);
-        map.put("password", password);
-        map.put("group", group);
-        map.put("groupUuid", group);
-        map.put("uuid", uuid);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "set-login",
+                "url", ensureNotNull(url),
+                "submitUrl", ensureNotNull(submitUrl),
+                "id", ensureNotNull(id),
+                "nonce", b64encode(nonce),
+                "login", ensureNotNull(login),
+                "password", ensureNotNull(password),
+                "group", ensureNotNull(group),
+                "groupUuid", ensureNotNull(groupUuid),
+                "uuid", ensureNotNull(uuid)
+        ));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -276,10 +267,7 @@ public JSONObject setLogin(String url, String submitUrl, String id, String login
      */
     public JSONObject getDatabaseGroups() throws IOException, KeepassProxyAccessException {
         // Send get-database-groups
-        map = new HashMap<>();
-        map.put("action", "get-database-groups");
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of("action", "get-database-groups"));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -293,12 +281,11 @@ public JSONObject getDatabaseGroups() throws IOException, KeepassProxyAccessExce
      */
     public JSONObject generatePassword() throws IOException, KeepassProxyAccessException {
         // Send generate-password request
-        map = new HashMap<>();
-        map.put("action", "generate-password");
-        map.put("nonce", b64encode(nonce));
-        map.put("clientID", clientID);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "generate-password",
+                "nonce", b64encode(nonce),
+                "clientID", clientID
+        ));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -312,10 +299,7 @@ public JSONObject generatePassword() throws IOException, KeepassProxyAccessExcep
      */
     public JSONObject lockDatabase() throws IOException, KeepassProxyAccessException {
         // Send lock-database request
-        map = new HashMap<>();
-        map.put("action", "lock-database");
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of("action", "lock-database"));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -332,11 +316,10 @@ public JSONObject lockDatabase() throws IOException, KeepassProxyAccessException
      */
     public JSONObject createNewGroup(String path) throws IOException, KeepassProxyAccessException {
         // Send create-new-group request
-        map = new HashMap<>();
-        map.put("action", "create-new-group");
-        map.put("groupName", path);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "create-new-group",
+                "groupName", ensureNotNull(path)
+        ));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -352,11 +335,10 @@ public JSONObject createNewGroup(String path) throws IOException, KeepassProxyAc
      */
     public JSONObject getTotp(String uuid) throws IOException, KeepassProxyAccessException {
         // Send get-totp request
-        map = new HashMap<>();
-        map.put("action", "get-totp");
-        map.put("uuid", uuid);
-
-        sendEncryptedMessage(map);
+        sendEncryptedMessage(Map.of(
+                "action", "get-totp",
+                "uuid", ensureNotNull(uuid)
+        ));
         return getEncryptedResponseAndDecrypt();
 
     }
@@ -404,6 +386,10 @@ private String generateHEXUUID() {
         return UUID.randomUUID().toString().replace("-", "");
     }
 
+    private String ensureNotNull(String param) {
+        return null == param ? "" : param;
+    }
+
     // Getters
     public String getIdKeyPairPublicKey() {
         return null == idKeyPair ? null : b64encode(idKeyPair.getPublicKey());

src/main/java/org/purejava/KeepassProxyAccess.java

@@ -32,10 +32,8 @@ public KeepassProxyAccess() {
      * @return The agreed associateID and IDKeyPublicKey.
      */
     public Map<String, String> exportConnection() {
-        Map<String, String> m = new HashMap<>();
-        m.put("id", this.connection.getAssociateId());
-        m.put("key", this.connection.getIdKeyPairPublicKey());
-        return m;
+        return Map.of("id", this.connection.getAssociateId(),
+                "key", this.connection.getIdKeyPairPublicKey());
     }
 
     public void connect() throws IOException, KeepassProxyAccessException {
@@ -92,10 +90,8 @@ public String getTotp(String uuid) throws IOException, KeepassProxyAccessExcepti
      * @return Last part of the path name of the group that was created with its according groupUuid.
      */
     public Map<String, String> getNewGroupId(JSONObject jo) {
-        Map<String, String> m = new HashMap<>();
-        m.put("name", jo.getString("name"));
-        m.put("uuid", jo.getString("uuid"));
-        return m;
+        return Map.of("name", jo.getString("name"),
+                "uuid", jo.getString("uuid"));
     }
 
     /**