Skip to content

Commit d8c09fc

Browse files
committed
Removed OptoutCheckPolicy, its references and modified related tests
1 parent 75ec479 commit d8c09fc

9 files changed

Lines changed: 37 additions & 440 deletions

File tree

src/main/java/com/uid2/operator/model/IdentityRequest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
public final class IdentityRequest {
44
public final PublisherIdentity publisherIdentity;
55
public final UserIdentity userIdentity;
6-
public final OptoutCheckPolicy optoutCheckPolicy;
76
public final IdentityEnvironment identityEnvironment;
87

98
public IdentityRequest(
109
PublisherIdentity publisherIdentity,
1110
UserIdentity userIdentity,
12-
OptoutCheckPolicy tokenGeneratePolicy,
1311
IdentityEnvironment identityEnvironment) {
1412
this.publisherIdentity = publisherIdentity;
1513
this.userIdentity = userIdentity;
16-
this.optoutCheckPolicy = tokenGeneratePolicy;
1714
this.identityEnvironment = identityEnvironment;
1815
}
19-
20-
public boolean shouldCheckOptOut() {
21-
return optoutCheckPolicy.equals(OptoutCheckPolicy.RespectOptOut);
22-
}
2316
}

src/main/java/com/uid2/operator/model/MapRequest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,15 @@
44

55
public final class MapRequest {
66
public final UserIdentity userIdentity;
7-
public final OptoutCheckPolicy optoutCheckPolicy;
87
public final Instant asOf;
98
public final IdentityEnvironment identityEnvironment;
109

1110
public MapRequest(
1211
UserIdentity userIdentity,
13-
OptoutCheckPolicy optoutCheckPolicy,
1412
Instant asOf,
1513
IdentityEnvironment identityEnvironment) {
1614
this.userIdentity = userIdentity;
17-
this.optoutCheckPolicy = optoutCheckPolicy;
1815
this.asOf = asOf;
1916
this.identityEnvironment = identityEnvironment;
2017
}
21-
22-
public boolean shouldCheckOptOut() {
23-
return optoutCheckPolicy.equals(OptoutCheckPolicy.RespectOptOut);
24-
}
2518
}

src/main/java/com/uid2/operator/model/OptoutCheckPolicy.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/java/com/uid2/operator/service/UIDOperatorService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public IdentityTokens generateIdentity(IdentityRequest request, Duration refresh
102102
request.userIdentity.identityScope, request.userIdentity.identityType, firstLevelHash, request.userIdentity.privacyBits,
103103
request.userIdentity.establishedAt, request.userIdentity.refreshedAt);
104104

105-
if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
105+
if (getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
106106
return IdentityTokens.LogoutToken;
107107
} else {
108108
return this.generateIdentity(request.publisherIdentity, firstLevelHashIdentity, refreshIdentityAfter, refreshExpiresAfter, identityExpiresAfter, request.identityEnvironment);
@@ -153,7 +153,7 @@ public RefreshResponse refreshIdentity(RefreshToken token, Duration refreshIdent
153153
@Override
154154
public MappedIdentity mapIdentity(MapRequest request) {
155155
final UserIdentity firstLevelHashIdentity = getFirstLevelHashIdentity(request.userIdentity, request.asOf);
156-
if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
156+
if (getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
157157
return MappedIdentity.LogoutIdentity;
158158
} else {
159159
return getMappedIdentity(firstLevelHashIdentity, request.asOf, request.identityEnvironment);

src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ public class UIDOperatorVerticle extends AbstractVerticle {
111111
private final Map<String, DistributionSummary> _identityMapMetricSummaries = new HashMap<>();
112112
private final Map<Tuple.Tuple2<String, Boolean>, DistributionSummary> _refreshDurationMetricSummaries = new HashMap<>();
113113
private final Map<Tuple.Tuple3<String, Boolean, Boolean>, Counter> _advertisingTokenExpiryStatus = new HashMap<>();
114-
private final Map<Tuple.Tuple3<String, OptoutCheckPolicy, String>, Counter> _tokenGeneratePolicyCounters = new HashMap<>();
115114
private final Map<String, Counter> _tokenGenerateTCFUsage = new HashMap<>();
116115
private final Map<String, Tuple.Tuple2<Counter, Counter>> _identityMapUnmappedIdentifiers = new HashMap<>();
117116
private final Map<String, Counter> _identityMapRequestWithUnmapped = new HashMap<>();
@@ -486,7 +485,6 @@ private void handleClientSideTokenGenerateImpl(RoutingContext rc) throws NoSuchA
486485
new IdentityRequest(
487486
new PublisherIdentity(clientSideKeypair.getSiteId(), 0, 0),
488487
input.toUserIdentity(this.identityScope, privacyBits.getAsInt(), Instant.now()),
489-
OptoutCheckPolicy.RespectOptOut,
490488
identityEnvironment
491489
),
492490
refreshIdentityAfter,
@@ -947,7 +945,6 @@ private void handleTokenGenerateV2(RoutingContext rc) {
947945
new IdentityRequest(
948946
new PublisherIdentity(siteId, 0, 0),
949947
input.toUserIdentity(this.identityScope, 1, Instant.now()),
950-
OptoutCheckPolicy.respectOptOut(),
951948
identityEnvironment),
952949
refreshIdentityAfter,
953950
refreshExpiresAfter,
@@ -1099,7 +1096,6 @@ private JsonObject handleIdentityMapCommon(RoutingContext rc, InputUtil.InputVal
10991096
final MappedIdentity mappedIdentity = idService.mapIdentity(
11001097
new MapRequest(
11011098
input.toUserIdentity(this.identityScope, 0, now),
1102-
OptoutCheckPolicy.respectOptOut(),
11031099
now,
11041100
env));
11051101

@@ -1154,7 +1150,6 @@ private JsonObject processIdentityMapV3Response(RoutingContext rc, Map<String, I
11541150
final MappedIdentity mappedId = idService.mapIdentity(
11551151
new MapRequest(
11561152
rawId.toUserIdentity(this.identityScope, 0, now),
1157-
OptoutCheckPolicy.respectOptOut(),
11581153
now,
11591154
env));
11601155

0 commit comments

Comments
 (0)