1. Renamed FirstLevelHashIdentity/HashedDiiIdentity/RawUidIdentity to FirstLevelHash/HashedDii/RawUid

2. Removed the abstract class UserIdentity
3. fixed a unit test as removing UserIdentity broke it

Author: sunnywu

src/main/java/com/uid2/operator/model/AdvertisingTokenRequest.java

@@ -2,25 +2,25 @@
 
 import java.time.Instant;
 
-import com.uid2.operator.model.userIdentity.RawUidIdentity;
+import com.uid2.operator.model.identities.RawUid;
 import com.uid2.operator.util.PrivacyBits;
 import com.uid2.shared.model.TokenVersion;
 
 // class containing enough information to create a new uid token (aka advertising token)
 public class AdvertisingTokenRequest extends VersionedTokenRequest {
     public final OperatorIdentity operatorIdentity;
     public final SourcePublisher sourcePublisher;
-    public final RawUidIdentity rawUidIdentity;
+    public final RawUid rawUid;
     public final PrivacyBits privacyBits;
     public final Instant establishedAt;
 
     public AdvertisingTokenRequest(TokenVersion version, Instant createdAt, Instant expiresAt, OperatorIdentity operatorIdentity,
-                                   SourcePublisher sourcePublisher, RawUidIdentity rawUidIdentity, PrivacyBits privacyBits,
+                                   SourcePublisher sourcePublisher, RawUid rawUid, PrivacyBits privacyBits,
                                    Instant establishedAt) {
         super(version, createdAt, expiresAt);
         this.operatorIdentity = operatorIdentity;
         this.sourcePublisher = sourcePublisher;
-        this.rawUidIdentity = rawUidIdentity;
+        this.rawUid = rawUid;
         this.privacyBits = privacyBits;
         this.establishedAt = establishedAt;
     }

src/main/java/com/uid2/operator/model/IdentityMapRequestItem.java

@@ -1,19 +1,19 @@
 package com.uid2.operator.model;
 
-import com.uid2.operator.model.userIdentity.HashedDiiIdentity;
+import com.uid2.operator.model.identities.HashedDii;
 
 import java.time.Instant;
 
 public final class IdentityMapRequestItem {
-    public final HashedDiiIdentity hashedDiiIdentity;
+    public final HashedDii hashedDii;
     public final OptoutCheckPolicy optoutCheckPolicy;
     public final Instant asOf;
 
     public IdentityMapRequestItem(
-            HashedDiiIdentity hashedDiiIdentity,
+            HashedDii hashedDii,
             OptoutCheckPolicy optoutCheckPolicy,
             Instant asOf) {
-        this.hashedDiiIdentity = hashedDiiIdentity;
+        this.hashedDii = hashedDii;
         this.optoutCheckPolicy = optoutCheckPolicy;
         this.asOf = asOf;
     }

src/main/java/com/uid2/operator/model/TokenGenerateRequest.java

@@ -1,36 +1,36 @@
 package com.uid2.operator.model;
 
-import com.uid2.operator.model.userIdentity.HashedDiiIdentity;
+import com.uid2.operator.model.identities.HashedDii;
 import com.uid2.operator.util.PrivacyBits;
 
 import java.time.Instant;
 
 public final class TokenGenerateRequest {
     public final SourcePublisher sourcePublisher;
-    public final HashedDiiIdentity hashedDiiIdentity;
+    public final HashedDii hashedDii;
     public final OptoutCheckPolicy optoutCheckPolicy;
 
     public final PrivacyBits privacyBits;
     public final Instant establishedAt;
 
     public TokenGenerateRequest(
             SourcePublisher sourcePublisher,
-            HashedDiiIdentity hashedDiiIdentity,
+            HashedDii hashedDii,
             OptoutCheckPolicy tokenGeneratePolicy,
             PrivacyBits privacyBits,
             Instant establishedAt) {
         this.sourcePublisher = sourcePublisher;
-        this.hashedDiiIdentity = hashedDiiIdentity;
+        this.hashedDii = hashedDii;
         this.optoutCheckPolicy = tokenGeneratePolicy;
         this.privacyBits = privacyBits;
         this.establishedAt = establishedAt;
     }
 
     public TokenGenerateRequest(
             SourcePublisher sourcePublisher,
-            HashedDiiIdentity hashedDiiIdentity,
+            HashedDii hashedDii,
             OptoutCheckPolicy tokenGeneratePolicy) {
-        this(sourcePublisher, hashedDiiIdentity, tokenGeneratePolicy, PrivacyBits.DEFAULT, Instant.now());
+        this(sourcePublisher, hashedDii, tokenGeneratePolicy, PrivacyBits.DEFAULT, Instant.now());
 
     }
 

src/main/java/com/uid2/operator/model/TokenRefreshRequest.java

@@ -2,25 +2,25 @@
 
 import java.time.Instant;
 
-import com.uid2.operator.model.userIdentity.FirstLevelHashIdentity;
+import com.uid2.operator.model.identities.FirstLevelHash;
 import com.uid2.operator.util.PrivacyBits;
 import com.uid2.shared.model.TokenVersion;
 
 // class containing enough data to create a new refresh token
 public class TokenRefreshRequest extends VersionedTokenRequest {
     public final OperatorIdentity operatorIdentity;
     public final SourcePublisher sourcePublisher;
-    public final FirstLevelHashIdentity firstLevelHashIdentity;
+    public final FirstLevelHash firstLevelHash;
     // by default, inherited from the previous refresh token's privacy bits
     public final PrivacyBits privacyBits;
 
 
     public TokenRefreshRequest(TokenVersion version, Instant createdAt, Instant expiresAt, OperatorIdentity operatorIdentity,
-                               SourcePublisher sourcePublisher, FirstLevelHashIdentity firstLevelHashIdentity, PrivacyBits privacyBits) {
+                               SourcePublisher sourcePublisher, FirstLevelHash firstLevelHash, PrivacyBits privacyBits) {
         super(version, createdAt, expiresAt);
         this.operatorIdentity = operatorIdentity;
         this.sourcePublisher = sourcePublisher;
-        this.firstLevelHashIdentity = firstLevelHashIdentity;
+        this.firstLevelHash = firstLevelHash;
         this.privacyBits = privacyBits;
     }
 }

src/main/java/com/uid2/operator/model/identities/FirstLevelHash.java

@@ -0,0 +1,22 @@
+package com.uid2.operator.model.identities;
+
+import com.uid2.operator.model.IdentityScope;
+import com.uid2.operator.model.IdentityType;
+
+import java.time.Instant;
+import java.util.Arrays;
+
+/**
+ * Contains a first level salted hash computed from Hashed DII (email/phone number)
+ * @param establishedAt for brand new token generation, it should be the time it is generated if the first level hash is from token/refresh call, it will be when the raw UID was originally created in the earliest token generation
+ */
+public record FirstLevelHash(IdentityScope identityScope, IdentityType identityType, byte[] firstLevelHash,
+                             Instant establishedAt) {
+
+    // explicitly not checking establishedAt - this is only for making sure the first level hash matches a new input
+    public boolean matches(FirstLevelHash that) {
+        return this.identityScope.equals(that.identityScope) &&
+                this.identityType.equals(that.identityType) &&
+                Arrays.equals(this.firstLevelHash, that.firstLevelHash);
+    }
+}

src/main/java/com/uid2/operator/model/identities/HashedDii.java

@@ -0,0 +1,9 @@
+package com.uid2.operator.model.identities;
+
+import com.uid2.operator.model.IdentityScope;
+import com.uid2.operator.model.IdentityType;
+
+// Contains a hash DII,
+// This hash can either be computed from a raw email/phone number DII input or provided by the UID Participant directly
+public record HashedDii(IdentityScope identityScope, IdentityType identityType, byte[] hashedDii) {
+}

src/main/java/com/uid2/operator/model/identities/RawUid.java

@@ -0,0 +1,16 @@
+package com.uid2.operator.model.identities;
+
+import com.uid2.operator.model.IdentityScope;
+import com.uid2.operator.model.IdentityType;
+
+import java.util.Arrays;
+
+// A raw UID is stored inside
+public record RawUid(IdentityScope identityScope, IdentityType identityType, byte[] rawUid) {
+
+    public boolean matches(RawUid that) {
+        return this.identityScope.equals(that.identityScope) &&
+                this.identityType.equals(that.identityType) &&
+                Arrays.equals(this.rawUid, that.rawUid);
+    }
+}