Serializing dii in the new format

Author: aulme

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

@@ -13,13 +13,13 @@ public IdentityMapV3Client(String uid2BaseUrl, String clientApiKey, String base6
 
     /**
      * @param identityMapInput  represents the input required for <a href="https://unifiedid.com/docs/endpoints/post-identity-map">/identity/map</a>
-     * @return                  an IdentityMapResponse instance
+     * @return                  an IdentityMapV3Response instance
      * @throws Uid2Exception    if the response did not contain a "success" status, or the response code was not 200, or there was an error communicating with the provided UID2 Base URL
      */
     public IdentityMapV3Response generateIdentityMap(IdentityMapV3Input identityMapInput) {
         EnvelopeV2 envelope = identityMapHelper.createEnvelopeForIdentityMapRequest(identityMapInput);
 
-        String responseString = uid2ClientHelper.makeRequest(envelope, "/v2/identity/map");
+        String responseString = uid2ClientHelper.makeRequest(envelope, "/v3/identity/map");
         return identityMapHelper.createIdentityMapResponse(responseString, envelope, identityMapInput);
     }
 

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

@@ -45,26 +45,26 @@ private IdentityMapV3Input(IdentityType identityType, Iterable<String> emailsOrP
             hashedNormalizedEmails = new ArrayList<>();
             for (String email : emailsOrPhones) {
                 if (alreadyHashed) {
-                    hashedNormalizedEmails.add(email);
+                    hashedNormalizedEmails.add(new Identity(email));
                 } else {
                     String hashedEmail = InputUtil.normalizeAndHashEmail(email);
-                    hashedNormalizedEmails.add(hashedEmail);
+                    hashedNormalizedEmails.add(new Identity(hashedEmail));
                     addHashedToRawDiiMapping(hashedEmail, email);
                 }
             }
         } else {  //phone
             hashedNormalizedPhones = new ArrayList<>();
             for (String phone : emailsOrPhones) {
                 if (alreadyHashed) {
-                    hashedNormalizedPhones.add(phone);
+                    hashedNormalizedPhones.add(new Identity(phone));
                 } else {
                     if (!InputUtil.isPhoneNumberNormalized(phone)) {
                         throw new IllegalArgumentException("phone number is not normalized: " + phone);
                     }
 
                     String hashedNormalizedPhone = InputUtil.getBase64EncodedHash(phone);
                     addHashedToRawDiiMapping(hashedNormalizedPhone, phone);
-                    hashedNormalizedPhones.add(hashedNormalizedPhone);
+                    hashedNormalizedPhones.add(new Identity(hashedNormalizedPhone));
                 }
             }
         }
@@ -83,9 +83,18 @@ List<String> getRawDiis(String identifier) {
     }
 
     @SerializedName("email_hash")
-    private List<String> hashedNormalizedEmails;
+    private List<Identity> hashedNormalizedEmails;
     @SerializedName("phone_hash")
-    private List<String> hashedNormalizedPhones;
+    private List<Identity> hashedNormalizedPhones;
 
     private final transient HashMap<String, List<String>> hashedDiiToRawDiis = new HashMap<>();
+
+    private static class Identity {
+        @SerializedName("i")
+        private final String i;
+
+        public Identity(String value) {
+            this.i = value;
+        }
+    }
 }