Skip to content
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

Remove integration after transition period #1795

Merged
merged 1 commit into from
Mar 30, 2022
Merged

Remove integration after transition period #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions docs/application-settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ example:
"privacy": {
"ccpa": {
"enabled": true,
"integration-enabled": {
"channel-enabled": {
"web": true,
"amp": false,
"app": true,
Expand All @@ -282,7 +282,7 @@ example:
},
"gdpr": {
"enabled": true,
"integration-enabled": {
"channel-enabled": {
"video": true,
"web": true,
"app": true,
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/prebid/server/settings/model/AccountCcpaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.prebid.server.settings.model;

import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -17,6 +16,5 @@ public class AccountCcpaConfig {
Boolean enabled;

@JsonProperty("channel-enabled")
@JsonAlias("integration-enabled") // TODO: remove integration after transition period
EnabledForRequestType enabledForRequestType;
}
2 changes: 0 additions & 2 deletions src/main/java/org/prebid/server/settings/model/AccountGdprConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.prebid.server.settings.model;

import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Value;
Expand All @@ -15,7 +14,6 @@ public class AccountGdprConfig {
Boolean enabled;

@JsonProperty("channel-enabled")
@JsonAlias("integration-enabled") // TODO: remove integration after transition period
EnabledForRequestType enabledForRequestType;

Purposes purposes;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/prebid/server/settings/EnrichingApplicationSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void getAccountByIdShouldMergeAccountWithDefaultAccount() {
// given
enrichingApplicationSettings = new EnrichingApplicationSettings(
"{\"auction\": {\"banner-cache-ttl\": 100},"
+ "\"privacy\": {\"gdpr\": {\"enabled\": true, \"integration-enabled\": {\"web\": false}}}}",
+ "\"privacy\": {\"gdpr\": {\"enabled\": true, \"channel-enabled\": {\"web\": false}}}}",
delegate,
jsonMerger);

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/prebid/server/settings/FileApplicationSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void getAccountByIdShouldReturnPresentAccount() {
+ "privacy: {"
+ "gdpr: {"
+ "enabled: true,"
+ "integration-enabled: {"
+ "channel-enabled: {"
+ "amp: true,"
+ "web: true,"
+ "video: true,"
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/prebid/server/settings/JdbcApplicationSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public static void beforeClass() throws SQLException {
+ "\"privacy\": {"
+ "\"gdpr\": {"
+ "\"enabled\": true,"
+ "\"integration-enabled\": {\"amp\": true, \"app\": true, \"video\": true, \"web\": true}"
+ "\"channel-enabled\": {\"amp\": true, \"app\": true, \"video\": true, \"web\": true}"
+ "}"
+ "},"
+ "\"metrics\": {\"verbosity-level\": \"detailed\"},"
Expand Down