update after review

Author: osulzhenko

src/test/groovy/org/prebid/server/functional/model/config/ActivityConfig.groovy

@@ -3,9 +3,9 @@ package org.prebid.server.functional.model.config
 import groovy.transform.ToString
 import org.prebid.server.functional.model.request.auction.ActivityType
 
-import static org.prebid.server.functional.model.config.DataActivity.INVALID
 import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.OR
 import static org.prebid.server.functional.model.config.UsNationalPrivacySection.GPC
+import static org.prebid.server.functional.model.privacy.gpp.GppDataActivity.INVALID
 
 @ToString(includeNames = true, ignoreNulls = true)
 class ActivityConfig {

src/test/groovy/org/prebid/server/functional/model/config/DataActivity.groovy

@@ -13,12 +13,8 @@ import org.prebid.server.functional.model.privacy.gpp.GppDataActivity
 @JsonDeserialize(using = EqualityValueRuleDeserialize.class)
 class EqualityValueRule extends ValueRestrictedRule {
 
-    EqualityValueRule(UsNationalPrivacySection privacySection, DataActivity value) {
-        super(privacySection, value)
-    }
-
     EqualityValueRule(UsNationalPrivacySection privacySection, GppDataActivity value) {
-        super(privacySection, DataActivity.fromGppDataActivity(value))
+        super(privacySection, value)
     }
 
     static class EqualityValueRuleDeserialize extends JsonDeserializer<EqualityValueRule> {
@@ -27,7 +23,7 @@ class EqualityValueRule extends ValueRestrictedRule {
         EqualityValueRule deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser)
             def privacySection = UsNationalPrivacySection.valueFromText(node?.get(0)?.get(JSON_LOGIC_VALUE_FIELD)?.textValue())
-            def value = DataActivity.fromInt(node?.get(1)?.asInt())
+            def value = GppDataActivity.fromInt(node?.get(1)?.asInt())
             return new EqualityValueRule(privacySection, value)
         }
     }

src/test/groovy/org/prebid/server/functional/model/config/EqualityValueRule.groovy

@@ -6,6 +6,7 @@ import org.prebid.server.functional.model.request.GppSectionId
 
 import static org.prebid.server.functional.model.config.GppModuleConfig.ConfigCase.CAMEL_CASE
 import static org.prebid.server.functional.model.config.GppModuleConfig.ConfigCase.KEBAB_CASE
+import static org.prebid.server.functional.model.config.GppModuleConfig.ConfigCase.SNAKE_CASE
 
 @ToString(includeNames = true, ignoreNulls = true)
 class GppModuleConfig {
@@ -36,18 +37,20 @@ class GppModuleConfig {
                                                   List<GppSectionId> sids = [GppSectionId.US_NAT_V1],
                                                   Boolean normalizeFlags = true,
                                                   ConfigCase configCase = CAMEL_CASE) {
-
-        new GppModuleConfig().tap {
-            it.sids = sids
-            if (configCase == CAMEL_CASE) {
-                it.activityConfig = [activityConfig]
-                it.normalizeFlags = normalizeFlags
-            } else if (configCase = KEBAB_CASE) {
-                it.activityConfigKebabCase = [activityConfig]
-                it.normalizeFlagsKebabCase = normalizeFlags
-            } else {
-                it.activityConfigSnakeCase = [activityConfig]
-                it.normalizeFlagsSnakeCase = normalizeFlags
+        new GppModuleConfig(sids: sids).tap {
+            switch (configCase) {
+                case CAMEL_CASE -> {
+                    it.activityConfig = [activityConfig]
+                    it.normalizeFlags = normalizeFlags
+                }
+                case KEBAB_CASE -> {
+                    it.activityConfigKebabCase = [activityConfig]
+                    it.normalizeFlagsKebabCase = normalizeFlags
+                }
+                case SNAKE_CASE -> {
+                    it.activityConfigSnakeCase = [activityConfig]
+                    it.normalizeFlagsSnakeCase = normalizeFlags
+                }
             }
         }
     }

src/test/groovy/org/prebid/server/functional/model/config/GppModuleConfig.groovy

@@ -7,12 +7,13 @@ import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import groovy.transform.ToString
+import org.prebid.server.functional.model.privacy.gpp.GppDataActivity
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonDeserialize(using = InequalityValueRuleDeserialize.class)
 class InequalityValueRule extends ValueRestrictedRule {
 
-    InequalityValueRule(UsNationalPrivacySection privacySection, DataActivity value) {
+    InequalityValueRule(UsNationalPrivacySection privacySection, GppDataActivity value) {
         super(privacySection, value)
     }
 
@@ -22,7 +23,7 @@ class InequalityValueRule extends ValueRestrictedRule {
         InequalityValueRule deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser)
             def privacySection = UsNationalPrivacySection.valueFromText(node?.get(0)?.get(JSON_LOGIC_VALUE_FIELD)?.textValue())
-            def value = DataActivity.fromInt(node?.get(1)?.asInt())
+            def value = GppDataActivity.fromInt(node?.get(1)?.asInt())
             return new InequalityValueRule(privacySection, value)
         }
     }

src/test/groovy/org/prebid/server/functional/model/config/InequalityValueRule.groovy

@@ -6,20 +6,21 @@ import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import groovy.transform.ToString
+import org.prebid.server.functional.model.privacy.gpp.GppDataActivity
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonSerialize(using = ValueRestrictedRuleSerializer.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
 abstract class ValueRestrictedRule {
 
     protected UsNationalPrivacySection privacySection
-    protected DataActivity value
+    protected GppDataActivity value
 
     protected static final String JSON_LOGIC_VALUE_FIELD = "var"
 
-    ValueRestrictedRule(UsNationalPrivacySection privacySection, DataActivity dataActivity) {
+    ValueRestrictedRule(UsNationalPrivacySection privacySection, GppDataActivity value) {
         this.privacySection = privacySection
-        this.value = dataActivity
+        this.value = value
     }
 
     static class ValueRestrictedRuleSerializer extends JsonSerializer<ValueRestrictedRule> {
@@ -30,7 +31,7 @@ abstract class ValueRestrictedRule {
             jsonGenerator.writeStartObject()
             jsonGenerator.writeStringField(JSON_LOGIC_VALUE_FIELD, valueRestrictedRule.privacySection.value)
             jsonGenerator.writeEndObject()
-            jsonGenerator.writeObject(valueRestrictedRule.value.dataActivityBits)
+            jsonGenerator.writeObject(valueRestrictedRule.value.value)
             jsonGenerator.writeEndArray()
         }
     }

src/test/groovy/org/prebid/server/functional/model/config/ValueRestrictedRule.groovy

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue
 
 enum GppDataActivity {
 
+    INVALID(-1),
     NOT_APPLICABLE(0),
     NO_CONSENT(1),
     CONSENT(2)
@@ -14,4 +15,9 @@ enum GppDataActivity {
     GppDataActivity(int value) {
         this.value = value
     }
+
+    static GppDataActivity fromInt(int dataActivityBits) {
+        values().find { it.value == dataActivityBits }
+                ?: { throw new IllegalArgumentException("Invalid dataActivityBits: ${dataActivityBits}") } as GppDataActivity
+    }
 }

src/test/groovy/org/prebid/server/functional/model/privacy/gpp/GppDataActivity.groovy

@@ -1,7 +1,5 @@
 package org.prebid.server.functional.model.privacy.gpp
 
-import org.prebid.server.functional.util.PBSUtils
-
 class UsCaliforniaV1ChildSensitiveData {
 
     GppDataActivity toSellUnder16
@@ -16,13 +14,6 @@ class UsCaliforniaV1ChildSensitiveData {
         }
     }
 
-    static UsCaliforniaV1ChildSensitiveData getRandom(List<GppDataActivity> excludedActivities) {
-        new UsCaliforniaV1ChildSensitiveData().tap {
-            it.toSellUnder16 = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-            it.toShareUnder16 = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-        }
-    }
-
     List<Integer> getContentList() {
         [toShareUnder16, toSellUnder16]*.value.collect { it ?: 0 }
     }

src/test/groovy/org/prebid/server/functional/model/privacy/gpp/UsCaliforniaV1ChildSensitiveData.groovy

@@ -12,12 +12,6 @@ class UsColoradoV1ChildSensitiveData {
         }
     }
 
-    static UsColoradoV1ChildSensitiveData getRandom(List<GppDataActivity> excludedActivities) {
-        new UsColoradoV1ChildSensitiveData().tap {
-            it.childSensitive = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-        }
-    }
-
     Integer getContentList() {
         this.childSensitive.value
     }

src/test/groovy/org/prebid/server/functional/model/privacy/gpp/UsColoradoV1ChildSensitiveData.groovy

@@ -19,14 +19,6 @@ class UsConnecticutV1ChildSensitiveData {
         }
     }
 
-    static UsConnecticutV1ChildSensitiveData getRandom(List<GppDataActivity> excludedActivities = []) {
-        new UsConnecticutV1ChildSensitiveData().tap {
-            it.childUnder13 = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-            it.childFrom13to16 = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-            it.childFrom13to16Targeted = PBSUtils.getRandomEnum(GppDataActivity, excludedActivities)
-        }
-    }
-
     List<Integer> getContentList() {
         [childUnder13, childFrom13to16, childFrom13to16Targeted]*.value.collect { it ?: 0 }
     }