diff --git a/extra/pom.xml b/extra/pom.xml index ff6f5a429e5..c101a0725be 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -47,7 +47,7 @@ 1.2.2 0.16.0 2.0.10 - 3.2.0 + 3.2.3 2.17.0 3.25.5 ${protobuf.version} diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/PrivacySection.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/PrivacySection.java index 3e081a6310e..98dbbc91040 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/PrivacySection.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/PrivacySection.java @@ -1,22 +1,22 @@ package org.prebid.server.activity.infrastructure.privacy; -import com.iab.gpp.encoder.section.UsCaV1; -import com.iab.gpp.encoder.section.UsCoV1; -import com.iab.gpp.encoder.section.UsCtV1; -import com.iab.gpp.encoder.section.UsNatV1; -import com.iab.gpp.encoder.section.UsUtV1; -import com.iab.gpp.encoder.section.UsVaV1; +import com.iab.gpp.encoder.section.UsCa; +import com.iab.gpp.encoder.section.UsCo; +import com.iab.gpp.encoder.section.UsCt; +import com.iab.gpp.encoder.section.UsNat; +import com.iab.gpp.encoder.section.UsUt; +import com.iab.gpp.encoder.section.UsVa; import java.util.Set; public enum PrivacySection { - NATIONAL(UsNatV1.ID), - CALIFORNIA(UsCaV1.ID), - VIRGINIA(UsVaV1.ID), - COLORADO(UsCoV1.ID), - UTAH(UsUtV1.ID), - CONNECTICUT(UsCtV1.ID); + NATIONAL(UsNat.ID), + CALIFORNIA(UsCa.ID), + VIRGINIA(UsVa.ID), + COLORADO(UsCo.ID), + UTAH(UsUt.ID), + CONNECTICUT(UsCt.ID); public static final Set US_PRIVACY_SECTIONS = Set.of( NATIONAL, diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReader.java index 963f50ab2b1..4c9ea014fcf 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCaV1; +import com.iab.gpp.encoder.section.UsCa; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.util.ObjectUtil; @@ -9,20 +9,20 @@ public class USCaliforniaGppReader implements USCustomLogicGppReader { - private final UsCaV1 consent; + private final UsCa consent; public USCaliforniaGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCaV1Section() : null; + consent = gppModel != null ? gppModel.getUsCaSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCa::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCa::getGpc); } @Override @@ -32,17 +32,17 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCa::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCa::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSaleOptOutNotice); } @Override @@ -52,12 +52,12 @@ public Integer getSharingNotice() { @Override public Integer getSharingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSharingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCa::getSharingOptOut); } @Override public Integer getSharingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSharingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSharingOptOutNotice); } @Override @@ -72,12 +72,12 @@ public Integer getTargetedAdvertisingOptOutNotice() { @Override public Integer getSensitiveDataLimitUseNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSensitiveDataLimitUseNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSensitiveDataLimitUseNotice); } @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsCa::getSensitiveDataProcessing); } @Override @@ -87,26 +87,26 @@ public Integer getSensitiveDataProcessingOptOutNotice() { @Override public List getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsCa::getKnownChildSensitiveDataConsents); } @Override public Integer getPersonalDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getPersonalDataConsents); + return ObjectUtil.getIfNotNull(consent, UsCa::getPersonalDataConsents); } @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReader.java index bdc3889f6e0..ee45b9b59b4 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReader.java @@ -2,7 +2,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCoV1; +import com.iab.gpp.encoder.section.UsCo; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.util.ObjectUtil; @@ -10,20 +10,20 @@ public class USColoradoGppReader implements USCustomLogicGppReader { - private final UsCoV1 consent; + private final UsCo consent; public USColoradoGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCoV1Section() : null; + consent = gppModel != null ? gppModel.getUsCoSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCo::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCo::getGpc); } @Override @@ -33,22 +33,22 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCo::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCo::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getSharingNotice); } @Override @@ -63,12 +63,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCo::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getTargetedAdvertisingOptOutNotice); } @Override @@ -78,7 +78,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsCo::getSensitiveDataProcessing); } @Override @@ -88,7 +88,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() { @Override public Integer getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsCo::getKnownChildSensitiveDataConsents); } @Override @@ -98,16 +98,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReader.java index d7d588926f8..5969f65669d 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCtV1; +import com.iab.gpp.encoder.section.UsCt; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.util.ObjectUtil; @@ -9,20 +9,20 @@ public class USConnecticutGppReader implements USCustomLogicGppReader { - private final UsCtV1 consent; + private final UsCt consent; public USConnecticutGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCtV1Section() : null; + consent = gppModel != null ? gppModel.getUsCtSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCt::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCt::getGpc); } @Override @@ -32,22 +32,22 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCt::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCt::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getSharingNotice); } @Override @@ -62,12 +62,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCt::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getTargetedAdvertisingOptOutNotice); } @Override @@ -77,7 +77,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsCt::getSensitiveDataProcessing); } @Override @@ -87,7 +87,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() { @Override public List getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsCt::getKnownChildSensitiveDataConsents); } @Override @@ -97,16 +97,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReader.java index 3f34d024b35..1f32870294b 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsUtV1; +import com.iab.gpp.encoder.section.UsUt; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.util.ObjectUtil; @@ -9,15 +9,15 @@ public class USUtahGppReader implements USCustomLogicGppReader { - private final UsUtV1 consent; + private final UsUt consent; public USUtahGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsUtV1Section() : null; + consent = gppModel != null ? gppModel.getUsUtSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsUt::getVersion); } @Override @@ -37,17 +37,17 @@ public Boolean getGpcSegmentIncluded() { @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsUt::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSharingNotice); } @Override @@ -62,12 +62,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsUt::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getTargetedAdvertisingOptOutNotice); } @Override @@ -77,17 +77,17 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsUt::getSensitiveDataProcessing); } @Override public Integer getSensitiveDataProcessingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSensitiveDataProcessingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSensitiveDataProcessingOptOutNotice); } @Override public Integer getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsUt::getKnownChildSensitiveDataConsents); } @Override @@ -97,16 +97,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReader.java index cccb0186946..439afbc0865 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsVaV1; +import com.iab.gpp.encoder.section.UsVa; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.util.ObjectUtil; @@ -9,15 +9,15 @@ public class USVirginiaGppReader implements USCustomLogicGppReader { - private final UsVaV1 consent; + private final UsVa consent; public USVirginiaGppReader(GppModel gppModel) { - this.consent = gppModel != null ? gppModel.getUsVaV1Section() : null; + this.consent = gppModel != null ? gppModel.getUsVaSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsVa::getVersion); } @Override @@ -37,17 +37,17 @@ public Boolean getGpcSegmentIncluded() { @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsVa::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getSharingNotice); } @Override @@ -62,12 +62,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsVa::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getTargetedAdvertisingOptOutNotice); } @Override @@ -77,7 +77,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsVa::getSensitiveDataProcessing); } @Override @@ -87,7 +87,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() { @Override public Integer getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsVa::getKnownChildSensitiveDataConsents); } @Override @@ -97,16 +97,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReader.java index 81878e5d908..903275b9d43 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCaV1; +import com.iab.gpp.encoder.section.UsCa; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -15,20 +15,20 @@ public class USMappedCaliforniaGppReader implements USNatGppReader, USCustomLogi private static final List DEFAULT_SENSITIVE_DATA = Collections.nCopies(12, null); private static final List CHILD_SENSITIVE_DATA = List.of(1, 1); - private final UsCaV1 consent; + private final UsCa consent; public USMappedCaliforniaGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCaV1Section() : null; + consent = gppModel != null ? gppModel.getUsCaSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCa::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCa::getGpc); } @Override @@ -38,17 +38,17 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCa::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCa::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSaleOptOutNotice); } @Override @@ -58,12 +58,12 @@ public Integer getSharingNotice() { @Override public Integer getSharingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSharingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCa::getSharingOptOut); } @Override public Integer getSharingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSharingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSharingOptOutNotice); } @Override @@ -78,7 +78,7 @@ public Integer getTargetedAdvertisingOptOutNotice() { @Override public Integer getSensitiveDataLimitUseNotice() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getSensitiveDataLimitUseNotice); + return ObjectUtil.getIfNotNull(consent, UsCa::getSensitiveDataLimitUseNotice); } @Override @@ -117,21 +117,21 @@ public List getKnownChildSensitiveDataConsents() { @Override public Integer getPersonalDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getPersonalDataConsents); + return ObjectUtil.getIfNotNull(consent, UsCa::getPersonalDataConsents); } @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCaV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCa::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReader.java index b9505a7c458..fafc908c7bb 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCoV1; +import com.iab.gpp.encoder.section.UsCo; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -13,20 +13,20 @@ public class USMappedColoradoGppReader implements USNatGppReader, USCustomLogicG private static final List CHILD_SENSITIVE_DATA = List.of(1, 1); private static final List NON_CHILD_SENSITIVE_DATA = List.of(0, 0); - private final UsCoV1 consent; + private final UsCo consent; public USMappedColoradoGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCoV1Section() : null; + consent = gppModel != null ? gppModel.getUsCoSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCo::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCo::getGpc); } @Override @@ -36,22 +36,22 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCo::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCo::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getSharingNotice); } @Override @@ -66,12 +66,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCo::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCo::getTargetedAdvertisingOptOutNotice); } @Override @@ -81,7 +81,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsCo::getSensitiveDataProcessing); } @Override @@ -108,16 +108,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCoV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCo::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReader.java index 8309e75ebc1..c7042bbbedf 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCtV1; +import com.iab.gpp.encoder.section.UsCt; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -15,20 +15,20 @@ public class USMappedConnecticutGppReader implements USNatGppReader, USCustomLog private static final List MIXED_CHILD_SENSITIVE_DATA = List.of(2, 1); private static final List CHILD_SENSITIVE_DATA = List.of(1, 1); - private final UsCtV1 consent; + private final UsCt consent; public USMappedConnecticutGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsCtV1Section() : null; + consent = gppModel != null ? gppModel.getUsCtSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsCt::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsCt::getGpc); } @Override @@ -38,22 +38,22 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsCt::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsCt::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getSharingNotice); } @Override @@ -68,12 +68,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsCt::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsCt::getTargetedAdvertisingOptOutNotice); } @Override @@ -83,7 +83,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsCt::getSensitiveDataProcessing); } @Override @@ -94,7 +94,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() { @Override public List getKnownChildSensitiveDataConsents() { final List originalData = ObjectUtil.getIfNotNull( - consent, UsCtV1::getKnownChildSensitiveDataConsents); + consent, UsCt::getKnownChildSensitiveDataConsents); final Integer first = originalData != null ? originalData.get(0) : null; final Integer second = originalData != null ? originalData.get(1) : null; @@ -116,16 +116,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsCtV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsCt::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReader.java index 527a87288f7..53eb837e82f 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsUtV1; +import com.iab.gpp.encoder.section.UsUt; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -17,15 +17,15 @@ public class USMappedUtahGppReader implements USNatGppReader, USCustomLogicGppRe private static final List CHILD_SENSITIVE_DATA = List.of(1, 1); private static final List NON_CHILD_SENSITIVE_DATA = List.of(0, 0); - private final UsUtV1 consent; + private final UsUt consent; public USMappedUtahGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsUtV1Section() : null; + consent = gppModel != null ? gppModel.getUsUtSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsUt::getVersion); } @Override @@ -45,17 +45,17 @@ public Boolean getGpcSegmentIncluded() { @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsUt::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSharingNotice); } @Override @@ -70,12 +70,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsUt::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getTargetedAdvertisingOptOutNotice); } @Override @@ -86,7 +86,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { final List originalData = Optional.ofNullable(consent) - .map(UsUtV1::getSensitiveDataProcessing) + .map(UsUt::getSensitiveDataProcessing) .orElse(DEFAULT_SENSITIVE_DATA_PROCESSING); final List data = new ArrayList<>(DEFAULT_SENSITIVE_DATA_PROCESSING); @@ -104,7 +104,7 @@ public List getSensitiveDataProcessing() { @Override public Integer getSensitiveDataProcessingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getSensitiveDataProcessingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsUt::getSensitiveDataProcessingOptOutNotice); } @Override @@ -126,16 +126,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsUtV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsUt::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReader.java index 739762666ea..146730d83a4 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsVaV1; +import com.iab.gpp.encoder.section.UsVa; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -13,15 +13,15 @@ public class USMappedVirginiaGppReader implements USNatGppReader, USCustomLogicG private static final List CHILD_SENSITIVE_DATA = List.of(1, 1); private static final List NON_CHILD_SENSITIVE_DATA = List.of(0, 0); - private final UsVaV1 consent; + private final UsVa consent; public USMappedVirginiaGppReader(GppModel gppModel) { - this.consent = gppModel != null ? gppModel.getUsVaV1Section() : null; + this.consent = gppModel != null ? gppModel.getUsVaSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsVa::getVersion); } @Override @@ -41,17 +41,17 @@ public Boolean getGpcSegmentIncluded() { @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsVa::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getSharingNotice); } @Override @@ -66,12 +66,12 @@ public Integer getSharingOptOutNotice() { @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsVa::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsVa::getTargetedAdvertisingOptOutNotice); } @Override @@ -81,7 +81,7 @@ public Integer getSensitiveDataLimitUseNotice() { @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsVa::getSensitiveDataProcessing); } @Override @@ -108,16 +108,16 @@ public Integer getPersonalDataConsents() { @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsVaV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsVa::getMspaOptOutOptionMode); } } diff --git a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReader.java b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReader.java index 11dec8ebbc2..9cf427b872b 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReader.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReader.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsNatV1; +import com.iab.gpp.encoder.section.UsNat; import org.prebid.server.activity.infrastructure.privacy.uscustomlogic.USCustomLogicGppReader; import org.prebid.server.activity.infrastructure.privacy.usnat.USNatGppReader; import org.prebid.server.util.ObjectUtil; @@ -10,20 +10,20 @@ public class USNationalGppReader implements USNatGppReader, USCustomLogicGppReader { - private final UsNatV1 consent; + private final UsNat consent; public USNationalGppReader(GppModel gppModel) { - consent = gppModel != null ? gppModel.getUsNatV1Section() : null; + consent = gppModel != null ? gppModel.getUsNatSection() : null; } @Override public Integer getVersion() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getVersion); + return ObjectUtil.getIfNotNull(consent, UsNat::getVersion); } @Override public Boolean getGpc() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getGpc); + return ObjectUtil.getIfNotNull(consent, UsNat::getGpc); } @Override @@ -37,81 +37,81 @@ public Boolean getGpcSegmentType() { @Override public Boolean getGpcSegmentIncluded() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getGpcSegmentIncluded); + return ObjectUtil.getIfNotNull(consent, UsNat::getGpcSegmentIncluded); } @Override public Integer getSaleOptOut() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSaleOptOut); + return ObjectUtil.getIfNotNull(consent, UsNat::getSaleOptOut); } @Override public Integer getSaleOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSaleOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getSaleOptOutNotice); } @Override public Integer getSharingNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSharingNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getSharingNotice); } @Override public Integer getSharingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSharingOptOut); + return ObjectUtil.getIfNotNull(consent, UsNat::getSharingOptOut); } @Override public Integer getSharingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSharingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getSharingOptOutNotice); } @Override public Integer getTargetedAdvertisingOptOut() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getTargetedAdvertisingOptOut); + return ObjectUtil.getIfNotNull(consent, UsNat::getTargetedAdvertisingOptOut); } @Override public Integer getTargetedAdvertisingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getTargetedAdvertisingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getTargetedAdvertisingOptOutNotice); } @Override public Integer getSensitiveDataLimitUseNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSensitiveDataLimitUseNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getSensitiveDataLimitUseNotice); } @Override public List getSensitiveDataProcessing() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSensitiveDataProcessing); + return ObjectUtil.getIfNotNull(consent, UsNat::getSensitiveDataProcessing); } @Override public Integer getSensitiveDataProcessingOptOutNotice() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getSensitiveDataProcessingOptOutNotice); + return ObjectUtil.getIfNotNull(consent, UsNat::getSensitiveDataProcessingOptOutNotice); } @Override public List getKnownChildSensitiveDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getKnownChildSensitiveDataConsents); + return ObjectUtil.getIfNotNull(consent, UsNat::getKnownChildSensitiveDataConsents); } @Override public Integer getPersonalDataConsents() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getPersonalDataConsents); + return ObjectUtil.getIfNotNull(consent, UsNat::getPersonalDataConsents); } @Override public Integer getMspaCoveredTransaction() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getMspaCoveredTransaction); + return ObjectUtil.getIfNotNull(consent, UsNat::getMspaCoveredTransaction); } @Override public Integer getMspaServiceProviderMode() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getMspaServiceProviderMode); + return ObjectUtil.getIfNotNull(consent, UsNat::getMspaServiceProviderMode); } @Override public Integer getMspaOptOutOptionMode() { - return ObjectUtil.getIfNotNull(consent, UsNatV1::getMspaOptOutOptionMode); + return ObjectUtil.getIfNotNull(consent, UsNat::getMspaOptOutOptionMode); } } diff --git a/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy b/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy index d5733707955..5dc72e1b0e8 100644 --- a/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/config/UsNationalPrivacySection.groovy @@ -1,39 +1,39 @@ package org.prebid.server.functional.model.config import com.fasterxml.jackson.annotation.JsonValue -import com.iab.gpp.encoder.field.UsNatV1Field +import com.iab.gpp.encoder.field.UsNatField enum UsNationalPrivacySection { - SHARING_NOTICE(UsNatV1Field.SHARING_NOTICE), - SALE_OPT_OUT_NOTICE(UsNatV1Field.SALE_OPT_OUT_NOTICE), - SHARING_OPT_OUT_NOTICE(UsNatV1Field.SHARING_OPT_OUT_NOTICE), - TARGETED_ADVERTISING_OPT_OUT_NOTICE(UsNatV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE), - SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE(UsNatV1Field.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE), - SENSITIVE_DATA_LIMIT_USE_NOTICE(UsNatV1Field.SENSITIVE_DATA_LIMIT_USE_NOTICE), - SALE_OPT_OUT(UsNatV1Field.SALE_OPT_OUT), - SHARING_OPT_OUT(UsNatV1Field.SHARING_OPT_OUT), - TARGETED_ADVERTISING_OPT_OUT(UsNatV1Field.TARGETED_ADVERTISING_OPT_OUT), - SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 1), - SENSITIVE_DATA_RELIGIOUS_BELIEFS(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 2), - SENSITIVE_DATA_HEALTH_INFO(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 3), - SENSITIVE_DATA_ORIENTATION(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 4), - SENSITIVE_DATA_CITIZENSHIP_STATUS(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 5), - SENSITIVE_DATA_GENETIC_ID(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 6), - SENSITIVE_DATA_BIOMETRIC_ID(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 7), - SENSITIVE_DATA_GEOLOCATION(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 8), - SENSITIVE_DATA_ID_NUMBERS(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 9), - SENSITIVE_DATA_ACCOUNT_INFO(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 10), - SENSITIVE_DATA_UNION_MEMBERSHIP(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 11), - SENSITIVE_DATA_COMMUNICATION_CONTENTS(UsNatV1Field.SENSITIVE_DATA_PROCESSING + 12), - SENSITIVE_DATA_PROCESSING_ALL(UsNatV1Field.SENSITIVE_DATA_PROCESSING + "*"), - CHILD_CONSENTS_FROM_13_TO_16(UsNatV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS + 1), - CHILD_CONSENTS_BELOW_13(UsNatV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS + 2), - PERSONAL_DATA_CONSENTS(UsNatV1Field.PERSONAL_DATA_CONSENTS), - MSPA_COVERED_TRANSACTION(UsNatV1Field.MSPA_COVERED_TRANSACTION), - MSPA_OPT_OUT_OPTION_MODE(UsNatV1Field.MSPA_OPT_OUT_OPTION_MODE), - MSPA_SERVICE_PROVIDER_MODE(UsNatV1Field.MSPA_SERVICE_PROVIDER_MODE), - GPC(UsNatV1Field.GPC); + SHARING_NOTICE(UsNatField.SHARING_NOTICE), + SALE_OPT_OUT_NOTICE(UsNatField.SALE_OPT_OUT_NOTICE), + SHARING_OPT_OUT_NOTICE(UsNatField.SHARING_OPT_OUT_NOTICE), + TARGETED_ADVERTISING_OPT_OUT_NOTICE(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE), + SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE(UsNatField.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE), + SENSITIVE_DATA_LIMIT_USE_NOTICE(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE), + SALE_OPT_OUT(UsNatField.SALE_OPT_OUT), + SHARING_OPT_OUT(UsNatField.SHARING_OPT_OUT), + TARGETED_ADVERTISING_OPT_OUT(UsNatField.TARGETED_ADVERTISING_OPT_OUT), + SENSITIVE_DATA_RACIAL_ETHNIC_ORIGIN(UsNatField.SENSITIVE_DATA_PROCESSING + 1), + SENSITIVE_DATA_RELIGIOUS_BELIEFS(UsNatField.SENSITIVE_DATA_PROCESSING + 2), + SENSITIVE_DATA_HEALTH_INFO(UsNatField.SENSITIVE_DATA_PROCESSING + 3), + SENSITIVE_DATA_ORIENTATION(UsNatField.SENSITIVE_DATA_PROCESSING + 4), + SENSITIVE_DATA_CITIZENSHIP_STATUS(UsNatField.SENSITIVE_DATA_PROCESSING + 5), + SENSITIVE_DATA_GENETIC_ID(UsNatField.SENSITIVE_DATA_PROCESSING + 6), + SENSITIVE_DATA_BIOMETRIC_ID(UsNatField.SENSITIVE_DATA_PROCESSING + 7), + SENSITIVE_DATA_GEOLOCATION(UsNatField.SENSITIVE_DATA_PROCESSING + 8), + SENSITIVE_DATA_ID_NUMBERS(UsNatField.SENSITIVE_DATA_PROCESSING + 9), + SENSITIVE_DATA_ACCOUNT_INFO(UsNatField.SENSITIVE_DATA_PROCESSING + 10), + SENSITIVE_DATA_UNION_MEMBERSHIP(UsNatField.SENSITIVE_DATA_PROCESSING + 11), + SENSITIVE_DATA_COMMUNICATION_CONTENTS(UsNatField.SENSITIVE_DATA_PROCESSING + 12), + SENSITIVE_DATA_PROCESSING_ALL(UsNatField.SENSITIVE_DATA_PROCESSING + "*"), + CHILD_CONSENTS_FROM_13_TO_16(UsNatField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS + 1), + CHILD_CONSENTS_BELOW_13(UsNatField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS + 2), + PERSONAL_DATA_CONSENTS(UsNatField.PERSONAL_DATA_CONSENTS), + MSPA_COVERED_TRANSACTION(UsNatField.MSPA_COVERED_TRANSACTION), + MSPA_OPT_OUT_OPTION_MODE(UsNatField.MSPA_OPT_OUT_OPTION_MODE), + MSPA_SERVICE_PROVIDER_MODE(UsNatField.MSPA_SERVICE_PROVIDER_MODE), + GPC(UsNatField.GPC); @JsonValue final String value 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 f3866eb24cd..8f92eb35210 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 @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonValue import com.iab.gpp.encoder.section.HeaderV1 import com.iab.gpp.encoder.section.TcfCaV1 import com.iab.gpp.encoder.section.TcfEuV2 -import com.iab.gpp.encoder.section.UsCaV1 -import com.iab.gpp.encoder.section.UsCoV1 -import com.iab.gpp.encoder.section.UsCtV1 -import com.iab.gpp.encoder.section.UsNatV1 -import com.iab.gpp.encoder.section.UsUtV1 -import com.iab.gpp.encoder.section.UsVaV1 +import com.iab.gpp.encoder.section.UsCa +import com.iab.gpp.encoder.section.UsCo +import com.iab.gpp.encoder.section.UsCt +import com.iab.gpp.encoder.section.UsNat +import com.iab.gpp.encoder.section.UsUt +import com.iab.gpp.encoder.section.UsVa import com.iab.gpp.encoder.section.UspV1 enum GppSectionId { @@ -18,12 +18,12 @@ enum GppSectionId { HEADER_V1(HeaderV1.ID), TCF_CA_V1(TcfCaV1.ID), USP_V1(UspV1.ID), - US_NAT_V1(UsNatV1.ID), - US_CA_V1(UsCaV1.ID), - US_VA_V1(UsVaV1.ID), - US_CO_V1(UsCoV1.ID), - US_UT_V1(UsUtV1.ID), - US_CT_V1(UsCtV1.ID) + US_NAT_V1(UsNat.ID), + US_CA_V1(UsCa.ID), + US_VA_V1(UsVa.ID), + US_CO_V1(UsCo.ID), + US_UT_V1(UsUt.ID), + US_CT_V1(UsCt.ID) @JsonValue final Integer value diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/GppConsent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/GppConsent.groovy index dd30e8c20ba..3363ab73499 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/GppConsent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/GppConsent.groovy @@ -2,12 +2,12 @@ package org.prebid.server.functional.util.privacy.gpp import com.iab.gpp.encoder.GppModel import com.iab.gpp.encoder.section.TcfEuV2 -import com.iab.gpp.encoder.section.UsCaV1 -import com.iab.gpp.encoder.section.UsCoV1 -import com.iab.gpp.encoder.section.UsCtV1 -import com.iab.gpp.encoder.section.UsNatV1 -import com.iab.gpp.encoder.section.UsUtV1 -import com.iab.gpp.encoder.section.UsVaV1 +import com.iab.gpp.encoder.section.UsCa +import com.iab.gpp.encoder.section.UsCo +import com.iab.gpp.encoder.section.UsCt +import com.iab.gpp.encoder.section.UsNat +import com.iab.gpp.encoder.section.UsUt +import com.iab.gpp.encoder.section.UsVa import com.iab.gpp.encoder.section.UspV1 import org.prebid.server.functional.util.privacy.ConsentString @@ -64,12 +64,12 @@ abstract class GppConsent implements ConsentString { TCF_EU_V2(TcfEuV2.NAME, TcfEuV2.VERSION), //2 USP_V1(UspV1.NAME, UspV1.VERSION), //6 - US_NAT_V1(UsNatV1.NAME, UsNatV1.VERSION), //7 - US_CA_V1(UsCaV1.NAME, UsCaV1.VERSION), //8 - US_VA_V1(UsVaV1.NAME, UsVaV1.VERSION), //9 - US_CO_V1(UsCoV1.NAME, UsCoV1.VERSION), //10 - US_UT_V1(UsUtV1.NAME, UsUtV1.VERSION), //11 - US_CT_V1(UsCtV1.NAME, UsCtV1.VERSION), //12 + US_NAT_V1(UsNat.NAME, UsNat.VERSION), //7 + US_CA_V1(UsCa.NAME, UsCa.VERSION), //8 + US_VA_V1(UsVa.NAME, UsVa.VERSION), //9 + US_CO_V1(UsCo.NAME, UsCo.VERSION), //10 + US_UT_V1(UsUt.NAME, UsUt.VERSION), //11 + US_CT_V1(UsCt.NAME, UsCt.VERSION), //12 final String name final int version diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCaV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCaV1Consent.groovy index dec740c4395..035a9205d1e 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCaV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCaV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsCaV1Field +import com.iab.gpp.encoder.field.UsCaField import org.prebid.server.functional.util.privacy.gpp.data.UsCaliforniaSensitiveData class UsCaV1Consent extends GppConsent { @@ -23,77 +23,77 @@ class UsCaV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsCaV1Field.VERSION, version) + fieldValue(UsCaField.VERSION, version) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsCaV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsCaField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setSharingOptOutNotice(Integer sharingOptOutNotice) { - fieldValue(UsCaV1Field.SHARING_OPT_OUT_NOTICE, sharingOptOutNotice) + fieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, sharingOptOutNotice) this } Builder setSensitiveDataLimitUseNotice(Integer sensitiveDataLimitUseNotice) { - fieldValue(UsCaV1Field.SENSITIVE_DATA_LIMIT_USE_NOTICE, sensitiveDataLimitUseNotice) + fieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, sensitiveDataLimitUseNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsCaV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsCaField.SALE_OPT_OUT, saleOptOut) this } Builder setSharingOptOut(Integer sharingOptOut) { - fieldValue(UsCaV1Field.SHARING_OPT_OUT, sharingOptOut) + fieldValue(UsCaField.SHARING_OPT_OUT, sharingOptOut) this } Builder setSensitiveDataProcessing(UsCaliforniaSensitiveData sensitiveDataProcessing) { - fieldValue(UsCaV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsCaField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setKnownChildSensitiveDataConsents(Integer childFrom13to16, Integer childBlow13) { - fieldValue(UsCaV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13]) + fieldValue(UsCaField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13]) this } Builder setPersonalDataConsents(Integer personalDataConsents) { - fieldValue(UsCaV1Field.PERSONAL_DATA_CONSENTS, personalDataConsents) + fieldValue(UsCaField.PERSONAL_DATA_CONSENTS, personalDataConsents) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsCaV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsCaField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsCaV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsCaV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } Builder setGpcSegmentType(Integer gpcSegmentType) { - fieldValue(UsCaV1Field.GPC_SEGMENT_TYPE, gpcSegmentType) + fieldValue(UsCaField.GPC_SEGMENT_TYPE, gpcSegmentType) this } Builder setGpcSegmentIncluded(Boolean gpcSegmentIncluded) { - fieldValue(UsCaV1Field.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) + fieldValue(UsCaField.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) this } Builder setGpc(Boolean gpc) { - fieldValue(UsCaV1Field.GPC, gpc) + fieldValue(UsCaField.GPC, gpc) this } diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCoV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCoV1Consent.groovy index 25bbc9dfb81..9cd3dd997e8 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCoV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCoV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsCoV1Field +import com.iab.gpp.encoder.field.UsCoField import org.prebid.server.functional.util.privacy.gpp.data.UsColoradoSensitiveData class UsCoV1Consent extends GppConsent { @@ -23,72 +23,72 @@ class UsCoV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsCoV1Field.VERSION, version) + fieldValue(UsCoField.VERSION, version) this } Builder setSharingNotice(Integer sharingNotice) { - fieldValue(UsCoV1Field.SHARING_NOTICE, sharingNotice) + fieldValue(UsCoField.SHARING_NOTICE, sharingNotice) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsCoV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsCoField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setTargetedAdvertisingOptOutNotice(Integer targetedAdvertisingOptOutNotice) { - fieldValue(UsCoV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) + fieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsCoV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsCoField.SALE_OPT_OUT, saleOptOut) this } Builder setTargetedAdvertisingOptOut(Integer targetedAdvertisingOptOut) { - fieldValue(UsCoV1Field.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) + fieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) this } Builder setSensitiveDataProcessing(UsColoradoSensitiveData sensitiveDataProcessing) { - fieldValue(UsCoV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsCoField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setKnownChildSensitiveDataConsents(Integer knownChildSensitiveDataConsents) { - fieldValue(UsCoV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, knownChildSensitiveDataConsents) + fieldValue(UsCoField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, knownChildSensitiveDataConsents) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsCoV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsCoField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsCoV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsCoV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } Builder setGpcSegmentType(Integer gpcSegmentType) { - fieldValue(UsCoV1Field.GPC_SEGMENT_TYPE, gpcSegmentType) + fieldValue(UsCoField.GPC_SEGMENT_TYPE, gpcSegmentType) this } Builder setGpcSegmentIncluded(Integer gpcSegmentIncluded) { - fieldValue(UsCoV1Field.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) + fieldValue(UsCoField.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) this } Builder setGpc(Boolean gpc) { - fieldValue(UsCoV1Field.GPC, gpc) + fieldValue(UsCoField.GPC, gpc) this } diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCtV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCtV1Consent.groovy index 9c95345939a..ac8a8982eb3 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCtV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsCtV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsCtV1Field +import com.iab.gpp.encoder.field.UsCtField import org.prebid.server.functional.util.privacy.gpp.data.UsConnecticutSensitiveData class UsCtV1Consent extends GppConsent { @@ -23,72 +23,72 @@ class UsCtV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsCtV1Field.VERSION, version) + fieldValue(UsCtField.VERSION, version) this } Builder setSharingNotice(Integer sharingNotice) { - fieldValue(UsCtV1Field.SHARING_NOTICE, sharingNotice) + fieldValue(UsCtField.SHARING_NOTICE, sharingNotice) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsCtV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsCtField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setTargetedAdvertisingOptOutNotice(Integer targetedAdvertisingOptOutNotice) { - fieldValue(UsCtV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) + fieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsCtV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsCtField.SALE_OPT_OUT, saleOptOut) this } Builder setTargetedAdvertisingOptOut(Integer targetedAdvertisingOptOut) { - fieldValue(UsCtV1Field.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) + fieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) this } Builder setSensitiveDataProcessing(UsConnecticutSensitiveData sensitiveDataProcessing) { - fieldValue(UsCtV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsCtField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setKnownChildSensitiveDataConsents(Integer childFrom13to16, Integer childBlow13, Integer childFrom16to18) { - fieldValue(UsCtV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13, childFrom16to18]) + fieldValue(UsCtField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13, childFrom16to18]) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsCtV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsCtField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsCtV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsCtV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } Builder setGpcSegmentType(Integer gpcSegmentType) { - fieldValue(UsCtV1Field.GPC_SEGMENT_TYPE, gpcSegmentType) + fieldValue(UsCtField.GPC_SEGMENT_TYPE, gpcSegmentType) this } Builder setGpcSegmentIncluded(Integer gpcSegmentIncluded) { - fieldValue(UsCtV1Field.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) + fieldValue(UsCtField.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) this } Builder setGpc(Boolean gpc) { - fieldValue(UsCtV1Field.GPC, gpc) + fieldValue(UsCtField.GPC, gpc) this } diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsNatV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsNatV1Consent.groovy index 1805cdcf9bd..1318ba37c24 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsNatV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsNatV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsNatV1Field +import com.iab.gpp.encoder.field.UsNatField import org.prebid.server.functional.util.privacy.gpp.data.UsNationalSensitiveData class UsNatV1Consent extends GppConsent { @@ -23,97 +23,97 @@ class UsNatV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsNatV1Field.VERSION, version) + fieldValue(UsNatField.VERSION, version) this } Builder setSharingNotice(Integer sharingNotice) { - fieldValue(UsNatV1Field.SHARING_NOTICE, sharingNotice) + fieldValue(UsNatField.SHARING_NOTICE, sharingNotice) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsNatV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsNatField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setSharingOptOutNotice(Integer sharingOptOutNotice) { - fieldValue(UsNatV1Field.SHARING_OPT_OUT_NOTICE, sharingOptOutNotice) + fieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, sharingOptOutNotice) this } Builder setTargetedAdvertisingOptOutNotice(Integer targetedAdvertisingOptOutNotice) { - fieldValue(UsNatV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) + fieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) this } Builder setSensitiveDataProcessingOptOutNotice(Integer sensitiveDataProcessingOptOutNotice) { - fieldValue(UsNatV1Field.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE, sensitiveDataProcessingOptOutNotice) + fieldValue(UsNatField.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE, sensitiveDataProcessingOptOutNotice) this } Builder setSensitiveDataLimitUseNotice(Integer sensitiveDataLimitUseNotice) { - fieldValue(UsNatV1Field.SENSITIVE_DATA_LIMIT_USE_NOTICE, sensitiveDataLimitUseNotice) + fieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, sensitiveDataLimitUseNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsNatV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsNatField.SALE_OPT_OUT, saleOptOut) this } Builder setSharingOptOut(Integer sharingOptOut) { - fieldValue(UsNatV1Field.SHARING_OPT_OUT, sharingOptOut) + fieldValue(UsNatField.SHARING_OPT_OUT, sharingOptOut) this } Builder setTargetedAdvertisingOptOut(Integer targetedAdvertisingOptOut) { - fieldValue(UsNatV1Field.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) + fieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) this } Builder setSensitiveDataProcessing(UsNationalSensitiveData sensitiveDataProcessing) { - fieldValue(UsNatV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsNatField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setPersonalDataConsents(Integer personalDataConsents) { - fieldValue(UsNatV1Field.PERSONAL_DATA_CONSENTS, personalDataConsents) + fieldValue(UsNatField.PERSONAL_DATA_CONSENTS, personalDataConsents) this } Builder setKnownChildSensitiveDataConsents(Integer childFrom13to16, Integer childBlow13) { - fieldValue(UsNatV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13]) + fieldValue(UsNatField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, [childFrom13to16, childBlow13]) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsNatV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsNatField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsNatV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsNatV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } Builder setGpcSegmentType(Integer gpcSegmentType) { - fieldValue(UsNatV1Field.GPC_SEGMENT_TYPE, gpcSegmentType) + fieldValue(UsNatField.GPC_SEGMENT_TYPE, gpcSegmentType) this } Builder setGpcSegmentIncluded(Boolean gpcSegmentIncluded) { - fieldValue(UsNatV1Field.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) + fieldValue(UsNatField.GPC_SEGMENT_INCLUDED, gpcSegmentIncluded) this } Builder setGpc(Boolean gpc) { - fieldValue(UsNatV1Field.GPC, gpc) + fieldValue(UsNatField.GPC, gpc) this } diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsUtV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsUtV1Consent.groovy index fd37a095026..960485c4fcb 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsUtV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsUtV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsUtV1Field +import com.iab.gpp.encoder.field.UsUtField import org.prebid.server.functional.util.privacy.gpp.data.UsUtahSensitiveData class UsUtV1Consent extends GppConsent { @@ -23,62 +23,62 @@ class UsUtV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsUtV1Field.VERSION, version) + fieldValue(UsUtField.VERSION, version) this } Builder setSharingNotice(Integer sharingNotice) { - fieldValue(UsUtV1Field.SHARING_NOTICE, sharingNotice) + fieldValue(UsUtField.SHARING_NOTICE, sharingNotice) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsUtV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsUtField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setTargetedAdvertisingOptOutNotice(Integer targetedAdvertisingOptOutNotice) { - fieldValue(UsUtV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) + fieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) this } Builder setSensitiveDataProcessingOptOutNotice(Integer sensitiveDataProcessingOptOutNotice) { - fieldValue(UsUtV1Field.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE, sensitiveDataProcessingOptOutNotice) + fieldValue(UsUtField.SENSITIVE_DATA_PROCESSING_OPT_OUT_NOTICE, sensitiveDataProcessingOptOutNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsUtV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsUtField.SALE_OPT_OUT, saleOptOut) this } Builder setTargetedAdvertisingOptOut(Integer targetedAdvertisingOptOut) { - fieldValue(UsUtV1Field.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) + fieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) this } Builder setSensitiveDataProcessing(UsUtahSensitiveData sensitiveDataProcessing) { - fieldValue(UsUtV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsUtField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setKnownChildSensitiveDataConsents(Integer knownChildSensitiveDataConsents) { - fieldValue(UsUtV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, knownChildSensitiveDataConsents) + fieldValue(UsUtField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, knownChildSensitiveDataConsents) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsUtV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsUtField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsUtV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsUtV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsVaV1Consent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsVaV1Consent.groovy index 97463c079fc..07e75346ba4 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsVaV1Consent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsVaV1Consent.groovy @@ -1,6 +1,6 @@ package org.prebid.server.functional.util.privacy.gpp -import com.iab.gpp.encoder.field.UsVaV1Field +import com.iab.gpp.encoder.field.UsVaField import org.prebid.server.functional.util.privacy.gpp.data.UsVirginiaSensitiveData class UsVaV1Consent extends GppConsent { @@ -23,57 +23,57 @@ class UsVaV1Consent extends GppConsent { } Builder setVersion(Integer version) { - fieldValue(UsVaV1Field.VERSION, version) + fieldValue(UsVaField.VERSION, version) this } Builder setSharingNotice(Integer sharingNotice) { - fieldValue(UsVaV1Field.SHARING_NOTICE, sharingNotice) + fieldValue(UsVaField.SHARING_NOTICE, sharingNotice) this } Builder setSaleOptOutNotice(Integer saleOptOutNotice) { - fieldValue(UsVaV1Field.SALE_OPT_OUT_NOTICE, saleOptOutNotice) + fieldValue(UsVaField.SALE_OPT_OUT_NOTICE, saleOptOutNotice) this } Builder setTargetedAdvertisingOptOutNotice(Integer targetedAdvertisingOptOutNotice) { - fieldValue(UsVaV1Field.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) + fieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, targetedAdvertisingOptOutNotice) this } Builder setSaleOptOut(Integer saleOptOut) { - fieldValue(UsVaV1Field.SALE_OPT_OUT, saleOptOut) + fieldValue(UsVaField.SALE_OPT_OUT, saleOptOut) this } Builder setTargetedAdvertisingOptOut(Integer targetedAdvertisingOptOut) { - fieldValue(UsVaV1Field.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) + fieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, targetedAdvertisingOptOut) this } Builder setSensitiveDataProcessing(UsVirginiaSensitiveData sensitiveDataProcessing) { - fieldValue(UsVaV1Field.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) + fieldValue(UsVaField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList) this } Builder setKnownChildSensitiveDataConsents(Integer childSensitiveDataConsents) { - fieldValue(UsVaV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, childSensitiveDataConsents) + fieldValue(UsVaField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, childSensitiveDataConsents) this } Builder setMspaCoveredTransaction(Integer mspaCoveredTransaction) { - fieldValue(UsVaV1Field.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) + fieldValue(UsVaField.MSPA_COVERED_TRANSACTION, mspaCoveredTransaction) this } Builder setMspaOptOutOptionMode(Integer mspaOptOutOptionMode) { - fieldValue(UsVaV1Field.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) + fieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, mspaOptOutOptionMode) this } Builder setMspaServiceProviderMode(Integer mspaServiceProviderMode) { - fieldValue(UsVaV1Field.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) + fieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, mspaServiceProviderMode) this } diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReaderTest.java index f0636ba739a..f736c36ba3a 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCaV1; +import com.iab.gpp.encoder.section.UsCa; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USCaliforniaGppReaderTest { private GppModel gppModel; @Mock - private UsCaV1 usCaV1; + private UsCa usCa; private USCaliforniaGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCaV1Section()).willReturn(usCaV1); + given(gppModel.getUsCaSection()).willReturn(usCa); gppReader = new USCaliforniaGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCaV1.getVersion()).willReturn(1); + given(usCa.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCaV1.getGpc()).willReturn(true); + given(usCa.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCaV1.getGpcSegmentIncluded()).willReturn(true); + given(usCa.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCaV1.getSaleOptOut()).willReturn(1); + given(usCa.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSaleOptOutNotice()).willReturn(1); + given(usCa.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -89,13 +89,13 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { public void getSharingNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getSharingOptOutShouldReturnExpectedResult() { // given - given(usCaV1.getSharingOptOut()).willReturn(1); + given(usCa.getSharingOptOut()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOut()).isEqualTo(1); @@ -104,7 +104,7 @@ public void getSharingOptOutShouldReturnExpectedResult() { @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSharingOptOutNotice()).willReturn(1); + given(usCa.getSharingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOutNotice()).isEqualTo(1); @@ -114,20 +114,20 @@ public void getSharingOptOutNoticeShouldReturnExpectedResult() { public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSensitiveDataLimitUseNotice()).willReturn(1); + given(usCa.getSensitiveDataLimitUseNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isEqualTo(1); @@ -137,7 +137,7 @@ public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCaV1.getSensitiveDataProcessing()).willReturn(data); + given(usCa.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -147,14 +147,14 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCaV1.getKnownChildSensitiveDataConsents()).willReturn(data); + given(usCa.getKnownChildSensitiveDataConsents()).willReturn(data); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isSameAs(data); @@ -163,7 +163,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { @Test public void getPersonalDataConsentsShouldReturnExpectedResult() { // given - given(usCaV1.getPersonalDataConsents()).willReturn(1); + given(usCa.getPersonalDataConsents()).willReturn(1); // when and then assertThat(gppReader.getPersonalDataConsents()).isEqualTo(1); @@ -172,7 +172,7 @@ public void getPersonalDataConsentsShouldReturnExpectedResult() { @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCaV1.getMspaCoveredTransaction()).willReturn(1); + given(usCa.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -181,7 +181,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCaV1.getMspaServiceProviderMode()).willReturn(1); + given(usCa.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -190,7 +190,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCaV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCa.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReaderTest.java index 34d138b4f1d..1548b2ddad6 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCoV1; +import com.iab.gpp.encoder.section.UsCo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USColoradoGppReaderTest { private GppModel gppModel; @Mock - private UsCoV1 usCoV1; + private UsCo usCo; private USColoradoGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCoV1Section()).willReturn(usCoV1); + given(gppModel.getUsCoSection()).willReturn(usCo); gppReader = new USColoradoGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCoV1.getVersion()).willReturn(1); + given(usCo.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCoV1.getGpc()).willReturn(true); + given(usCo.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCoV1.getGpcSegmentIncluded()).willReturn(true); + given(usCo.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCoV1.getSaleOptOut()).willReturn(1); + given(usCo.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getSaleOptOutNotice()).willReturn(1); + given(usCo.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -88,7 +88,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getSharingNotice()).willReturn(1); + given(usCo.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -98,20 +98,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usCoV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usCo.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -120,7 +120,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usCo.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -130,14 +130,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCoV1.getSensitiveDataProcessing()).willReturn(data); + given(usCo.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -147,13 +147,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given - given(usCoV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usCo.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isEqualTo(1); @@ -163,13 +163,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCoV1.getMspaCoveredTransaction()).willReturn(1); + given(usCo.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -178,7 +178,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCoV1.getMspaServiceProviderMode()).willReturn(1); + given(usCo.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -187,7 +187,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCoV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCo.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReaderTest.java index 92a21c0f4a0..f1197e4305c 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCtV1; +import com.iab.gpp.encoder.section.UsCt; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USConnecticutGppReaderTest { private GppModel gppModel; @Mock - private UsCtV1 usCtV1; + private UsCt usCt; private USConnecticutGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCtV1Section()).willReturn(usCtV1); + given(gppModel.getUsCtSection()).willReturn(usCt); gppReader = new USConnecticutGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCtV1.getVersion()).willReturn(1); + given(usCt.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCtV1.getGpc()).willReturn(true); + given(usCt.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCtV1.getGpcSegmentIncluded()).willReturn(true); + given(usCt.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCtV1.getSaleOptOut()).willReturn(1); + given(usCt.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getSaleOptOutNotice()).willReturn(1); + given(usCt.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -88,7 +88,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getSharingNotice()).willReturn(1); + given(usCt.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -98,20 +98,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usCtV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usCt.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -120,7 +120,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usCt.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -130,14 +130,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCtV1.getSensitiveDataProcessing()).willReturn(data); + given(usCt.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -147,14 +147,14 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCtV1.getKnownChildSensitiveDataConsents()).willReturn(data); + given(usCt.getKnownChildSensitiveDataConsents()).willReturn(data); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isSameAs(data); @@ -164,13 +164,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCtV1.getMspaCoveredTransaction()).willReturn(1); + given(usCt.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -179,7 +179,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCtV1.getMspaServiceProviderMode()).willReturn(1); + given(usCt.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -188,7 +188,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCtV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCt.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReaderTest.java index f7e956708ba..3a6244b419e 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USUtahGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsUtV1; +import com.iab.gpp.encoder.section.UsUt; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USUtahGppReaderTest { private GppModel gppModel; @Mock - private UsUtV1 usUtV1; + private UsUt usUt; private USUtahGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsUtV1Section()).willReturn(usUtV1); + given(gppModel.getUsUtSection()).willReturn(usUt); gppReader = new USUtahGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usUtV1.getVersion()).willReturn(1); + given(usUt.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -46,27 +46,27 @@ public void getVersionShouldReturnExpectedResult() { public void getGpcShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpc()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentIncluded()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usUtV1.getSaleOptOut()).willReturn(1); + given(usUt.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -75,7 +75,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSaleOptOutNotice()).willReturn(1); + given(usUt.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -84,7 +84,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSharingNotice()).willReturn(1); + given(usUt.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -94,20 +94,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usUtV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usUt.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -116,7 +116,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usUt.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -126,14 +126,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usUtV1.getSensitiveDataProcessing()).willReturn(data); + given(usUt.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -142,7 +142,7 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { @Test public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSensitiveDataProcessingOptOutNotice()).willReturn(1); + given(usUt.getSensitiveDataProcessingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isEqualTo(1); @@ -151,7 +151,7 @@ public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given - given(usUtV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usUt.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isEqualTo(1); @@ -161,13 +161,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usUtV1.getMspaCoveredTransaction()).willReturn(1); + given(usUt.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -176,7 +176,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usUtV1.getMspaServiceProviderMode()).willReturn(1); + given(usUt.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -185,7 +185,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usUtV1.getMspaOptOutOptionMode()).willReturn(1); + given(usUt.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReaderTest.java index 284f50dee74..50df6b4bac1 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USVirginiaGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.uscustomlogic.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsVaV1; +import com.iab.gpp.encoder.section.UsVa; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USVirginiaGppReaderTest { private GppModel gppModel; @Mock - private UsVaV1 usVaV1; + private UsVa usVa; private USVirginiaGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsVaV1Section()).willReturn(usVaV1); + given(gppModel.getUsVaSection()).willReturn(usVa); gppReader = new USVirginiaGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usVaV1.getVersion()).willReturn(1); + given(usVa.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -46,27 +46,27 @@ public void getVersionShouldReturnExpectedResult() { public void getGpcShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpc()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentIncluded()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usVaV1.getSaleOptOut()).willReturn(1); + given(usVa.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -75,7 +75,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getSaleOptOutNotice()).willReturn(1); + given(usVa.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -84,7 +84,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getSharingNotice()).willReturn(1); + given(usVa.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -94,20 +94,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usVaV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usVa.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -116,7 +116,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usVa.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -126,14 +126,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usVaV1.getSensitiveDataProcessing()).willReturn(data); + given(usVa.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -143,13 +143,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given - given(usVaV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usVa.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isEqualTo(1); @@ -159,13 +159,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usVaV1.getMspaCoveredTransaction()).willReturn(1); + given(usVa.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -174,7 +174,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usVaV1.getMspaServiceProviderMode()).willReturn(1); + given(usVa.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -183,7 +183,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usVaV1.getMspaOptOutOptionMode()).willReturn(1); + given(usVa.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReaderTest.java index 5906d0842db..1812cccf5c2 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedCaliforniaGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCaV1; +import com.iab.gpp.encoder.section.UsCa; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USMappedCaliforniaGppReaderTest { private GppModel gppModel; @Mock - private UsCaV1 usCaV1; + private UsCa usCa; private USMappedCaliforniaGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCaV1Section()).willReturn(usCaV1); + given(gppModel.getUsCaSection()).willReturn(usCa); gppReader = new USMappedCaliforniaGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCaV1.getVersion()).willReturn(1); + given(usCa.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCaV1.getGpc()).willReturn(true); + given(usCa.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCaV1.getGpcSegmentIncluded()).willReturn(true); + given(usCa.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCaV1.getSaleOptOut()).willReturn(1); + given(usCa.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSaleOptOutNotice()).willReturn(1); + given(usCa.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -89,13 +89,13 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { public void getSharingNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getSharingOptOutShouldReturnExpectedResult() { // given - given(usCaV1.getSharingOptOut()).willReturn(1); + given(usCa.getSharingOptOut()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOut()).isEqualTo(1); @@ -104,7 +104,7 @@ public void getSharingOptOutShouldReturnExpectedResult() { @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSharingOptOutNotice()).willReturn(1); + given(usCa.getSharingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOutNotice()).isEqualTo(1); @@ -114,20 +114,20 @@ public void getSharingOptOutNoticeShouldReturnExpectedResult() { public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // given - given(usCaV1.getSensitiveDataLimitUseNotice()).willReturn(1); + given(usCa.getSensitiveDataLimitUseNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isEqualTo(1); @@ -136,7 +136,7 @@ public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given - given(usCaV1.getSensitiveDataProcessing()).willReturn(asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)); + given(usCa.getSensitiveDataProcessing()).willReturn(asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)); // when and then assertThat(gppReader.getSensitiveDataProcessing()) @@ -147,13 +147,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCaV1); + verifyNoInteractions(usCa); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResult() { // given - given(usCaV1.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 0)); + given(usCa.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 0)); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(0, 0); @@ -162,7 +162,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResult() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResult() { // given - given(usCaV1.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 2)); + given(usCa.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 2)); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -171,7 +171,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResult() { @Test public void getPersonalDataConsentsShouldReturnExpectedResult() { // given - given(usCaV1.getPersonalDataConsents()).willReturn(1); + given(usCa.getPersonalDataConsents()).willReturn(1); // when and then assertThat(gppReader.getPersonalDataConsents()).isEqualTo(1); @@ -180,7 +180,7 @@ public void getPersonalDataConsentsShouldReturnExpectedResult() { @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCaV1.getMspaCoveredTransaction()).willReturn(1); + given(usCa.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -189,7 +189,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCaV1.getMspaServiceProviderMode()).willReturn(1); + given(usCa.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -198,7 +198,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCaV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCa.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReaderTest.java index cbb9b188bc4..fe09abd5d5a 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedColoradoGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCoV1; +import com.iab.gpp.encoder.section.UsCo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USMappedColoradoGppReaderTest { private GppModel gppModel; @Mock - private UsCoV1 usCoV1; + private UsCo usCo; private USMappedColoradoGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCoV1Section()).willReturn(usCoV1); + given(gppModel.getUsCoSection()).willReturn(usCo); gppReader = new USMappedColoradoGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCoV1.getVersion()).willReturn(1); + given(usCo.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCoV1.getGpc()).willReturn(true); + given(usCo.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCoV1.getGpcSegmentIncluded()).willReturn(true); + given(usCo.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCoV1.getSaleOptOut()).willReturn(1); + given(usCo.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getSaleOptOutNotice()).willReturn(1); + given(usCo.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -88,7 +88,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getSharingNotice()).willReturn(1); + given(usCo.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -98,20 +98,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usCoV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usCo.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -120,7 +120,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCoV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usCo.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -130,14 +130,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCoV1.getSensitiveDataProcessing()).willReturn(data); + given(usCo.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -147,13 +147,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { // given - given(usCoV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usCo.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -162,7 +162,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { // given - given(usCoV1.getKnownChildSensitiveDataConsents()).willReturn(2); + given(usCo.getKnownChildSensitiveDataConsents()).willReturn(2); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -171,7 +171,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { // given - given(usCoV1.getKnownChildSensitiveDataConsents()).willReturn(0); + given(usCo.getKnownChildSensitiveDataConsents()).willReturn(0); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(0, 0); @@ -181,13 +181,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usCoV1); + verifyNoInteractions(usCo); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCoV1.getMspaCoveredTransaction()).willReturn(1); + given(usCo.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -196,7 +196,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCoV1.getMspaServiceProviderMode()).willReturn(1); + given(usCo.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -205,7 +205,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCoV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCo.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReaderTest.java index 8fd231e8251..10856ba3c32 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedConnecticutGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsCtV1; +import com.iab.gpp.encoder.section.UsCt; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -23,13 +23,13 @@ public class USMappedConnecticutGppReaderTest { private GppModel gppModel; @Mock - private UsCtV1 usCtV1; + private UsCt usCt; private USMappedConnecticutGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsCtV1Section()).willReturn(usCtV1); + given(gppModel.getUsCtSection()).willReturn(usCt); gppReader = new USMappedConnecticutGppReader(gppModel); } @@ -37,7 +37,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usCtV1.getVersion()).willReturn(1); + given(usCt.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -46,7 +46,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usCtV1.getGpc()).willReturn(true); + given(usCt.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -56,13 +56,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usCtV1.getGpcSegmentIncluded()).willReturn(true); + given(usCt.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -71,7 +71,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usCtV1.getSaleOptOut()).willReturn(1); + given(usCt.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -80,7 +80,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getSaleOptOutNotice()).willReturn(1); + given(usCt.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -89,7 +89,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getSharingNotice()).willReturn(1); + given(usCt.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -99,20 +99,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usCtV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usCt.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -121,7 +121,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usCtV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usCt.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -131,14 +131,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usCtV1.getSensitiveDataProcessing()).willReturn(data); + given(usCt.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -148,13 +148,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResult() { // given - given(usCtV1.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 0, 0)); + given(usCt.getKnownChildSensitiveDataConsents()).willReturn(asList(0, 0, 0)); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(0, 0); @@ -163,7 +163,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResult() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnMixedChildResult() { // given - given(usCtV1.getKnownChildSensitiveDataConsents()).willReturn(asList(null, 2, 2)); + given(usCt.getKnownChildSensitiveDataConsents()).willReturn(asList(null, 2, 2)); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(2, 1); @@ -172,7 +172,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnMixedChildResult() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResult() { // given - given(usCtV1.getKnownChildSensitiveDataConsents()).willReturn(asList(null, null, null)); + given(usCt.getKnownChildSensitiveDataConsents()).willReturn(asList(null, null, null)); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -182,13 +182,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResult() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usCtV1); + verifyNoInteractions(usCt); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usCtV1.getMspaCoveredTransaction()).willReturn(1); + given(usCt.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -197,7 +197,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usCtV1.getMspaServiceProviderMode()).willReturn(1); + given(usCt.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -206,7 +206,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usCtV1.getMspaOptOutOptionMode()).willReturn(1); + given(usCt.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReaderTest.java index 2e8bcf8cbc6..b494db3fa9c 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedUtahGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsUtV1; +import com.iab.gpp.encoder.section.UsUt; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USMappedUtahGppReaderTest { private GppModel gppModel; @Mock - private UsUtV1 usUtV1; + private UsUt usUt; private USMappedUtahGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsUtV1Section()).willReturn(usUtV1); + given(gppModel.getUsUtSection()).willReturn(usUt); gppReader = new USMappedUtahGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usUtV1.getVersion()).willReturn(1); + given(usUt.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -46,27 +46,27 @@ public void getVersionShouldReturnExpectedResult() { public void getGpcShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpc()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentIncluded()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usUtV1.getSaleOptOut()).willReturn(1); + given(usUt.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -75,7 +75,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSaleOptOutNotice()).willReturn(1); + given(usUt.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -84,7 +84,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSharingNotice()).willReturn(1); + given(usUt.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -94,20 +94,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usUtV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usUt.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -116,7 +116,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usUt.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -126,13 +126,13 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given - given(usUtV1.getSensitiveDataProcessing()).willReturn(asList(0, 1, 2, 3, 4, 5, 6, 7)); + given(usUt.getSensitiveDataProcessing()).willReturn(asList(0, 1, 2, 3, 4, 5, 6, 7)); // when and then assertThat(gppReader.getSensitiveDataProcessing()) @@ -142,7 +142,7 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { @Test public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // given - given(usUtV1.getSensitiveDataProcessingOptOutNotice()).willReturn(1); + given(usUt.getSensitiveDataProcessingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isEqualTo(1); @@ -151,7 +151,7 @@ public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { // given - given(usUtV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usUt.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -160,7 +160,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { // given - given(usUtV1.getKnownChildSensitiveDataConsents()).willReturn(2); + given(usUt.getKnownChildSensitiveDataConsents()).willReturn(2); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -169,7 +169,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { // given - given(usUtV1.getKnownChildSensitiveDataConsents()).willReturn(0); + given(usUt.getKnownChildSensitiveDataConsents()).willReturn(0); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(0, 0); @@ -179,13 +179,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usUtV1); + verifyNoInteractions(usUt); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usUtV1.getMspaCoveredTransaction()).willReturn(1); + given(usUt.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -194,7 +194,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usUtV1.getMspaServiceProviderMode()).willReturn(1); + given(usUt.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -203,7 +203,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usUtV1.getMspaOptOutOptionMode()).willReturn(1); + given(usUt.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReaderTest.java index 0fb5e0d2530..55710908064 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USMappedVirginiaGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsVaV1; +import com.iab.gpp.encoder.section.UsVa; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USMappedVirginiaGppReaderTest { private GppModel gppModel; @Mock - private UsVaV1 usVaV1; + private UsVa usVa; private USMappedVirginiaGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsVaV1Section()).willReturn(usVaV1); + given(gppModel.getUsVaSection()).willReturn(usVa); gppReader = new USMappedVirginiaGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usVaV1.getVersion()).willReturn(1); + given(usVa.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -46,27 +46,27 @@ public void getVersionShouldReturnExpectedResult() { public void getGpcShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpc()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentIncluded()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usVaV1.getSaleOptOut()).willReturn(1); + given(usVa.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -75,7 +75,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getSaleOptOutNotice()).willReturn(1); + given(usVa.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -84,7 +84,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getSharingNotice()).willReturn(1); + given(usVa.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -94,20 +94,20 @@ public void getSharingNoticeShouldReturnExpectedResult() { public void getSharingOptOutShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOut()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSharingOptOutNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usVaV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usVa.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -116,7 +116,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usVaV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usVa.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -126,14 +126,14 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usVaV1.getSensitiveDataProcessing()).willReturn(data); + given(usVa.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -143,13 +143,13 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { // given - given(usVaV1.getKnownChildSensitiveDataConsents()).willReturn(1); + given(usVa.getKnownChildSensitiveDataConsents()).willReturn(1); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -158,7 +158,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn1() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { // given - given(usVaV1.getKnownChildSensitiveDataConsents()).willReturn(2); + given(usVa.getKnownChildSensitiveDataConsents()).willReturn(2); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(1, 1); @@ -167,7 +167,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnChildResultOn2() { @Test public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { // given - given(usVaV1.getKnownChildSensitiveDataConsents()).willReturn(0); + given(usVa.getKnownChildSensitiveDataConsents()).willReturn(0); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).containsExactly(0, 0); @@ -177,13 +177,13 @@ public void getKnownChildSensitiveDataConsentsShouldReturnNonChildResultOn0() { public void getPersonalDataConsentsShouldReturnExpectedResult() { // when and then assertThat(gppReader.getPersonalDataConsents()).isNull(); - verifyNoInteractions(usVaV1); + verifyNoInteractions(usVa); } @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usVaV1.getMspaCoveredTransaction()).willReturn(1); + given(usVa.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -192,7 +192,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usVaV1.getMspaServiceProviderMode()).willReturn(1); + given(usVa.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -201,7 +201,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usVaV1.getMspaOptOutOptionMode()).willReturn(1); + given(usVa.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReaderTest.java b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReaderTest.java index f2c389250d2..85487ebe2b6 100644 --- a/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReaderTest.java +++ b/src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/reader/USNationalGppReaderTest.java @@ -1,7 +1,7 @@ package org.prebid.server.activity.infrastructure.privacy.usnat.reader; import com.iab.gpp.encoder.GppModel; -import com.iab.gpp.encoder.section.UsNatV1; +import com.iab.gpp.encoder.section.UsNat; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,13 +22,13 @@ public class USNationalGppReaderTest { private GppModel gppModel; @Mock - private UsNatV1 usNatV1; + private UsNat usNat; private USNationalGppReader gppReader; @BeforeEach public void setUp() { - given(gppModel.getUsNatV1Section()).willReturn(usNatV1); + given(gppModel.getUsNatSection()).willReturn(usNat); gppReader = new USNationalGppReader(gppModel); } @@ -36,7 +36,7 @@ public void setUp() { @Test public void getVersionShouldReturnExpectedResult() { // given - given(usNatV1.getVersion()).willReturn(1); + given(usNat.getVersion()).willReturn(1); // when and then assertThat(gppReader.getVersion()).isEqualTo(1); @@ -45,7 +45,7 @@ public void getVersionShouldReturnExpectedResult() { @Test public void getGpcShouldReturnExpectedResult() { // given - given(usNatV1.getGpc()).willReturn(true); + given(usNat.getGpc()).willReturn(true); // when and then assertThat(gppReader.getGpc()).isTrue(); @@ -55,13 +55,13 @@ public void getGpcShouldReturnExpectedResult() { public void getGpcSegmentTypeShouldReturnExpectedResult() { // when and then assertThat(gppReader.getGpcSegmentType()).isNull(); - verifyNoInteractions(usNatV1); + verifyNoInteractions(usNat); } @Test public void getGpcSegmentIncludedShouldReturnExpectedResult() { // given - given(usNatV1.getGpcSegmentIncluded()).willReturn(true); + given(usNat.getGpcSegmentIncluded()).willReturn(true); // when and then assertThat(gppReader.getGpcSegmentIncluded()).isTrue(); @@ -70,7 +70,7 @@ public void getGpcSegmentIncludedShouldReturnExpectedResult() { @Test public void getSaleOptOutShouldReturnExpectedResult() { // given - given(usNatV1.getSaleOptOut()).willReturn(1); + given(usNat.getSaleOptOut()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOut()).isEqualTo(1); @@ -79,7 +79,7 @@ public void getSaleOptOutShouldReturnExpectedResult() { @Test public void getSaleOptOutNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getSaleOptOutNotice()).willReturn(1); + given(usNat.getSaleOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSaleOptOutNotice()).isEqualTo(1); @@ -88,7 +88,7 @@ public void getSaleOptOutNoticeShouldReturnExpectedResult() { @Test public void getSharingNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getSharingNotice()).willReturn(1); + given(usNat.getSharingNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingNotice()).isEqualTo(1); @@ -97,7 +97,7 @@ public void getSharingNoticeShouldReturnExpectedResult() { @Test public void getSharingOptOutShouldReturnExpectedResult() { // given - given(usNatV1.getSharingOptOut()).willReturn(1); + given(usNat.getSharingOptOut()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOut()).isEqualTo(1); @@ -106,7 +106,7 @@ public void getSharingOptOutShouldReturnExpectedResult() { @Test public void getSharingOptOutNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getSharingOptOutNotice()).willReturn(1); + given(usNat.getSharingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSharingOptOutNotice()).isEqualTo(1); @@ -115,7 +115,7 @@ public void getSharingOptOutNoticeShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { // given - given(usNatV1.getTargetedAdvertisingOptOut()).willReturn(1); + given(usNat.getTargetedAdvertisingOptOut()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOut()).isEqualTo(1); @@ -124,7 +124,7 @@ public void getTargetedAdvertisingOptOutShouldReturnExpectedResult() { @Test public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getTargetedAdvertisingOptOutNotice()).willReturn(1); + given(usNat.getTargetedAdvertisingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getTargetedAdvertisingOptOutNotice()).isEqualTo(1); @@ -133,7 +133,7 @@ public void getTargetedAdvertisingOptOutNoticeShouldReturnExpectedResult() { @Test public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getSensitiveDataLimitUseNotice()).willReturn(1); + given(usNat.getSensitiveDataLimitUseNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataLimitUseNotice()).isEqualTo(1); @@ -143,7 +143,7 @@ public void getSensitiveDataLimitUseNoticeShouldReturnExpectedResult() { public void getSensitiveDataProcessingShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usNatV1.getSensitiveDataProcessing()).willReturn(data); + given(usNat.getSensitiveDataProcessing()).willReturn(data); // when and then assertThat(gppReader.getSensitiveDataProcessing()).isSameAs(data); @@ -152,7 +152,7 @@ public void getSensitiveDataProcessingShouldReturnExpectedResult() { @Test public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { // given - given(usNatV1.getSensitiveDataProcessingOptOutNotice()).willReturn(1); + given(usNat.getSensitiveDataProcessingOptOutNotice()).willReturn(1); // when and then assertThat(gppReader.getSensitiveDataProcessingOptOutNotice()).isEqualTo(1); @@ -162,7 +162,7 @@ public void getSensitiveDataProcessingOptOutNoticeShouldReturnExpectedResult() { public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { // given final List data = Collections.emptyList(); - given(usNatV1.getKnownChildSensitiveDataConsents()).willReturn(data); + given(usNat.getKnownChildSensitiveDataConsents()).willReturn(data); // when and then assertThat(gppReader.getKnownChildSensitiveDataConsents()).isSameAs(data); @@ -171,7 +171,7 @@ public void getKnownChildSensitiveDataConsentsShouldReturnExpectedResult() { @Test public void getPersonalDataConsentsShouldReturnExpectedResult() { // given - given(usNatV1.getPersonalDataConsents()).willReturn(1); + given(usNat.getPersonalDataConsents()).willReturn(1); // when and then assertThat(gppReader.getPersonalDataConsents()).isEqualTo(1); @@ -180,7 +180,7 @@ public void getPersonalDataConsentsShouldReturnExpectedResult() { @Test public void getMspaCoveredTransactionShouldReturnExpectedResult() { // given - given(usNatV1.getMspaCoveredTransaction()).willReturn(1); + given(usNat.getMspaCoveredTransaction()).willReturn(1); // when and then assertThat(gppReader.getMspaCoveredTransaction()).isEqualTo(1); @@ -189,7 +189,7 @@ public void getMspaCoveredTransactionShouldReturnExpectedResult() { @Test public void getMspaServiceProviderModeShouldReturnExpectedResult() { // given - given(usNatV1.getMspaServiceProviderMode()).willReturn(1); + given(usNat.getMspaServiceProviderMode()).willReturn(1); // when and then assertThat(gppReader.getMspaServiceProviderMode()).isEqualTo(1); @@ -198,7 +198,7 @@ public void getMspaServiceProviderModeShouldReturnExpectedResult() { @Test public void getMspaOptOutOptionModeShouldReturnExpectedResult() { // given - given(usNatV1.getMspaOptOutOptionMode()).willReturn(1); + given(usNat.getMspaOptOutOptionMode()).willReturn(1); // when and then assertThat(gppReader.getMspaOptOutOptionMode()).isEqualTo(1);