Address Matt's feedback

Author: aulme

src/main/java/com/uid2/client/IdentityMapV3Helper.java

@@ -31,5 +31,5 @@ public IdentityMapV3Response createIdentityMapResponse(String responseString, En
         return new IdentityMapV3Response(decryptedResponseString, identityMapInput);
     }
 
-    Uid2Helper uid2Helper;
+    private final Uid2Helper uid2Helper;
 }

src/main/java/com/uid2/client/IdentityMapV3Input.java

@@ -37,7 +37,8 @@ public static IdentityMapV3Input fromHashedPhones(List<String> hashedPhones) {
         return new IdentityMapV3Input().withHashedPhones(hashedPhones);
     }
 
-    private transient final Map<String, List<String>> diiMappings = new HashMap<>();
+    // Transient as this should not be part of the serialized JSON payload we send to UID2 Operator
+    private transient final Map<String, List<String>> hashedDiiToRawDii = new HashMap<>();
 
     @SerializedName("email_hash")
     private final List<Identity> hashedEmails = new ArrayList<>();
@@ -139,14 +140,14 @@ public IdentityMapV3Input withPhone(String phone) {
     }
 
     List<String> getInputDiis(String identityType, int i) {
-        return diiMappings.get(getEncodedDii(identityType, i));
+        return hashedDiiToRawDii.get(getHashedDii(identityType, i));
     }
 
     private void addToDiiMappings(String hashedDii, String rawDii) {
-        diiMappings.computeIfAbsent(hashedDii, k -> new ArrayList<>()).add(rawDii);
+        hashedDiiToRawDii.computeIfAbsent(hashedDii, k -> new ArrayList<>()).add(rawDii);
     }
 
-    private String getEncodedDii(String identityType, int i) {
+    private String getHashedDii(String identityType, int i) {
         switch (identityType) {
             case "email_hash": return hashedEmails.get(i).identity;
             case "phone_hash": return hashedPhones.get(i).identity;

src/main/java/com/uid2/client/IdentityMapV3Response.java

@@ -40,23 +40,19 @@ private void populateIdentitiesForType(IdentityMapV3Input identityMapInput, Stri
         }
     }
 
-    private static IdentityMapV3Input getIdentityMapInput(IdentityMapV3Input identityMapInput) {
-        return identityMapInput;
-    }
-
     public boolean isSuccess() {
         return "success".equals(status);
     }
 
-    static public class ApiResponse {
+    public static class ApiResponse {
         @SerializedName("status")
         public String status;
 
         @SerializedName("body")
         public Map<String, List<ApiIdentity>> body;
     }
 
-    static public class ApiIdentity {
+    public static class ApiIdentity {
         @SerializedName("u")
         public String currentUid;
 
@@ -70,7 +66,7 @@ static public class ApiIdentity {
         public String error;
     }
 
-    static public class MappedIdentity {
+    public static class MappedIdentity {
         public MappedIdentity(String currentUid, String previousUid, Instant refreshFrom) {
             this.currentUid = currentUid;
             this.previousUid = previousUid;
@@ -98,7 +94,7 @@ public Instant getRefreshFrom() {
         }
     }
 
-    static public class UnmappedIdentity {
+    public static class UnmappedIdentity {
         public UnmappedIdentity(String reason)
         {
             this.reason = UnmappedIdentityReason.fromString(reason);
@@ -119,11 +115,11 @@ public String getRawReason() {
     }
 
     public HashMap<String, MappedIdentity> getMappedIdentities() {
-        return mappedIdentities;
+        return new HashMap<>(mappedIdentities);
     }
 
     public HashMap<String, UnmappedIdentity> getUnmappedIdentities() {
-        return unmappedIdentities;
+        return new HashMap<>(unmappedIdentities);
     }
 
     private final String status;