diff --git a/src/test/groovy/.editorconfig b/src/test/groovy/.editorconfig index 63243037b4d..c903505b3bd 100644 --- a/src/test/groovy/.editorconfig +++ b/src/test/groovy/.editorconfig @@ -19,7 +19,7 @@ ij_groovy_extends_list_wrap = normal ij_groovy_for_brace_force = always ij_groovy_for_statement_wrap = normal ij_groovy_if_brace_force = always -ij_groovy_imports_layout = *, |, java.**, |, $* +ij_groovy_imports_layout = *,|,javax.**,java.**,|,$* ij_groovy_insert_inner_class_imports = true ij_groovy_keep_blank_lines_before_right_brace = 2 ij_groovy_keep_blank_lines_in_code = 1 diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy index 08bb7b4d1cf..b2f300db675 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy @@ -5,6 +5,9 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.EqualsAndHashCode import groovy.transform.ToString import org.prebid.server.functional.model.AccountStatus +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig +import org.prebid.server.functional.model.config.hook.AccountHooksConfiguration +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig @EqualsAndHashCode @ToString(includeNames = true, ignoreNulls = true) diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountMetricsConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/AccountMetricsConfig.groovy index 30a7bdc6f81..e58ff615c1d 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountMetricsConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/AccountMetricsConfig.groovy @@ -6,5 +6,5 @@ import com.fasterxml.jackson.annotation.JsonProperty class AccountMetricsConfig { @JsonProperty("verbosity-level") - AccountMetricsVerbosityLevel verbosityLevel; + AccountMetricsVerbosityLevel verbosityLevel } diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountAuctionConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountAuctionConfig.groovy similarity index 94% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountAuctionConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/AccountAuctionConfig.groovy index 75ad23803b3..4780d942e28 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountAuctionConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountAuctionConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.PropertyNamingStrategies diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountBidValidationConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountBidValidationConfig.groovy similarity index 82% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountBidValidationConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/AccountBidValidationConfig.groovy index eb6cd4fe882..627715a1b07 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountBidValidationConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountBidValidationConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import com.fasterxml.jackson.annotation.JsonProperty import groovy.transform.ToString diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountEventsConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountEventsConfig.groovy similarity index 70% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountEventsConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/AccountEventsConfig.groovy index 09632c75bef..df65bf4c7f8 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountEventsConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountEventsConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import groovy.transform.ToString diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountPriceFloorsConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountPriceFloorsConfig.groovy similarity index 89% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountPriceFloorsConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/AccountPriceFloorsConfig.groovy index 0869421a671..84f14c644ce 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountPriceFloorsConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/AccountPriceFloorsConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/BidValidationEnforcement.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/BidValidationEnforcement.groovy similarity index 76% rename from src/test/groovy/org/prebid/server/functional/model/config/BidValidationEnforcement.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/BidValidationEnforcement.groovy index 79dbeace7a4..d7fcde97ab4 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/BidValidationEnforcement.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/BidValidationEnforcement.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PriceFloorsFetch.groovy b/src/test/groovy/org/prebid/server/functional/model/config/auction/PriceFloorsFetch.groovy similarity index 88% rename from src/test/groovy/org/prebid/server/functional/model/config/PriceFloorsFetch.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/auction/PriceFloorsFetch.groovy index 3fd56222ab7..a1d6029b3d8 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/PriceFloorsFetch.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/auction/PriceFloorsFetch.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountHooksConfiguration.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/AccountHooksConfiguration.groovy similarity index 86% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountHooksConfiguration.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/AccountHooksConfiguration.groovy index af7d723caf5..d41382d3589 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountHooksConfiguration.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/AccountHooksConfiguration.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/Endpoint.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/Endpoint.groovy similarity index 92% rename from src/test/groovy/org/prebid/server/functional/model/config/Endpoint.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/Endpoint.groovy index eee6d80d319..cdfbfe1d6e5 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/Endpoint.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/Endpoint.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.annotation.JsonValue import groovy.transform.ToString diff --git a/src/test/groovy/org/prebid/server/functional/model/config/EndpointExecutionPlan.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/EndpointExecutionPlan.groovy similarity index 78% rename from src/test/groovy/org/prebid/server/functional/model/config/EndpointExecutionPlan.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/EndpointExecutionPlan.groovy index 3269f0b13f4..7327cbe09d8 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/EndpointExecutionPlan.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/EndpointExecutionPlan.groovy @@ -1,7 +1,6 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import groovy.transform.ToString -import org.prebid.server.functional.model.ModuleName @ToString(includeNames = true, ignoreNulls = true) class EndpointExecutionPlan { diff --git a/src/test/groovy/org/prebid/server/functional/model/config/ExecutionGroup.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionGroup.groovy similarity index 84% rename from src/test/groovy/org/prebid/server/functional/model/config/ExecutionGroup.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionGroup.groovy index d0a1af281e6..231e507dc7c 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/ExecutionGroup.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionGroup.groovy @@ -1,9 +1,8 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.ToString -import org.prebid.server.functional.model.ModuleName @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy) diff --git a/src/test/groovy/org/prebid/server/functional/model/config/ExecutionPlan.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionPlan.groovy similarity index 79% rename from src/test/groovy/org/prebid/server/functional/model/config/ExecutionPlan.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionPlan.groovy index 0846c626888..8668c2c25e5 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/ExecutionPlan.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/ExecutionPlan.groovy @@ -1,7 +1,6 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import groovy.transform.ToString -import org.prebid.server.functional.model.ModuleName @ToString(includeNames = true, ignoreNulls = true) class ExecutionPlan { diff --git a/src/test/groovy/org/prebid/server/functional/model/config/HookId.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/HookId.groovy similarity index 85% rename from src/test/groovy/org/prebid/server/functional/model/config/HookId.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/HookId.groovy index cda44911ce4..7dd47bbbb1b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/HookId.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/HookId.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/ModuleName.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/ModuleName.groovy similarity index 80% rename from src/test/groovy/org/prebid/server/functional/model/ModuleName.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/ModuleName.groovy index e41bdeb98fe..e1fd8a004de 100644 --- a/src/test/groovy/org/prebid/server/functional/model/ModuleName.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/ModuleName.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PbsModulesConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/PbsModulesConfig.groovy similarity index 88% rename from src/test/groovy/org/prebid/server/functional/model/config/PbsModulesConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/PbsModulesConfig.groovy index 33b2e1478ad..3e26a5cffea 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/PbsModulesConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/PbsModulesConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/Stage.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/Stage.groovy similarity index 92% rename from src/test/groovy/org/prebid/server/functional/model/config/Stage.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/Stage.groovy index c77fd9ebcda..65d5f9fd960 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/Stage.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/Stage.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import com.fasterxml.jackson.annotation.JsonValue import groovy.transform.ToString diff --git a/src/test/groovy/org/prebid/server/functional/model/config/StageExecutionPlan.groovy b/src/test/groovy/org/prebid/server/functional/model/config/hook/StageExecutionPlan.groovy similarity index 76% rename from src/test/groovy/org/prebid/server/functional/model/config/StageExecutionPlan.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/hook/StageExecutionPlan.groovy index b2fab91c200..3e8d3a6de9a 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/StageExecutionPlan.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/hook/StageExecutionPlan.groovy @@ -1,7 +1,6 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.hook import groovy.transform.ToString -import org.prebid.server.functional.model.ModuleName @ToString(includeNames = true, ignoreNulls = true) class StageExecutionPlan { diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountCcpaConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountCcpaConfig.groovy similarity index 87% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountCcpaConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountCcpaConfig.groovy index 52530fef872..9febb741082 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountCcpaConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountCcpaConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountDsaConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountDsaConfig.groovy similarity index 89% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountDsaConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountDsaConfig.groovy index ef134c916fd..72f0e2dab93 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountDsaConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountDsaConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.PropertyNamingStrategies diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountGdprConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGdprConfig.groovy similarity index 91% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountGdprConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGdprConfig.groovy index ba1ec11c608..93bba8ee007 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountGdprConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGdprConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountGppConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGppConfig.groovy similarity index 81% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountGppConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGppConfig.groovy index add9834d5c5..6fca4297f12 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountGppConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountGppConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import groovy.transform.ToString import org.prebid.server.functional.model.request.auction.PrivacyModule diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountPrivacyConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountPrivacyConfig.groovy similarity index 91% rename from src/test/groovy/org/prebid/server/functional/model/config/AccountPrivacyConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountPrivacyConfig.groovy index b6f2819adf4..15d2af94fef 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/AccountPrivacyConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/AccountPrivacyConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.PropertyNamingStrategies diff --git a/src/test/groovy/org/prebid/server/functional/model/config/ActivityConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/ActivityConfig.groovy similarity index 66% rename from src/test/groovy/org/prebid/server/functional/model/config/ActivityConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/ActivityConfig.groovy index 14f19d03331..ed7ce95f025 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/ActivityConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/ActivityConfig.groovy @@ -1,11 +1,11 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy 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 DataActivity.INVALID +import static LogicalOperation.OR +import static UsNationalPrivacySection.GPC @ToString(includeNames = true, ignoreNulls = true) class ActivityConfig { @@ -24,7 +24,7 @@ class ActivityConfig { static ActivityConfig getConfigWithDefaultRestrictRules(List activities = ActivityType.values()) { new ActivityConfig().tap { it.activities = activities - it.restrictIfTrue = LogicalRestrictedRule.generateSingleRestrictedRule(OR, [new InequalityValueRule(GPC, INVALID)]) + it.restrictIfTrue = LogicalRestrictedRule.generateSingleRestrictedRule(OR, [new InequalityValueRule(GPC, INVALID)]) } } } diff --git a/src/test/groovy/org/prebid/server/functional/model/config/DataActivity.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/DataActivity.groovy similarity index 90% rename from src/test/groovy/org/prebid/server/functional/model/config/DataActivity.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/DataActivity.groovy index 64434cb67f7..cf07581be7c 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/DataActivity.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/DataActivity.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/EqualityValueRule.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/EqualityValueRule.groovy similarity index 95% rename from src/test/groovy/org/prebid/server/functional/model/config/EqualityValueRule.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/EqualityValueRule.groovy index 5e7cbf33476..9c5d744f0d7 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/EqualityValueRule.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/EqualityValueRule.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.core.JacksonException import com.fasterxml.jackson.core.JsonParser diff --git a/src/test/groovy/org/prebid/server/functional/model/config/GppModuleConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/GppModuleConfig.groovy similarity index 93% rename from src/test/groovy/org/prebid/server/functional/model/config/GppModuleConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/GppModuleConfig.groovy index 3ac38525dc7..f0cc5d33b40 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/GppModuleConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/GppModuleConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import groovy.transform.ToString import org.prebid.server.functional.model.request.GppSectionId diff --git a/src/test/groovy/org/prebid/server/functional/model/config/InequalityValueRule.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/InequalityValueRule.groovy similarity index 95% rename from src/test/groovy/org/prebid/server/functional/model/config/InequalityValueRule.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/InequalityValueRule.groovy index b9fcfcb6d67..4348a76dc2d 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/InequalityValueRule.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/InequalityValueRule.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.core.JacksonException import com.fasterxml.jackson.core.JsonParser diff --git a/src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalOperation.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalOperation.groovy new file mode 100644 index 00000000000..21497ecfc2e --- /dev/null +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalOperation.groovy @@ -0,0 +1,6 @@ +package org.prebid.server.functional.model.config.privacy + +enum LogicalOperation { + + OR, AND +} diff --git a/src/test/groovy/org/prebid/server/functional/model/config/LogicalRestrictedRule.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalRestrictedRule.groovy similarity index 94% rename from src/test/groovy/org/prebid/server/functional/model/config/LogicalRestrictedRule.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalRestrictedRule.groovy index a634ab6b088..2700de923f9 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/LogicalRestrictedRule.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/LogicalRestrictedRule.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonProperty import groovy.transform.ToString @@ -49,8 +49,4 @@ class LogicalRestrictedRule { LogicalRestrictedRule includeSubRestriction(LogicalOperation logicalOperation, ValueRestrictedRule valueOperation) { includeSubRestriction(logicalOperation, new LogicalRestrictedRule(valueOperation)) } - - enum LogicalOperation { - OR, AND - } } diff --git a/src/test/groovy/org/prebid/server/functional/model/config/Purpose.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/Purpose.groovy similarity index 76% rename from src/test/groovy/org/prebid/server/functional/model/config/Purpose.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/Purpose.groovy index b0c92abf621..1fb93c8b2ab 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/Purpose.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/Purpose.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PurposeConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeConfig.groovy similarity index 87% rename from src/test/groovy/org/prebid/server/functional/model/config/PurposeConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeConfig.groovy index 08a21ae226d..2f897474ee3 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/PurposeConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PurposeEnforcement.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeEnforcement.groovy similarity index 75% rename from src/test/groovy/org/prebid/server/functional/model/config/PurposeEnforcement.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeEnforcement.groovy index 42664e52fe5..35b3fe2eafa 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/PurposeEnforcement.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeEnforcement.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PurposeOneTreatmentInterpretation.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeOneTreatmentInterpretation.groovy similarity index 88% rename from src/test/groovy/org/prebid/server/functional/model/config/PurposeOneTreatmentInterpretation.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeOneTreatmentInterpretation.groovy index 427b3b630fe..b2d48bf7f69 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/PurposeOneTreatmentInterpretation.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/PurposeOneTreatmentInterpretation.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue import groovy.transform.ToString diff --git a/src/test/groovy/org/prebid/server/functional/model/config/SpecialFeature.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeature.groovy similarity index 73% rename from src/test/groovy/org/prebid/server/functional/model/config/SpecialFeature.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeature.groovy index 1afb0f2deed..4b2e08f1a29 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/SpecialFeature.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeature.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/test/groovy/org/prebid/server/functional/model/config/SpecialFeatureConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeatureConfig.groovy similarity index 85% rename from src/test/groovy/org/prebid/server/functional/model/config/SpecialFeatureConfig.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeatureConfig.groovy index c02f0406dcc..75baede017b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/SpecialFeatureConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/SpecialFeatureConfig.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming diff --git a/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/UsNationalPrivacySection.groovy similarity index 96% rename from src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/UsNationalPrivacySection.groovy index caab68873e0..7911d783594 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/UsNationalPrivacySection.groovy @@ -1,8 +1,7 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonValue import com.iab.gpp.encoder.field.UspNatV1Field -import org.prebid.server.functional.util.PBSUtils enum UsNationalPrivacySection { diff --git a/src/test/groovy/org/prebid/server/functional/model/config/ValueRestrictedRule.groovy b/src/test/groovy/org/prebid/server/functional/model/config/privacy/ValueRestrictedRule.groovy similarity index 96% rename from src/test/groovy/org/prebid/server/functional/model/config/ValueRestrictedRule.groovy rename to src/test/groovy/org/prebid/server/functional/model/config/privacy/ValueRestrictedRule.groovy index 0e2c0051c7e..686b7afacdd 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/ValueRestrictedRule.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/privacy/ValueRestrictedRule.groovy @@ -1,4 +1,4 @@ -package org.prebid.server.functional.model.config +package org.prebid.server.functional.model.config.privacy import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.core.JsonGenerator diff --git a/src/test/groovy/org/prebid/server/functional/model/db/Account.groovy b/src/test/groovy/org/prebid/server/functional/model/db/Account.groovy index bb089280334..d78c4fbd483 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/Account.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/Account.groovy @@ -1,17 +1,17 @@ package org.prebid.server.functional.model.db import groovy.transform.ToString +import org.prebid.server.functional.model.AccountStatus +import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.db.typeconverter.AccountConfigTypeConverter +import org.prebid.server.functional.model.db.typeconverter.AccountStatusTypeConverter + import javax.persistence.Column import javax.persistence.Convert import javax.persistence.Entity import javax.persistence.GeneratedValue import javax.persistence.Id import javax.persistence.Table -import org.prebid.server.functional.model.AccountStatus -import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.db.typeconverter.AccountConfigTypeConverter -import org.prebid.server.functional.model.db.typeconverter.AccountStatusTypeConverter - import java.sql.Timestamp import static javax.persistence.GenerationType.IDENTITY diff --git a/src/test/groovy/org/prebid/server/functional/model/db/StoredImp.groovy b/src/test/groovy/org/prebid/server/functional/model/db/StoredImp.groovy index 9be9b7a237f..9bb28f87f97 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/StoredImp.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/StoredImp.groovy @@ -1,15 +1,16 @@ package org.prebid.server.functional.model.db import groovy.transform.ToString +import org.prebid.server.functional.model.db.typeconverter.ImpConfigTypeConverter +import org.prebid.server.functional.model.request.auction.BidRequest +import org.prebid.server.functional.model.request.auction.Imp + import javax.persistence.Column import javax.persistence.Convert import javax.persistence.Entity import javax.persistence.GeneratedValue import javax.persistence.Id import javax.persistence.Table -import org.prebid.server.functional.model.db.typeconverter.ImpConfigTypeConverter -import org.prebid.server.functional.model.request.auction.BidRequest -import org.prebid.server.functional.model.request.auction.Imp import static javax.persistence.GenerationType.IDENTITY diff --git a/src/test/groovy/org/prebid/server/functional/model/db/StoredRequest.groovy b/src/test/groovy/org/prebid/server/functional/model/db/StoredRequest.groovy index 30a43912297..b947e7abf66 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/StoredRequest.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/StoredRequest.groovy @@ -1,15 +1,16 @@ package org.prebid.server.functional.model.db import groovy.transform.ToString +import org.prebid.server.functional.model.db.typeconverter.StoredRequestConfigTypeConverter +import org.prebid.server.functional.model.request.amp.AmpRequest +import org.prebid.server.functional.model.request.auction.BidRequest + import javax.persistence.Column import javax.persistence.Convert import javax.persistence.Entity import javax.persistence.GeneratedValue import javax.persistence.Id import javax.persistence.Table -import org.prebid.server.functional.model.db.typeconverter.StoredRequestConfigTypeConverter -import org.prebid.server.functional.model.request.amp.AmpRequest -import org.prebid.server.functional.model.request.auction.BidRequest import static javax.persistence.GenerationType.IDENTITY diff --git a/src/test/groovy/org/prebid/server/functional/model/db/StoredResponse.groovy b/src/test/groovy/org/prebid/server/functional/model/db/StoredResponse.groovy index 51d59ce0959..02b198c0ca6 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/StoredResponse.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/StoredResponse.groovy @@ -1,16 +1,17 @@ package org.prebid.server.functional.model.db import groovy.transform.ToString +import org.prebid.server.functional.model.db.typeconverter.StoredAuctionResponseConfigTypeConverter +import org.prebid.server.functional.model.db.typeconverter.StoredBidResponseConfigTypeConverter +import org.prebid.server.functional.model.response.auction.BidResponse +import org.prebid.server.functional.model.response.auction.SeatBid + import javax.persistence.Column import javax.persistence.Convert import javax.persistence.Entity import javax.persistence.GeneratedValue import javax.persistence.Id import javax.persistence.Table -import org.prebid.server.functional.model.db.typeconverter.StoredAuctionResponseConfigTypeConverter -import org.prebid.server.functional.model.db.typeconverter.StoredBidResponseConfigTypeConverter -import org.prebid.server.functional.model.response.auction.BidResponse -import org.prebid.server.functional.model.response.auction.SeatBid import static javax.persistence.GenerationType.IDENTITY diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountConfigTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountConfigTypeConverter.groovy index da0a7e6d1ec..1c72de8e2aa 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountConfigTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountConfigTypeConverter.groovy @@ -1,9 +1,10 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.config.AccountConfig import org.prebid.server.functional.util.ObjectMapperWrapper +import javax.persistence.AttributeConverter + class AccountConfigTypeConverter implements AttributeConverter, ObjectMapperWrapper { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountStatusTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountStatusTypeConverter.groovy index 005aae09d1c..56855fde90e 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountStatusTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/AccountStatusTypeConverter.groovy @@ -1,8 +1,9 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.AccountStatus +import javax.persistence.AttributeConverter + class AccountStatusTypeConverter implements AttributeConverter { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/ImpConfigTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/ImpConfigTypeConverter.groovy index 5a7ac8bb54c..dfede63527d 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/ImpConfigTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/ImpConfigTypeConverter.groovy @@ -1,9 +1,10 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.request.auction.Imp import org.prebid.server.functional.util.ObjectMapperWrapper +import javax.persistence.AttributeConverter + class ImpConfigTypeConverter implements AttributeConverter, ObjectMapperWrapper { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredAuctionResponseConfigTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredAuctionResponseConfigTypeConverter.groovy index 2f920559c38..0188323caef 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredAuctionResponseConfigTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredAuctionResponseConfigTypeConverter.groovy @@ -1,9 +1,10 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.response.auction.SeatBid import org.prebid.server.functional.util.ObjectMapperWrapper +import javax.persistence.AttributeConverter + class StoredAuctionResponseConfigTypeConverter implements AttributeConverter, ObjectMapperWrapper { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredBidResponseConfigTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredBidResponseConfigTypeConverter.groovy index 6a1ddb05da8..ad6ae5b0ecc 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredBidResponseConfigTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredBidResponseConfigTypeConverter.groovy @@ -1,9 +1,10 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.response.auction.BidResponse import org.prebid.server.functional.util.ObjectMapperWrapper +import javax.persistence.AttributeConverter + class StoredBidResponseConfigTypeConverter implements AttributeConverter, ObjectMapperWrapper { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredRequestConfigTypeConverter.groovy b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredRequestConfigTypeConverter.groovy index 8668b292d8c..51622181aa4 100644 --- a/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredRequestConfigTypeConverter.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/db/typeconverter/StoredRequestConfigTypeConverter.groovy @@ -1,9 +1,10 @@ package org.prebid.server.functional.model.db.typeconverter -import javax.persistence.AttributeConverter import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.util.ObjectMapperWrapper +import javax.persistence.AttributeConverter + class StoredRequestConfigTypeConverter implements AttributeConverter, ObjectMapperWrapper { @Override diff --git a/src/test/groovy/org/prebid/server/functional/model/mock/services/httpsettings/HttpAccountsResponse.groovy b/src/test/groovy/org/prebid/server/functional/model/mock/services/httpsettings/HttpAccountsResponse.groovy index a30b6146fce..8362aefa896 100644 --- a/src/test/groovy/org/prebid/server/functional/model/mock/services/httpsettings/HttpAccountsResponse.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/mock/services/httpsettings/HttpAccountsResponse.groovy @@ -2,11 +2,11 @@ package org.prebid.server.functional.model.mock.services.httpsettings import groovy.transform.ToString import org.prebid.server.functional.model.ResponseModel -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.config.AccountEventsConfig -import org.prebid.server.functional.model.config.AccountGdprConfig -import org.prebid.server.functional.model.config.AccountPrivacyConfig +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig +import org.prebid.server.functional.model.config.auction.AccountEventsConfig +import org.prebid.server.functional.model.config.privacy.AccountGdprConfig +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig @ToString(includeNames = true, ignoreNulls = true) class HttpAccountsResponse implements ResponseModel { diff --git a/src/test/groovy/org/prebid/server/functional/model/request/GppSectionId.groovy b/src/test/groovy/org/prebid/server/functional/model/request/GppSectionId.groovy index d71d60d8aa5..1bf338f0005 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/GppSectionId.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/GppSectionId.groovy @@ -36,7 +36,7 @@ enum GppSectionId { value as String } - Integer getIntValue(){ + Integer getIntValue() { value.toInteger() } } diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/AllowActivities.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/AllowActivities.groovy index 2b47012263d..3c26d929edf 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/AllowActivities.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/AllowActivities.groovy @@ -2,13 +2,13 @@ package org.prebid.server.functional.model.request.auction import groovy.transform.ToString -import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_PRECISE_GEO -import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_TID -import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_UFPD -import static org.prebid.server.functional.model.request.auction.ActivityType.REPORT_ANALYTICS import static org.prebid.server.functional.model.request.auction.ActivityType.ENRICH_UFPD import static org.prebid.server.functional.model.request.auction.ActivityType.FETCH_BIDS +import static org.prebid.server.functional.model.request.auction.ActivityType.REPORT_ANALYTICS import static org.prebid.server.functional.model.request.auction.ActivityType.SYNC_USER +import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_PRECISE_GEO +import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_TID +import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_UFPD @ToString(includeNames = true, ignoreNulls = true) class AllowActivities { diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Condition.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Condition.groovy index c08f5983f8e..6873a512c1e 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Condition.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Condition.groovy @@ -2,7 +2,6 @@ package org.prebid.server.functional.model.request.auction import groovy.transform.ToString import org.prebid.server.functional.model.bidder.BidderName -import org.prebid.server.functional.model.request.GppSectionId @ToString(includeNames = true, ignoreNulls = true) class Condition { diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Data.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Data.groovy index 246cda75c30..3c568f241ce 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Data.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Data.groovy @@ -1,7 +1,7 @@ package org.prebid.server.functional.model.request.auction -import groovy.transform.ToString import groovy.transform.EqualsAndHashCode +import groovy.transform.ToString import org.prebid.server.functional.util.PBSUtils @ToString(includeNames = true, ignoreNulls = true) diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Dooh.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Dooh.groovy index b5cefe73339..03ac58a559b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Dooh.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Dooh.groovy @@ -8,7 +8,7 @@ import org.prebid.server.functional.util.PBSUtils @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy) class Dooh { - + String id String name List venueType diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/DoohExtData.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/DoohExtData.groovy index 927154a27e1..d6194678124 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/DoohExtData.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/DoohExtData.groovy @@ -8,8 +8,8 @@ import org.prebid.server.functional.util.PBSUtils @EqualsAndHashCode class DoohExtData { - String data - String language + String data + String language static DoohExtData getDefaultDoohExtData() { new DoohExtData().tap { diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Native.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Native.groovy index 1050d3d3e43..eac4f20874b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Native.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Native.groovy @@ -13,7 +13,7 @@ class Native implements ObjectMapperWrapper { List api List battr - static Native getDefaultNative(){ + static Native getDefaultNative() { new Native(request: NativeRequest.nativeRequest) } diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Producer.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Producer.groovy index d4b527216db..e8423d42a2c 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Producer.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Producer.groovy @@ -12,7 +12,7 @@ class Producer { List cat String domain - static Producer getDefaultProducer(){ + static Producer getDefaultProducer() { new Producer().tap { id = PBSUtils.randomString } diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Source.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Source.groovy index e073fc195a6..36abeb7ead7 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Source.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Source.groovy @@ -13,7 +13,7 @@ class Source { SupplyChain schain SourceExt ext - static Source getDefaultSource(){ + static Source getDefaultSource() { new Source().tap { schain = SupplyChain.defaultSupplyChain } diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/SupplyChain.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/SupplyChain.groovy index 2b525bb266d..c5e4f169cfd 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/SupplyChain.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/SupplyChain.groovy @@ -12,7 +12,7 @@ class SupplyChain { List nodes String ver - static SupplyChain getDefaultSupplyChain(){ + static SupplyChain getDefaultSupplyChain() { new SupplyChain().tap { complete = PBSUtils.randomNumber nodes = [SupplyChainNode.defaultSupplyChainNode] diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/User.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/User.groovy index 535e95830d7..0104494910b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/User.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/User.groovy @@ -4,8 +4,6 @@ import groovy.transform.EqualsAndHashCode import groovy.transform.ToString import org.prebid.server.functional.util.PBSUtils -import static org.prebid.server.functional.model.pricefloors.Country.MULTIPLE - @ToString(includeNames = true, ignoreNulls = true) @EqualsAndHashCode class User { diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/UserAgent.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/UserAgent.groovy index 269f91a6092..0fff22e4708 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/UserAgent.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/UserAgent.groovy @@ -4,7 +4,7 @@ import groovy.transform.ToString @ToString(includeNames = true, ignoreNulls = true) class UserAgent { - + List browsers BrandVersion platform Integer mobile diff --git a/src/test/groovy/org/prebid/server/functional/model/response/Debug.groovy b/src/test/groovy/org/prebid/server/functional/model/response/Debug.groovy index d18f15880ab..061b5b9d687 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/Debug.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/Debug.groovy @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.ToString import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.PgMetrics -import org.prebid.server.functional.model.response.auction.DebugPrivacy import org.prebid.server.functional.model.response.auction.BidderCall +import org.prebid.server.functional.model.response.auction.DebugPrivacy import org.prebid.server.functional.model.response.auction.Trace @ToString(includeNames = true, ignoreNulls = true) diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInfrastructure.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInfrastructure.groovy index 08c716baa67..1325a65e219 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInfrastructure.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInfrastructure.groovy @@ -2,8 +2,8 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import groovy.transform.ToString import groovy.transform.EqualsAndHashCode +import groovy.transform.ToString import org.prebid.server.functional.model.request.auction.ActivityType @ToString(includeNames = true, ignoreNulls = true) diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInvocationPayload.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInvocationPayload.groovy index 960f23af5e9..e44e3c41b40 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInvocationPayload.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/ActivityInvocationPayload.groovy @@ -2,8 +2,8 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import groovy.transform.ToString import groovy.transform.EqualsAndHashCode +import groovy.transform.ToString @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy) diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/AnalyticResult.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/AnalyticResult.groovy index 7976ae24c2f..112fe114980 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/AnalyticResult.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/AnalyticResult.groovy @@ -20,7 +20,7 @@ class AnalyticResult { static AnalyticResult buildFromImp(Imp imp) { def appliedTo = new AppliedTo(impIds: [imp.id], bidders: [imp.ext.prebid.bidder.configuredBidders.first()]) - def impResult = new ImpResult(status: 'success-block', values: new ModuleValue(richmediaFormat: 'mraid'), appliedTo: appliedTo) + def impResult = new ImpResult(status: 'success-block', values: new ModuleValue(richMediaFormat: 'mraid'), appliedTo: appliedTo) new AnalyticResult(name: 'reject-richmedia', status: SUCCESS, results: [impResult]) } } diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/GeoCode.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/GeoCode.groovy index 539a0eabc51..458f2d68d89 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/GeoCode.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/GeoCode.groovy @@ -7,6 +7,6 @@ import groovy.transform.ToString @EqualsAndHashCode class GeoCode { - String country - String region + String country + String region } diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/InvocationResult.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/InvocationResult.groovy index 10be533eaf8..859f3467956 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/InvocationResult.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/InvocationResult.groovy @@ -3,7 +3,7 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.ToString -import org.prebid.server.functional.model.config.HookId +import org.prebid.server.functional.model.config.hook.HookId @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy) diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/ModuleValue.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/ModuleValue.groovy index e76e8fb3f54..3067bd4276d 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/ModuleValue.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/ModuleValue.groovy @@ -1,14 +1,13 @@ package org.prebid.server.functional.model.response.auction -import com.fasterxml.jackson.databind.PropertyNamingStrategies -import com.fasterxml.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty import groovy.transform.EqualsAndHashCode import groovy.transform.ToString @ToString(includeNames = true, ignoreNulls = true) -@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy) @EqualsAndHashCode class ModuleValue { - String richmediaFormat + @JsonProperty("richmedia-format") + String richMediaFormat } diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/RuleConfiguration.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/RuleConfiguration.groovy index 5cf09375f1e..f15519efb42 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/RuleConfiguration.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/RuleConfiguration.groovy @@ -2,8 +2,8 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import groovy.transform.ToString import groovy.transform.EqualsAndHashCode +import groovy.transform.ToString import static org.prebid.server.functional.model.request.auction.Condition.ConditionType diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/Trace.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/Trace.groovy index b4e194cd87b..3a931eaffbb 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/Trace.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/Trace.groovy @@ -8,5 +8,5 @@ import groovy.transform.ToString @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy) class Trace { - List activityInfrastructure + List activityInfrastructure } diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceOutcome.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceOutcome.groovy index f1a72a9e266..af725aa606c 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceOutcome.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceOutcome.groovy @@ -3,7 +3,7 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.ToString -import org.prebid.server.functional.model.config.Stage +import org.prebid.server.functional.model.config.hook.Stage @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy) diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceStages.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceStages.groovy index 606a4897023..309ff9a219b 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceStages.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/TraceStages.groovy @@ -3,7 +3,7 @@ package org.prebid.server.functional.model.response.auction import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming import groovy.transform.ToString -import org.prebid.server.functional.model.config.Stage +import org.prebid.server.functional.model.config.hook.Stage @ToString(includeNames = true, ignoreNulls = true) @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy) diff --git a/src/test/groovy/org/prebid/server/functional/repository/EntityManagerUtil.groovy b/src/test/groovy/org/prebid/server/functional/repository/EntityManagerUtil.groovy index a7712d6430f..b650b356e36 100644 --- a/src/test/groovy/org/prebid/server/functional/repository/EntityManagerUtil.groovy +++ b/src/test/groovy/org/prebid/server/functional/repository/EntityManagerUtil.groovy @@ -1,8 +1,8 @@ package org.prebid.server.functional.repository -import javax.persistence.EntityManager import org.hibernate.SessionFactory +import javax.persistence.EntityManager import java.util.function.Consumer import java.util.function.Function diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy index e50d510d908..65743471051 100644 --- a/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy +++ b/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/PrebidCache.groovy @@ -8,7 +8,6 @@ import org.prebid.server.functional.model.mock.services.prebidcache.response.Cac import org.prebid.server.functional.model.mock.services.prebidcache.response.PrebidCacheResponse import org.testcontainers.containers.MockServerContainer -import java.util.stream.Collectors import java.util.stream.Stream import static org.mockserver.model.HttpRequest.request diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/VendorList.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/VendorList.groovy index a469241aeae..1f3539cc94e 100644 --- a/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/VendorList.groovy +++ b/src/test/groovy/org/prebid/server/functional/testcontainers/scaffolding/VendorList.groovy @@ -9,8 +9,8 @@ import org.testcontainers.containers.MockServerContainer import static org.mockserver.model.HttpRequest.request import static org.mockserver.model.HttpResponse.response import static org.mockserver.model.HttpStatusCode.OK_200 -import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.getDefaultVendorListResponse import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.Vendor +import static org.prebid.server.functional.model.mock.services.vendorlist.VendorListResponse.getDefaultVendorListResponse import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID import static org.prebid.server.functional.util.privacy.TcfConsent.TcfPolicyVersion import static org.prebid.server.functional.util.privacy.TcfConsent.TcfPolicyVersion.TCF_POLICY_V2 diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy index 4f3c43a985b..14467df1967 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy @@ -6,7 +6,6 @@ import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredImp import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.amp.AmpRequest -import org.prebid.server.functional.model.request.auction.Asset import org.prebid.server.functional.model.request.auction.Banner import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.Device @@ -24,7 +23,6 @@ import org.prebid.server.functional.model.response.auction.BidResponse import org.prebid.server.functional.model.response.auction.ErrorType import org.prebid.server.functional.util.PBSUtils import org.prebid.server.functional.util.privacy.CcpaConsent -import spock.lang.IgnoreRest import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC diff --git a/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy index b3739974247..262c611adc7 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy @@ -4,11 +4,11 @@ package org.prebid.server.functional.tests import org.prebid.server.functional.model.AccountStatus import org.prebid.server.functional.model.UidsCookie import org.prebid.server.functional.model.bidder.BidderName -import org.prebid.server.functional.model.config.AccountCcpaConfig import org.prebid.server.functional.model.config.AccountConfig import org.prebid.server.functional.model.config.AccountCookieSyncConfig import org.prebid.server.functional.model.config.AccountCoopSyncConfig -import org.prebid.server.functional.model.config.AccountPrivacyConfig +import org.prebid.server.functional.model.config.privacy.AccountCcpaConfig +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.request.cookiesync.CookieSyncRequest import org.prebid.server.functional.model.request.cookiesync.FilterSettings @@ -24,12 +24,12 @@ import org.prebid.server.functional.util.privacy.TcfConsent import java.time.Instant +import static org.prebid.server.functional.model.bidder.BidderName.AAX import static org.prebid.server.functional.model.bidder.BidderName.ACEEX import static org.prebid.server.functional.model.bidder.BidderName.ACUITYADS import static org.prebid.server.functional.model.bidder.BidderName.ADKERNEL import static org.prebid.server.functional.model.bidder.BidderName.ALIAS import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS -import static org.prebid.server.functional.model.bidder.BidderName.AAX import static org.prebid.server.functional.model.bidder.BidderName.BOGUS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.bidder.BidderName.OPENX diff --git a/src/test/groovy/org/prebid/server/functional/tests/DebugSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/DebugSpec.groovy index e5df7fccc9c..a67c6ed662a 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/DebugSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/DebugSpec.groovy @@ -1,8 +1,8 @@ package org.prebid.server.functional.tests import org.apache.commons.lang3.StringUtils -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.db.StoredResponse diff --git a/src/test/groovy/org/prebid/server/functional/tests/FilterMultiFormatSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/FilterMultiFormatSpec.groovy index c105aaef867..d6dd8bd11de 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/FilterMultiFormatSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/FilterMultiFormatSpec.groovy @@ -1,15 +1,15 @@ package org.prebid.server.functional.tests import org.prebid.server.functional.model.bidder.BidderName -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.request.auction.Audio import org.prebid.server.functional.model.request.auction.Banner import org.prebid.server.functional.model.request.auction.BidRequest +import org.prebid.server.functional.model.request.auction.BidderControls import org.prebid.server.functional.model.request.auction.GenericPreferredBidder import org.prebid.server.functional.model.request.auction.Native -import org.prebid.server.functional.model.request.auction.BidderControls import static org.prebid.server.functional.model.response.auction.ErrorType.GENERIC import static org.prebid.server.functional.model.response.auction.MediaType.AUDIO diff --git a/src/test/groovy/org/prebid/server/functional/tests/MultibidSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/MultibidSpec.groovy index 233c863cbf6..f6758f27b2d 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/MultibidSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/MultibidSpec.groovy @@ -1,7 +1,7 @@ package org.prebid.server.functional.tests -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.MultiBid diff --git a/src/test/groovy/org/prebid/server/functional/tests/NativeSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/NativeSpec.groovy index 7456930cc53..bea1181be80 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/NativeSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/NativeSpec.groovy @@ -6,11 +6,11 @@ import org.prebid.server.functional.model.request.auction.AssetImage import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.Native import org.prebid.server.functional.model.request.auction.NativeRequest +import org.prebid.server.functional.model.request.auction.Prebid import org.prebid.server.functional.model.request.auction.StoredAuctionResponse import org.prebid.server.functional.model.response.auction.Adm import org.prebid.server.functional.model.response.auction.BidExt import org.prebid.server.functional.model.response.auction.ErrorType -import org.prebid.server.functional.model.response.auction.Prebid import org.prebid.server.functional.model.response.auction.SeatBid import org.prebid.server.functional.util.PBSUtils diff --git a/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy index d12334da01b..c7cceae6d01 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy @@ -13,7 +13,6 @@ import org.prebid.server.functional.util.PBSUtils import org.prebid.server.util.ResourceUtil import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.bidder.BidderName.bidderNameByString import static org.prebid.server.functional.model.response.status.Status.OK class SmokeSpec extends BaseSpec { diff --git a/src/test/groovy/org/prebid/server/functional/tests/TargetingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/TargetingSpec.groovy index 39a732ebdfa..71102415ad9 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/TargetingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/TargetingSpec.groovy @@ -2,8 +2,8 @@ package org.prebid.server.functional.tests import org.prebid.server.functional.model.bidder.Generic import org.prebid.server.functional.model.bidder.Openx -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.db.StoredResponse @@ -19,12 +19,10 @@ import org.prebid.server.functional.model.response.auction.Bid import org.prebid.server.functional.model.response.auction.BidResponse import org.prebid.server.functional.service.PrebidServerService import org.prebid.server.functional.util.PBSUtils -import spock.lang.IgnoreRest -import spock.lang.RepeatUntilFailure import java.math.RoundingMode - import java.nio.charset.StandardCharsets + import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.response.auction.ErrorType.TARGETING import static org.prebid.server.functional.testcontainers.Dependencies.getNetworkServiceContainer diff --git a/src/test/groovy/org/prebid/server/functional/tests/module/ModuleBaseSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/module/ModuleBaseSpec.groovy index 33a6d83b500..c2ef6da2491 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/module/ModuleBaseSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/module/ModuleBaseSpec.groovy @@ -1,12 +1,12 @@ package org.prebid.server.functional.tests.module -import org.prebid.server.functional.model.config.Endpoint -import org.prebid.server.functional.model.config.ExecutionPlan +import org.prebid.server.functional.model.config.hook.Endpoint +import org.prebid.server.functional.model.config.hook.ExecutionPlan import org.prebid.server.functional.tests.BaseSpec -import static org.prebid.server.functional.model.ModuleName.PB_RICHMEDIA_FILTER -import static org.prebid.server.functional.model.config.Endpoint.OPENRTB2_AUCTION -import static org.prebid.server.functional.model.config.Stage.ALL_PROCESSED_BID_RESPONSES +import static org.prebid.server.functional.model.config.hook.Endpoint.OPENRTB2_AUCTION +import static org.prebid.server.functional.model.config.hook.ModuleName.PB_RICHMEDIA_FILTER +import static org.prebid.server.functional.model.config.hook.Stage.ALL_PROCESSED_BID_RESPONSES class ModuleBaseSpec extends BaseSpec { diff --git a/src/test/groovy/org/prebid/server/functional/tests/module/richmedia/RichMediaFilterSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/module/richmedia/RichMediaFilterSpec.groovy index d7e88aca716..546674a5767 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/module/richmedia/RichMediaFilterSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/module/richmedia/RichMediaFilterSpec.groovy @@ -1,8 +1,8 @@ package org.prebid.server.functional.tests.module.richmedia import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.config.AccountHooksConfiguration -import org.prebid.server.functional.model.config.PbsModulesConfig +import org.prebid.server.functional.model.config.hook.AccountHooksConfiguration +import org.prebid.server.functional.model.config.hook.PbsModulesConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredResponse import org.prebid.server.functional.model.request.auction.BidRequest diff --git a/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingFirstPartyDataSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingFirstPartyDataSpec.groovy index a1552071a8d..51bfc1bf164 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingFirstPartyDataSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingFirstPartyDataSpec.groovy @@ -28,8 +28,8 @@ import org.prebid.server.functional.util.PBSUtils import spock.lang.Shared import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS -import static org.prebid.server.functional.model.bidder.BidderName.GENERIC_CAMEL_CASE import static org.prebid.server.functional.model.bidder.BidderName.GENERIC +import static org.prebid.server.functional.model.bidder.BidderName.GENERIC_CAMEL_CASE import static org.prebid.server.functional.model.deals.lineitem.targeting.MatchingFunction.IN import static org.prebid.server.functional.model.deals.lineitem.targeting.MatchingFunction.INTERSECTS import static org.prebid.server.functional.model.deals.lineitem.targeting.MatchingFunction.MATCHES diff --git a/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingSpec.groovy index 882860a9e5b..854a9d9d4a7 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pg/TargetingSpec.groovy @@ -32,6 +32,7 @@ import java.time.ZonedDateTime import static java.time.ZoneOffset.UTC import static java.time.temporal.WeekFields.SUNDAY_START import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.deals.lineitem.targeting.BooleanOperator.INVALID import static org.prebid.server.functional.model.deals.lineitem.targeting.BooleanOperator.NOT import static org.prebid.server.functional.model.deals.lineitem.targeting.BooleanOperator.OR import static org.prebid.server.functional.model.deals.lineitem.targeting.BooleanOperator.UPPERCASE_AND @@ -48,7 +49,6 @@ import static org.prebid.server.functional.model.deals.lineitem.targeting.Target import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.DEVICE_REGION import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.DOW import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.HOUR -import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.INVALID import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.PAGE_POSITION import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.REFERRER import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.SITE_DOMAIN diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy index a8500b07d83..fdc58a32651 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy @@ -1,10 +1,10 @@ package org.prebid.server.functional.tests.pricefloors import org.prebid.server.functional.model.Currency -import org.prebid.server.functional.model.config.AccountAuctionConfig import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.config.AccountPriceFloorsConfig -import org.prebid.server.functional.model.config.PriceFloorsFetch +import org.prebid.server.functional.model.config.auction.AccountAuctionConfig +import org.prebid.server.functional.model.config.auction.AccountPriceFloorsConfig +import org.prebid.server.functional.model.config.auction.PriceFloorsFetch import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.pricefloors.Country import org.prebid.server.functional.model.pricefloors.MediaType diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy index d4c5529ea78..2e74d96e880 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.tests.pricefloors -import org.prebid.server.functional.model.config.PriceFloorsFetch +import org.prebid.server.functional.model.config.auction.PriceFloorsFetch import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.pricefloors.ModelGroup import org.prebid.server.functional.model.pricefloors.PriceFloorData diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/ActivityTraceLogSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/ActivityTraceLogSpec.groovy index 09d8c51b0e1..f85e9524965 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/ActivityTraceLogSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/ActivityTraceLogSpec.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.AccountGppConfig import org.prebid.server.functional.model.request.auction.Activity import org.prebid.server.functional.model.request.auction.ActivityRule import org.prebid.server.functional.model.request.auction.ActivityType @@ -404,4 +404,3 @@ class ActivityTraceLogSpec extends PrivacyBaseSpec { activityInfrastructures[new IntRange(true, firstIndex, lastIndex)] } } - diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAmpSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAmpSpec.groovy index fc1436a9ee9..c9454ddd49a 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAmpSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAmpSpec.groovy @@ -1,8 +1,8 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountCcpaConfig import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.config.AccountPrivacyConfig +import org.prebid.server.functional.model.config.privacy.AccountCcpaConfig +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.auction.BidRequest diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAuctionSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAuctionSpec.groovy index b53e837b6ec..e71d3a4905b 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAuctionSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/CcpaAuctionSpec.groovy @@ -1,7 +1,7 @@ package org.prebid.server.functional.tests.privacy import org.prebid.server.functional.model.ChannelType -import org.prebid.server.functional.model.config.AccountCcpaConfig +import org.prebid.server.functional.model.config.privacy.AccountCcpaConfig import org.prebid.server.functional.model.request.auction.DistributionChannel import org.prebid.server.functional.util.privacy.BogusConsent import org.prebid.server.functional.util.privacy.CcpaConsent diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/DsaSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/DsaSpec.groovy index 76e669f7262..3197b06ed7a 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/DsaSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/DsaSpec.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountDsaConfig +import org.prebid.server.functional.model.config.privacy.AccountDsaConfig import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.auction.BidRequest diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAmpSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAmpSpec.groovy index d9df6ab076e..fa9ad21faf6 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAmpSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAmpSpec.groovy @@ -2,8 +2,8 @@ package org.prebid.server.functional.tests.privacy import org.prebid.server.functional.model.ChannelType import org.prebid.server.functional.model.config.AccountConfig -import org.prebid.server.functional.model.config.AccountGdprConfig -import org.prebid.server.functional.model.config.AccountPrivacyConfig +import org.prebid.server.functional.model.config.privacy.AccountGdprConfig +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.auction.BidRequest diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAuctionSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAuctionSpec.groovy index 3d3ad19505c..59a3a256ba4 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAuctionSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAuctionSpec.groovy @@ -1,7 +1,7 @@ package org.prebid.server.functional.tests.privacy import org.prebid.server.functional.model.ChannelType -import org.prebid.server.functional.model.config.AccountGdprConfig +import org.prebid.server.functional.model.config.privacy.AccountGdprConfig import org.prebid.server.functional.model.request.auction.DistributionChannel import org.prebid.server.functional.model.response.auction.ErrorType import org.prebid.server.functional.service.PrebidServerService diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppFetchBidActivitiesSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppFetchBidActivitiesSpec.groovy index 8ba421405f7..a6420296c38 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppFetchBidActivitiesSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppFetchBidActivitiesSpec.groovy @@ -1,19 +1,20 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountGppConfig -import org.prebid.server.functional.model.config.ActivityConfig -import org.prebid.server.functional.model.config.EqualityValueRule -import org.prebid.server.functional.model.config.InequalityValueRule -import org.prebid.server.functional.model.config.LogicalRestrictedRule -import org.prebid.server.functional.model.config.GppModuleConfig + +import org.prebid.server.functional.model.config.privacy.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.ActivityConfig +import org.prebid.server.functional.model.config.privacy.EqualityValueRule +import org.prebid.server.functional.model.config.privacy.GppModuleConfig +import org.prebid.server.functional.model.config.privacy.InequalityValueRule +import org.prebid.server.functional.model.config.privacy.LogicalRestrictedRule import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest +import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.auction.Activity import org.prebid.server.functional.model.request.auction.ActivityRule import org.prebid.server.functional.model.request.auction.AllowActivities import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.auction.Condition -import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.auction.Device import org.prebid.server.functional.model.request.auction.Geo import org.prebid.server.functional.service.PrebidServerException @@ -31,31 +32,31 @@ import java.time.Instant import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED -import static org.prebid.server.functional.model.config.DataActivity.CONSENT -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_NOT_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOT_APPLICABLE -import static org.prebid.server.functional.model.config.DataActivity.NO_CONSENT -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.AND -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.OR -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.GPC -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.pricefloors.Country.USA +import static org.prebid.server.functional.model.config.privacy.DataActivity.CONSENT +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_NOT_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOT_APPLICABLE +import static org.prebid.server.functional.model.config.privacy.DataActivity.NO_CONSENT +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.AND +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.OR +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.GPC +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.pricefloors.Country.CAN +import static org.prebid.server.functional.model.pricefloors.Country.USA import static org.prebid.server.functional.model.request.GppSectionId.USP_CA_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CO_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CT_V1 @@ -71,8 +72,8 @@ import static org.prebid.server.functional.model.request.auction.PrivacyModule.I import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_CUSTOM_LOGIC import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL import static org.prebid.server.functional.model.request.auction.TraceLevel.VERBOSE -import static org.prebid.server.functional.util.privacy.model.State.ONTARIO import static org.prebid.server.functional.util.privacy.model.State.ALABAMA +import static org.prebid.server.functional.util.privacy.model.State.ONTARIO class GppFetchBidActivitiesSpec extends PrivacyBaseSpec { diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy index 2dd69ccf285..0cedad37c1b 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy @@ -1,12 +1,12 @@ package org.prebid.server.functional.tests.privacy import org.prebid.server.functional.model.UidsCookie -import org.prebid.server.functional.model.config.AccountGppConfig -import org.prebid.server.functional.model.config.ActivityConfig -import org.prebid.server.functional.model.config.EqualityValueRule -import org.prebid.server.functional.model.config.InequalityValueRule -import org.prebid.server.functional.model.config.LogicalRestrictedRule -import org.prebid.server.functional.model.config.GppModuleConfig +import org.prebid.server.functional.model.config.privacy.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.ActivityConfig +import org.prebid.server.functional.model.config.privacy.EqualityValueRule +import org.prebid.server.functional.model.config.privacy.GppModuleConfig +import org.prebid.server.functional.model.config.privacy.InequalityValueRule +import org.prebid.server.functional.model.config.privacy.LogicalRestrictedRule import org.prebid.server.functional.model.request.auction.Activity import org.prebid.server.functional.model.request.auction.ActivityRule import org.prebid.server.functional.model.request.auction.AllowActivities @@ -28,46 +28,46 @@ import java.time.Instant import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.config.DataActivity.CONSENT -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_NOT_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOT_APPLICABLE -import static org.prebid.server.functional.model.config.DataActivity.NO_CONSENT -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.AND -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.OR -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.GPC -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE +import static org.prebid.server.functional.model.config.privacy.DataActivity.CONSENT +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_NOT_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOT_APPLICABLE +import static org.prebid.server.functional.model.config.privacy.DataActivity.NO_CONSENT +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.AND +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.OR +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.GPC +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.pricefloors.Country.CAN import static org.prebid.server.functional.model.pricefloors.Country.USA import static org.prebid.server.functional.model.request.GppSectionId.USP_CA_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CO_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CT_V1 +import static org.prebid.server.functional.model.request.GppSectionId.USP_NAT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_UT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_V1 -import static org.prebid.server.functional.model.request.GppSectionId.USP_NAT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_VA_V1 import static org.prebid.server.functional.model.request.auction.ActivityType.SYNC_USER import static org.prebid.server.functional.model.request.auction.PrivacyModule.ALL import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_ALL +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_TFC_EU import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_CUSTOM_LOGIC -import static org.prebid.server.functional.util.privacy.model.State.MANITOBA +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL import static org.prebid.server.functional.util.privacy.model.State.ALABAMA import static org.prebid.server.functional.util.privacy.model.State.ALASKA -import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_TFC_EU -import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL +import static org.prebid.server.functional.util.privacy.model.State.MANITOBA class GppSyncUserActivitiesSpec extends PrivacyBaseSpec { diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitPreciseGeoActivitiesSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitPreciseGeoActivitiesSpec.groovy index 431b66ab6cd..222c5171798 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitPreciseGeoActivitiesSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitPreciseGeoActivitiesSpec.groovy @@ -1,11 +1,12 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountGppConfig -import org.prebid.server.functional.model.config.ActivityConfig -import org.prebid.server.functional.model.config.EqualityValueRule -import org.prebid.server.functional.model.config.InequalityValueRule -import org.prebid.server.functional.model.config.LogicalRestrictedRule -import org.prebid.server.functional.model.config.GppModuleConfig + +import org.prebid.server.functional.model.config.privacy.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.ActivityConfig +import org.prebid.server.functional.model.config.privacy.EqualityValueRule +import org.prebid.server.functional.model.config.privacy.GppModuleConfig +import org.prebid.server.functional.model.config.privacy.InequalityValueRule +import org.prebid.server.functional.model.config.privacy.LogicalRestrictedRule import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.auction.Activity @@ -30,28 +31,28 @@ import java.time.Instant import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.config.DataActivity.CONSENT -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_NOT_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOT_APPLICABLE -import static org.prebid.server.functional.model.config.DataActivity.NO_CONSENT -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.AND -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.OR -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.GPC -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE +import static org.prebid.server.functional.model.config.privacy.DataActivity.CONSENT +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_NOT_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOT_APPLICABLE +import static org.prebid.server.functional.model.config.privacy.DataActivity.NO_CONSENT +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.AND +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.OR +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.GPC +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.pricefloors.Country.CAN import static org.prebid.server.functional.model.pricefloors.Country.USA import static org.prebid.server.functional.model.request.GppSectionId.USP_CA_V1 @@ -63,7 +64,11 @@ import static org.prebid.server.functional.model.request.GppSectionId.USP_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_VA_V1 import static org.prebid.server.functional.model.request.amp.ConsentType.GPP import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_PRECISE_GEO -import static org.prebid.server.functional.model.request.auction.PrivacyModule.* +import static org.prebid.server.functional.model.request.auction.PrivacyModule.ALL +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_ALL +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_TFC_EU +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_CUSTOM_LOGIC +import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL import static org.prebid.server.functional.model.request.auction.TraceLevel.VERBOSE import static org.prebid.server.functional.util.privacy.model.State.ALABAMA import static org.prebid.server.functional.util.privacy.model.State.ONTARIO diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy index 57cffda6ae7..82f9362bcc0 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy @@ -1,12 +1,14 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountGppConfig -import org.prebid.server.functional.model.config.ActivityConfig -import org.prebid.server.functional.model.config.EqualityValueRule -import org.prebid.server.functional.model.config.InequalityValueRule -import org.prebid.server.functional.model.config.LogicalRestrictedRule -import org.prebid.server.functional.model.config.GppModuleConfig + +import org.prebid.server.functional.model.config.privacy.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.ActivityConfig +import org.prebid.server.functional.model.config.privacy.EqualityValueRule +import org.prebid.server.functional.model.config.privacy.GppModuleConfig +import org.prebid.server.functional.model.config.privacy.InequalityValueRule +import org.prebid.server.functional.model.config.privacy.LogicalRestrictedRule import org.prebid.server.functional.model.db.StoredRequest +import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.auction.Activity import org.prebid.server.functional.model.request.auction.ActivityRule import org.prebid.server.functional.model.request.auction.AllowActivities @@ -19,7 +21,6 @@ import org.prebid.server.functional.model.request.auction.Geo import org.prebid.server.functional.model.request.auction.User import org.prebid.server.functional.model.request.auction.UserExt import org.prebid.server.functional.model.request.auction.UserExtData -import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.service.PrebidServerException import org.prebid.server.functional.util.PBSUtils import org.prebid.server.functional.util.privacy.gpp.UspCaV1Consent @@ -36,37 +37,37 @@ import java.time.Instant import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED -import static org.prebid.server.functional.model.config.DataActivity.CONSENT -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_NOT_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOTICE_PROVIDED -import static org.prebid.server.functional.model.config.DataActivity.NOT_APPLICABLE -import static org.prebid.server.functional.model.config.DataActivity.NO_CONSENT -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.AND -import static org.prebid.server.functional.model.config.LogicalRestrictedRule.LogicalOperation.OR -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.GPC -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS -import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.bidder.BidderName.GENERIC +import static org.prebid.server.functional.model.config.privacy.DataActivity.CONSENT +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_NOT_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOTICE_PROVIDED +import static org.prebid.server.functional.model.config.privacy.DataActivity.NOT_APPLICABLE +import static org.prebid.server.functional.model.config.privacy.DataActivity.NO_CONSENT +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.AND +import static org.prebid.server.functional.model.config.privacy.LogicalOperation.OR +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_BELOW_13 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.CHILD_CONSENTS_FROM_13_TO_16 +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.GPC +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ACCOUNT_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_BIOMETRIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_CITIZENSHIP_STATUS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_COMMUNICATION_CONTENTS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GENETIC_ID +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_GEOLOCATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_HEALTH_INFO +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ID_NUMBERS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_ORIENTATION +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SENSITIVE_DATA_RELIGIOUS_BELIEFS +import static org.prebid.server.functional.model.config.privacy.UsNationalPrivacySection.SHARING_NOTICE import static org.prebid.server.functional.model.pricefloors.Country.CAN import static org.prebid.server.functional.model.pricefloors.Country.USA import static org.prebid.server.functional.model.request.GppSectionId.USP_CA_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CO_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_CT_V1 +import static org.prebid.server.functional.model.request.GppSectionId.USP_NAT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_UT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_V1 -import static org.prebid.server.functional.model.request.GppSectionId.USP_NAT_V1 import static org.prebid.server.functional.model.request.GppSectionId.USP_VA_V1 import static org.prebid.server.functional.model.request.amp.ConsentType.GPP import static org.prebid.server.functional.model.request.auction.ActivityType.TRANSMIT_UFPD diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy index 0b917c50055..6f23cec4e41 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy @@ -1,13 +1,13 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountCcpaConfig import org.prebid.server.functional.model.config.AccountConfig import org.prebid.server.functional.model.config.AccountCookieSyncConfig import org.prebid.server.functional.model.config.AccountCoopSyncConfig -import org.prebid.server.functional.model.config.AccountDsaConfig -import org.prebid.server.functional.model.config.AccountGdprConfig -import org.prebid.server.functional.model.config.AccountGppConfig -import org.prebid.server.functional.model.config.AccountPrivacyConfig +import org.prebid.server.functional.model.config.privacy.AccountCcpaConfig +import org.prebid.server.functional.model.config.privacy.AccountDsaConfig +import org.prebid.server.functional.model.config.privacy.AccountGdprConfig +import org.prebid.server.functional.model.config.privacy.AccountGppConfig +import org.prebid.server.functional.model.config.privacy.AccountPrivacyConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.request.amp.AmpRequest import org.prebid.server.functional.model.request.amp.ConsentType diff --git a/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyCookieSyncSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyCookieSyncSpec.groovy index 6e424bbdb48..ed5d8cc0c66 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyCookieSyncSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyCookieSyncSpec.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.tests.privacy -import org.prebid.server.functional.model.config.AccountCcpaConfig +import org.prebid.server.functional.model.config.privacy.AccountCcpaConfig import org.prebid.server.functional.model.request.cookiesync.CookieSyncRequest import org.prebid.server.functional.util.PBSUtils import org.prebid.server.functional.util.privacy.CcpaConsent diff --git a/src/test/groovy/org/prebid/server/functional/util/AllureReporter.groovy b/src/test/groovy/org/prebid/server/functional/util/AllureReporter.groovy index 6ada5fe95c9..78283c5a2be 100644 --- a/src/test/groovy/org/prebid/server/functional/util/AllureReporter.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/AllureReporter.groovy @@ -4,9 +4,9 @@ import io.qameta.allure.Allure import io.qameta.allure.AllureLifecycle import io.qameta.allure.Description import io.qameta.allure.Flaky +import io.qameta.allure.Link import io.qameta.allure.Muted import io.qameta.allure.model.Label -import io.qameta.allure.model.Link import io.qameta.allure.model.Parameter import io.qameta.allure.model.Status import io.qameta.allure.model.StatusDetails @@ -26,7 +26,6 @@ import java.lang.annotation.Repeatable import java.lang.reflect.Method import java.security.MessageDigest import java.security.NoSuchAlgorithmException -import java.util.stream.Collectors import java.util.stream.Stream import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel