Skip to content

Dependencies: bump IAB GPP library #3870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CTMBNara merged 2 commits into from
Apr 1, 2025
Merged

Dependencies: bump IAB GPP library #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fcb5ee
Bump GPP version
Net-burst Mar 27, 2025
245128e
Groovy tests import fixes
Net-burst Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<metrics-influxdb.version>1.2.2</metrics-influxdb.version>
<vertx.prometheus.version>0.16.0</vertx.prometheus.version>
<iabtcf.version>2.0.10</iabtcf.version>
<gpp-encoder.version>3.2.0</gpp-encoder.version>
<gpp-encoder.version>3.2.3</gpp-encoder.version>
<maxmind-client.version>2.17.0</maxmind-client.version>
<protobuf.version>3.25.5</protobuf.version>
<protoc.version>${protobuf.version}</protoc.version>
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/org/prebid/server/activity/infrastructure/privacy/PrivacySection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<PrivacySection> US_PRIVACY_SECTIONS = Set.of(
NATIONAL,
Expand Down
34 changes: 17 additions & 17 deletions ...id/server/activity/infrastructure/privacy/uscustomlogic/reader/USCaliforniaGppReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
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;

import java.util.List;

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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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<Integer> getSensitiveDataProcessing() {
return ObjectUtil.getIfNotNull(consent, UsCaV1::getSensitiveDataProcessing);
return ObjectUtil.getIfNotNull(consent, UsCa::getSensitiveDataProcessing);
}

@Override
Expand All @@ -87,26 +87,26 @@ public Integer getSensitiveDataProcessingOptOutNotice() {

@Override
public List<Integer> 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);
}
}
32 changes: 16 additions & 16 deletions ...ebid/server/activity/infrastructure/privacy/uscustomlogic/reader/USColoradoGppReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
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;

import java.util.List;

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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -78,7 +78,7 @@ public Integer getSensitiveDataLimitUseNotice() {

@Override
public List<Integer> getSensitiveDataProcessing() {
return ObjectUtil.getIfNotNull(consent, UsCoV1::getSensitiveDataProcessing);
return ObjectUtil.getIfNotNull(consent, UsCo::getSensitiveDataProcessing);
}

@Override
Expand All @@ -88,7 +88,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() {

@Override
public Integer getKnownChildSensitiveDataConsents() {
return ObjectUtil.getIfNotNull(consent, UsCoV1::getKnownChildSensitiveDataConsents);
return ObjectUtil.getIfNotNull(consent, UsCo::getKnownChildSensitiveDataConsents);
}

@Override
Expand All @@ -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);
}
}
32 changes: 16 additions & 16 deletions ...d/server/activity/infrastructure/privacy/uscustomlogic/reader/USConnecticutGppReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
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;

import java.util.List;

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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -77,7 +77,7 @@ public Integer getSensitiveDataLimitUseNotice() {

@Override
public List<Integer> getSensitiveDataProcessing() {
return ObjectUtil.getIfNotNull(consent, UsCtV1::getSensitiveDataProcessing);
return ObjectUtil.getIfNotNull(consent, UsCt::getSensitiveDataProcessing);
}

@Override
Expand All @@ -87,7 +87,7 @@ public Integer getSensitiveDataProcessingOptOutNotice() {

@Override
public List<Integer> getKnownChildSensitiveDataConsents() {
return ObjectUtil.getIfNotNull(consent, UsCtV1::getKnownChildSensitiveDataConsents);
return ObjectUtil.getIfNotNull(consent, UsCt::getKnownChildSensitiveDataConsents);
}

@Override
Expand All @@ -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);
}
}
Loading
Loading