Merged main

Author: gmsdelmundo

conf/local-config.json

@@ -42,5 +42,6 @@
   "encrypted_files": false,
   "disable_optout_token": true,
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-operator"
+  "uid_instance_id_prefix": "local-operator",
+  "identity_environment": "test"
 }

conf/local-e2e-docker-private-config.json

@@ -32,5 +32,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-private-operator"
+  "uid_instance_id_prefix": "local-private-operator",
+  "identity_environment": "test"
 }

conf/local-e2e-docker-public-config.json

@@ -39,5 +39,6 @@
   "operator_type": "public",
   "disable_optout_token": true,
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-public-operator"
+  "uid_instance_id_prefix": "local-public-operator",
+  "identity_environment": "test"
 }

conf/local-e2e-private-config.json

@@ -43,5 +43,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-private-operator"
+  "uid_instance_id_prefix": "local-private-operator",
+  "identity_environment": "test"
 }

conf/local-e2e-public-config.json

@@ -45,5 +45,6 @@
   "operator_type": "public",
   "disable_optout_token": true,
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-public-operator"
+  "uid_instance_id_prefix": "local-public-operator",
+  "identity_environment": "test"
 }

conf/validator-latest-e2e-docker-public-config.json

@@ -44,5 +44,6 @@
   },
   "disable_optout_token": true,
   "enable_remote_config": false,
-  "uid_instance_id_prefix": "local-public-operator"
+  "uid_instance_id_prefix": "local-public-operator",
+  "identity_environment": "test"
 }

pom.xml

@@ -6,8 +6,8 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.57.20</version>
-
+    <version>5.58.0</version>
+  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx.version>4.5.18</vertx.version>

src/main/java/com/uid2/operator/Const.java

@@ -36,5 +36,7 @@ public class Config extends com.uid2.shared.Const.Config {
         public static final String DisableOptoutTokenProp = "disable_optout_token";
         public static final String EnableRemoteConfigProp = "enable_remote_config";
         public static final String RuntimeConfigMetadataPathProp = "runtime_config_metadata_path";
+
+        public static final String IdentityEnvironmentProp = "identity_environment";
     }
 }

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

@@ -1,30 +1,36 @@
 package com.uid2.operator.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.uid2.operator.vertx.ClientInputValidationException;
 
 public enum IdentityEnvironment {
-    Test(0), Integ(1), Prod(2);
+    TEST(0), INTEG(1), PROD(2);
 
-    public final int value;
+    private final int value;
 
     IdentityEnvironment(int value) {
         this.value = value;
     }
 
+    public int getValue() {
+        return value;
+    }
+
     public static IdentityEnvironment fromValue(int value) {
         return switch (value) {
-            case 0 -> Test;
-            case 1 -> Integ;
-            case 2 -> Prod;
+            case 0 -> TEST;
+            case 1 -> INTEG;
+            case 2 -> PROD;
             default -> throw new ClientInputValidationException("Invalid valid for IdentityEnvironment: " + value);
         };
     }
 
+    @JsonCreator
     public static IdentityEnvironment fromString(String value) {
         return switch (value.toLowerCase()) {
-            case "test" -> Test;
-            case "integ" -> Integ;
-            case "prod" -> Prod;
+            case "test" -> TEST;
+            case "integ" -> INTEG;
+            case "prod" -> PROD;
             default -> throw new ClientInputValidationException("Invalid valid for IdentityEnvironment: " + value);
         };
     }

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

@@ -4,15 +4,18 @@ public final class IdentityRequest {
     public final PublisherIdentity publisherIdentity;
     public final UserIdentity userIdentity;
     public final OptoutCheckPolicy optoutCheckPolicy;
+    public final IdentityEnvironment identityEnvironment;
 
     public IdentityRequest(
             PublisherIdentity publisherIdentity,
             UserIdentity userIdentity,
-            OptoutCheckPolicy tokenGeneratePolicy)
+            OptoutCheckPolicy tokenGeneratePolicy,
+            IdentityEnvironment identityEnvironment)
     {
         this.publisherIdentity = publisherIdentity;
         this.userIdentity = userIdentity;
         this.optoutCheckPolicy = tokenGeneratePolicy;
+        this.identityEnvironment = identityEnvironment;
     }
 
     public boolean shouldCheckOptOut() {