Addressing feedback

Author: aulme

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

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,30 +71,30 @@ static public class ApiIdentity {
     }
 
     static public class MappedIdentity {
-        public MappedIdentity(String currentUid, String previousUid, Long refreshFromSeconds) {
+        public MappedIdentity(String currentUid, String previousUid, Instant refreshFrom) {
             this.currentUid = currentUid;
             this.previousUid = previousUid;
-            this.refreshFromSeconds = refreshFromSeconds;
+            this.refreshFrom = refreshFrom;
         }
 
         public MappedIdentity(ApiIdentity apiIdentity) {
-            this(apiIdentity.currentUid, apiIdentity.previousUid, apiIdentity.refreshFromSeconds);
+            this(apiIdentity.currentUid, apiIdentity.previousUid, Instant.ofEpochSecond(apiIdentity.refreshFromSeconds));
         }
 
         private final String currentUid;
         private final String previousUid;
-        private final Long refreshFromSeconds;
+        private final Instant refreshFrom;
 
-        public String getCurrentUid() {
+        public String getCurrentRawUid() {
             return currentUid;
         }
 
-        public String getPreviousUid() {
+        public String getPreviousRawUid() {
             return previousUid;
         }
 
-        public Long getRefreshFromSeconds() {
-            return refreshFromSeconds;
+        public Instant getRefreshFrom() {
+            return refreshFrom;
         }
     }
 

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

@@ -111,10 +111,10 @@ public void identityMapDuplicateEmails() {
         HashMap<String, IdentityMapV3Response.MappedIdentity> mappedIdentities = identityMapResponse.getMappedIdentities();
         assertEquals(4, mappedIdentities.size()); //it's not 5 because the last email is an exact match to the first email
 
-        String rawUid = mappedIdentities.get("[email protected]").getCurrentUid();
-        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentUid());
-        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentUid());
-        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentUid());
+        String rawUid = mappedIdentities.get("[email protected]").getCurrentRawUid();
+        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentRawUid());
+        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentRawUid());
+        assertEquals(rawUid, mappedIdentities.get("[email protected]").getCurrentRawUid());
     }
 
 
@@ -211,8 +211,11 @@ class Response {
         void assertMapped(String dii) {
             IdentityMapV3Response.MappedIdentity mappedIdentity = identityMapResponse.getMappedIdentities().get(dii);
             assertNotNull(mappedIdentity);
-            assertFalse(mappedIdentity.getCurrentUid().isEmpty());
-            assertTrue(mappedIdentity.getRefreshFromSeconds() > Instant.now().minusSeconds(24 * 60 * 60).getEpochSecond());
+            assertFalse(mappedIdentity.getCurrentRawUid().isEmpty());
+
+            // Refresh from should be now or in the future, allow some slack for time between request and this assertion
+            Instant aMinuteAgo = Instant.now().minusSeconds(60);
+            assertTrue(mappedIdentity.getRefreshFrom().isAfter(aMinuteAgo));
 
             IdentityMapV3Response.UnmappedIdentity unmappedIdentity = identityMapResponse.getUnmappedIdentities().get(dii);
             assertNull(unmappedIdentity);
@@ -254,7 +257,7 @@ public void identityMapEmailsUseOwnHttp() {
             IdentityMapV3Response identityMapResponse = identityMapHelper.createIdentityMapResponse(responseString, envelopeV2, identityMapInput);
 
             IdentityMapV3Response.MappedIdentity mappedIdentity = identityMapResponse.getMappedIdentities().get(mappedEmail);
-            assertFalse(mappedIdentity.getCurrentUid().isEmpty());
+            assertFalse(mappedIdentity.getCurrentRawUid().isEmpty());
         } catch (IOException e) {
             throw new Uid2Exception("error communicating with api endpoint", e);
         }