Updated identity enums

Author: gmsdelmundo

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

@@ -4,7 +4,9 @@
 import com.uid2.operator.vertx.ClientInputValidationException;
 
 public enum IdentityEnvironment {
-    TEST(0), INTEG(1), PROD(2);
+    TEST(0),
+    INTEG(1),
+    PROD(2);
 
     private final int value;
 

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

@@ -6,23 +6,29 @@ public enum IdentityScope {
     UID2(0),
     EUID(1);
 
-    public final int value;
+    private final int value;
 
-    IdentityScope(int value) { this.value = value; }
+    IdentityScope(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
 
     public static IdentityScope fromValue(int value) {
-        switch (value) {
-            case 0: return UID2;
-            case 1: return EUID;
-            default: throw new ClientInputValidationException("Invalid value for IdentityScope: " + value);
-        }
+        return switch (value) {
+            case 0 -> UID2;
+            case 1 -> EUID;
+            default -> throw new ClientInputValidationException("Invalid value for IdentityScope: " + value);
+        };
     }
 
     public static IdentityScope fromString(String str) {
-        switch (str.toLowerCase()) {
-            case "uid2": return UID2;
-            case "euid": return EUID;
-            default: throw new ClientInputValidationException("Invalid string for IdentityScope: " + str);
-        }
+        return switch (str.toLowerCase()) {
+            case "uid2" -> UID2;
+            case "euid" -> EUID;
+            default -> throw new ClientInputValidationException("Invalid string for IdentityScope: " + str);
+        };
     }
 }

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

@@ -3,17 +3,24 @@
 import com.uid2.operator.vertx.ClientInputValidationException;
 
 public enum IdentityType {
-    Email(0), Phone(1);
+    Email(0),
+    Phone(1);
 
-    public final int value;
+    private final int value;
 
-    IdentityType(int value) { this.value = value; }
+    IdentityType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
 
     public static IdentityType fromValue(int value) {
-        switch (value) {
-            case 0: return Email;
-            case 1: return Phone;
-            default: throw new ClientInputValidationException("Invalid valid for IdentityType: " + value);
-        }
+        return switch (value) {
+            case 0 -> Email;
+            case 1 -> Phone;
+            default -> throw new ClientInputValidationException("Invalid valid for IdentityType: " + value);
+        };
     }
 }

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

@@ -3,11 +3,18 @@
 import com.uid2.operator.vertx.ClientInputValidationException;
 
 public enum IdentityVersion {
-    V3(0), V4(1);
+    V3(0),
+    V4(1);
 
-    public final int value;
+    private final int value;
 
-    IdentityVersion(int value) { this.value = value; }
+    IdentityVersion(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
 
     public static IdentityVersion fromValue(int value) {
         return switch (value) {

src/main/java/com/uid2/operator/service/EncryptedTokenEncoder.java

@@ -365,7 +365,7 @@ private byte[] encryptIdentityV2(PublisherIdentity publisherIdentity, UserIdenti
     }
 
     private static byte encodeIdentityTypeV3(UserIdentity userIdentity) {
-        return (byte) (TokenUtils.encodeIdentityScope(userIdentity.identityScope) | (userIdentity.identityType.value << 2) | 3);
+        return (byte) (TokenUtils.encodeIdentityScope(userIdentity.identityScope) | (userIdentity.identityType.getValue() << 2) | 3);
         // "| 3" is used so that the 2nd char matches the version when V3 or higher. Eg "3" for V3 and "4" for V4
     }
 

src/main/java/com/uid2/operator/service/TokenUtils.java

@@ -72,15 +72,15 @@ public static byte[] getAdvertisingIdV4FromIdentityHash(IdentityScope scope, Ide
     }
 
     public static byte encodeIdentityScope(IdentityScope identityScope) {
-        return (byte) (identityScope.value << 4);
+        return (byte) (identityScope.getValue() << 4);
     }
 
     public static byte encodeIdentityType(IdentityType identityType) {
-        return (byte) (identityType.value << 2);
+        return (byte) (identityType.getValue() << 2);
     }
 
     public static byte encodeIdentityVersion(IdentityVersion identityVersion) {
-        return (byte) (identityVersion.value << 6);
+        return (byte) (identityVersion.getValue() << 6);
     }
 
     public static byte encodeIdentityEnvironment(IdentityEnvironment identityEnvironment) {