Empty constructor pulbic and with methods for one dii are available

Author: aulme

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

@@ -45,44 +45,65 @@ public static IdentityMapV3Input fromHashedPhones(List<String> hashedPhones) {
     @SerializedName("phone_hash")
     private final List<Identity> hashedPhones = new ArrayList<>();
 
-    private IdentityMapV3Input() {}
+    public IdentityMapV3Input() {}
 
     public IdentityMapV3Input withHashedEmails(List<String> hashedEmails) {
         for (String hashedEmail : hashedEmails) {
-            this.hashedEmails.add(new Identity(hashedEmail));
-            addToDiiMappings(hashedEmail, hashedEmail);
+            withHashedEmail(hashedEmail);
         }
         return this;
     }
 
+    public IdentityMapV3Input withHashedEmail(String hashedEmail) {
+        this.hashedEmails.add(new Identity(hashedEmail));
+        addToDiiMappings(hashedEmail, hashedEmail);
+        return this;
+    }
+
     public IdentityMapV3Input withHashedPhones(List<String> hashedPhones) {
         for (String hashedPhone : hashedPhones) {
-            this.hashedPhones.add(new Identity(hashedPhone));
-            addToDiiMappings(hashedPhone, hashedPhone);
+            withHashedPhone(hashedPhone);
         }
         return this;
     }
 
+    public IdentityMapV3Input withHashedPhone(String hashedPhone) {
+        this.hashedPhones.add(new Identity(hashedPhone));
+        addToDiiMappings(hashedPhone, hashedPhone);
+        return this;
+    }
+
     public IdentityMapV3Input withEmails(List<String> emails) {
         for (String email : emails) {
-            String hash = InputUtil.normalizeAndHashEmail(email);
-            this.hashedEmails.add(new Identity(hash));
-            addToDiiMappings(hash, email);
+            withEmail(email);
         }
         return this;
     }
 
+    public IdentityMapV3Input withEmail(String email) {
+        String hashedEmail = InputUtil.normalizeAndHashEmail(email);
+        this.hashedEmails.add(new Identity(hashedEmail));
+        addToDiiMappings(hashedEmail, email);
+        return this;
+    }
+
     public IdentityMapV3Input withPhones(List<String> phones) {
         for (String phone : phones) {
-            if (!InputUtil.isPhoneNumberNormalized(phone)) {
-                throw new IllegalArgumentException("phone number is not normalized: " + phone);
-            }
+            withPhone(phone);
+        }
+        return this;
+    }
 
-            String hash = InputUtil.getBase64EncodedHash(phone);
-            this.hashedPhones.add(new Identity(hash));
-            addToDiiMappings(hash, phone);
+    public IdentityMapV3Input withPhone(String phone) {
+        if (!InputUtil.isPhoneNumberNormalized(phone)) {
+            throw new IllegalArgumentException("phone number is not normalized: " + phone);
         }
+
+        String hashedPhone = InputUtil.getBase64EncodedHash(phone);
+        this.hashedPhones.add(new Identity(hashedPhone));
+        addToDiiMappings(hashedPhone, phone);
         return this;
+
     }
 
     private void addToDiiMappings(String hashedDii, String rawDii) {

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

@@ -29,12 +29,13 @@ private void populateIdentitiesForType(IdentityMapV3Input identityMapInput, Stri
         for (int i = 0; i < identities.size(); i++) {
             ApiIdentity apiIdentity = identities.get(i);
             List<String> rawDiis = identityMapInput.getRawDiis(identityType, i);
-            for (String rawDii : rawDiis)
+            for (String rawDii : rawDiis) {
                 if (apiIdentity.error != null) {
                     unmappedIdentities.put(rawDii, new UnmappedIdentity(apiIdentity));
                 } else {
                     mappedIdentities.put(rawDii, new MappedIdentity(apiIdentity));
                 }
+            }
         }
     }
 

src/test/java/com/uid2/client/IdentityMapV3IntegrationTests.java

@@ -170,7 +170,7 @@ public void identityMapAllIdentityTypesInOneRequest() {
                 .withHashedEmails(Arrays.asList(mappedEmailHash, optedOutEmailHash))
                 .withPhones(Arrays.asList(mappedPhone, optedOutPhone))
                 .withHashedPhones(Arrays.asList(mappedPhoneHash, optedOutPhoneHash));
-        
+
         Response response = new Response(identityMapInput);
 
         response.assertMapped(mappedEmail);
@@ -184,6 +184,24 @@ public void identityMapAllIdentityTypesInOneRequest() {
         response.assertUnmapped("OPTOUT", optedOutPhoneHash);
     }
 
+    @Test
+    public void identityMapAllIdentityTypesInOneRequestAddedOneByOne() {
+        IdentityMapV3Input identityMapInput = new IdentityMapV3Input();
+
+        identityMapInput.withEmail(mappedEmail);
+        identityMapInput.withPhone(optedOutPhone);
+        identityMapInput.withHashedPhone(mappedPhoneHash);
+        identityMapInput.withHashedEmail(optedOutEmailHash);
+
+        Response response = new Response(identityMapInput);
+
+        response.assertMapped(mappedEmail);
+        response.assertMapped(mappedPhoneHash);
+
+        response.assertUnmapped("OPTOUT", optedOutPhone);
+        response.assertUnmapped("OPTOUT", optedOutEmailHash);
+    }
+
 
     class Response {
         Response(IdentityMapV3Input identityMapInput) {