Addressing feedback

Author: aulme

src/test/java/app/component/Operator.java

@@ -25,7 +25,6 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.util.Base64;
-import java.util.List;
 
 public class Operator extends App {
     public enum Type {
@@ -263,9 +262,9 @@ public DecryptionResponse v2TokenDecrypt(String token) throws UID2ClientExceptio
 
     // Need to use the manual mapping for error cases - SDK won't allow creating input with bad emails or disable optout check
     public JsonNode v2IdentityMap(String payload) throws Exception {
-        V2Envelope envelope = v2CreateEnvelope(payload, getClientApiSecret());
-        String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/identity/map", envelope.envelope(), getClientApiKey());
-        return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret());
+        V2Envelope envelope = v2CreateEnvelope(payload, CLIENT_API_SECRET);
+        String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/identity/map", envelope.envelope(), CLIENT_API_KEY);
+        return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), CLIENT_API_SECRET);
     }
 
     public IdentityMapResponse v2IdentityMap(IdentityMapInput input) {
@@ -275,9 +274,9 @@ public IdentityMapResponse v2IdentityMap(IdentityMapInput input) {
 
     // Need to use the manual mapping for error cases - SDK won't allow creating input with bad emails
     public JsonNode v3IdentityMap(String payload) throws Exception {
-        V2Envelope envelope = v2CreateEnvelope(payload, getClientApiSecret());
-        String encryptedResponse = HttpClient.post(getBaseUrl() + "/v3/identity/map", envelope.envelope(), getClientApiKey());
-        return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret());
+        V2Envelope envelope = v2CreateEnvelope(payload, CLIENT_API_SECRET);
+        String encryptedResponse = HttpClient.post(getBaseUrl() + "/v3/identity/map", envelope.envelope(), CLIENT_API_KEY);
+        return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), CLIENT_API_SECRET);
     }
 
     public IdentityMapV3Response v3IdentityMap(IdentityMapV3Input input) {
@@ -303,14 +302,6 @@ public JsonNode v2KeySharing() throws Exception {
         return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), CLIENT_API_SECRET);
     }
 
-    private String getClientApiKey() {
-        return CLIENT_API_KEY;
-    }
-
-    private String getClientApiSecret() {
-        return CLIENT_API_SECRET;
-    }
-
     private V2Envelope v2CreateEnvelope(String payload, String secret) throws Exception {
         // Unencrypted envelope payload = timestamp + nonce + raw payload
         Instant timestamp = Instant.now();

src/test/java/suite/operator/OperatorPublicOnlyTest.java

@@ -93,9 +93,7 @@ public void testV3IdentityMapSpecialOptout(String label, Operator operator, Stri
             return;
         }
 
-        // We need all properties to be there for Identity Map V3, so default all to empty
-        // In JSON if a property appears multiple times, the last value wins
-        String payload = "{\"email\":[], \"email_hash\":[], \"phone\":[], \"phone_hash\":[], \"" + type + "\": [\"" + identity + "\"]}";
+        String payload = "{\"" + type + "\": [\"" + identity + "\"]}";
         JsonNode response = operator.v3IdentityMap(payload);
 
         assertThat(response.get("body").get(type).get(0).get("e").asText()).isEqualTo("optout");

src/test/java/suite/operator/OperatorTest.java

@@ -183,7 +183,7 @@ public void testV3IdentityMapLargeBatch(
 
                 // Sanity check that refresh from is a date not too far in the past.
                 // If it is, either there is an Operator issue or salt rotation hasn't been running for a long time.
-                assertThat(mappedDii.getRefreshFrom()).isAfter(Instant.now().minus(Duration.ofDays(10)));
+                assertThat(mappedDii.getRefreshFrom()).isAfter(Instant.now().minus(Duration.ofHours(1)));
             }
         });
     }
@@ -193,11 +193,11 @@ public void testV3IdentityMapLargeBatch(
             "suite.operator.TestData#identityMapV3BatchBadEmailArgs",
             "suite.operator.TestData#identityMapV3BatchBadPhoneArgs"
     })
-    public void testV3IdentityMapUnmapped(String label, Operator operator, String operatorName, String payload, String section) throws Exception {
+    public void testV3IdentityMapUnmapped(String label, Operator operator, String operatorName, String payload, String identityType) throws Exception {
         JsonNode response = operator.v3IdentityMap(payload);
 
         assertThat(response.at("/status").asText()).isEqualTo("success");
-        assertThat(response.at("/body/" + section + "/0/e").asText()).isEqualTo("invalid identifier");
+        assertThat(response.at("/body/" + identityType + "/0/e").asText()).isEqualTo("invalid identifier");
     }