Removed OptoutCheckPolicy, its references and modified related tests

Author: RSam25

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

@@ -3,21 +3,14 @@
 public final class IdentityRequest {
     public final PublisherIdentity publisherIdentity;
     public final UserIdentity userIdentity;
-    public final OptoutCheckPolicy optoutCheckPolicy;
     public final IdentityEnvironment identityEnvironment;
 
     public IdentityRequest(
             PublisherIdentity publisherIdentity,
             UserIdentity userIdentity,
-            OptoutCheckPolicy tokenGeneratePolicy,
             IdentityEnvironment identityEnvironment) {
         this.publisherIdentity = publisherIdentity;
         this.userIdentity = userIdentity;
-        this.optoutCheckPolicy = tokenGeneratePolicy;
         this.identityEnvironment = identityEnvironment;
     }
-
-    public boolean shouldCheckOptOut() {
-        return optoutCheckPolicy.equals(OptoutCheckPolicy.RespectOptOut);
-    }
 }

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

@@ -4,22 +4,15 @@
 
 public final class MapRequest {
     public final UserIdentity userIdentity;
-    public final OptoutCheckPolicy optoutCheckPolicy;
     public final Instant asOf;
     public final IdentityEnvironment identityEnvironment;
 
     public MapRequest(
             UserIdentity userIdentity,
-            OptoutCheckPolicy optoutCheckPolicy,
             Instant asOf,
             IdentityEnvironment identityEnvironment) {
         this.userIdentity = userIdentity;
-        this.optoutCheckPolicy = optoutCheckPolicy;
         this.asOf = asOf;
         this.identityEnvironment = identityEnvironment;
     }
-
-    public boolean shouldCheckOptOut() {
-        return optoutCheckPolicy.equals(OptoutCheckPolicy.RespectOptOut);
-    }
 }

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

@@ -102,7 +102,7 @@ public IdentityTokens generateIdentity(IdentityRequest request, Duration refresh
                 request.userIdentity.identityScope, request.userIdentity.identityType, firstLevelHash, request.userIdentity.privacyBits,
                 request.userIdentity.establishedAt, request.userIdentity.refreshedAt);
 
-        if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
+        if (getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
             return IdentityTokens.LogoutToken;
         } else {
             return this.generateIdentity(request.publisherIdentity, firstLevelHashIdentity, refreshIdentityAfter, refreshExpiresAfter, identityExpiresAfter, request.identityEnvironment);
@@ -153,7 +153,7 @@ public RefreshResponse refreshIdentity(RefreshToken token, Duration refreshIdent
     @Override
     public MappedIdentity mapIdentity(MapRequest request) {
         final UserIdentity firstLevelHashIdentity = getFirstLevelHashIdentity(request.userIdentity, request.asOf);
-        if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
+        if (getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
             return MappedIdentity.LogoutIdentity;
         } else {
             return getMappedIdentity(firstLevelHashIdentity, request.asOf, request.identityEnvironment);

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

@@ -111,7 +111,6 @@ public class UIDOperatorVerticle extends AbstractVerticle {
     private final Map<String, DistributionSummary> _identityMapMetricSummaries = new HashMap<>();
     private final Map<Tuple.Tuple2<String, Boolean>, DistributionSummary> _refreshDurationMetricSummaries = new HashMap<>();
     private final Map<Tuple.Tuple3<String, Boolean, Boolean>, Counter> _advertisingTokenExpiryStatus = new HashMap<>();
-    private final Map<Tuple.Tuple3<String, OptoutCheckPolicy, String>, Counter> _tokenGeneratePolicyCounters = new HashMap<>();
     private final Map<String, Counter> _tokenGenerateTCFUsage = new HashMap<>();
     private final Map<String, Tuple.Tuple2<Counter, Counter>> _identityMapUnmappedIdentifiers = new HashMap<>();
     private final Map<String, Counter> _identityMapRequestWithUnmapped = new HashMap<>();
@@ -486,7 +485,6 @@ private void handleClientSideTokenGenerateImpl(RoutingContext rc) throws NoSuchA
                     new IdentityRequest(
                             new PublisherIdentity(clientSideKeypair.getSiteId(), 0, 0),
                             input.toUserIdentity(this.identityScope, privacyBits.getAsInt(), Instant.now()),
-                            OptoutCheckPolicy.RespectOptOut,
                             identityEnvironment
                     ),
                     refreshIdentityAfter,
@@ -947,7 +945,6 @@ private void handleTokenGenerateV2(RoutingContext rc) {
                         new IdentityRequest(
                                 new PublisherIdentity(siteId, 0, 0),
                                 input.toUserIdentity(this.identityScope, 1, Instant.now()),
-                                OptoutCheckPolicy.respectOptOut(),
                                 identityEnvironment),
                         refreshIdentityAfter,
                         refreshExpiresAfter,
@@ -1099,7 +1096,6 @@ private JsonObject handleIdentityMapCommon(RoutingContext rc, InputUtil.InputVal
                 final MappedIdentity mappedIdentity = idService.mapIdentity(
                         new MapRequest(
                                 input.toUserIdentity(this.identityScope, 0, now),
-                                OptoutCheckPolicy.respectOptOut(),
                                 now,
                                 env));
 
@@ -1154,7 +1150,6 @@ private JsonObject processIdentityMapV3Response(RoutingContext rc, Map<String, I
                     final MappedIdentity mappedId = idService.mapIdentity(
                             new MapRequest(
                                     rawId.toUserIdentity(this.identityScope, 0, now),
-                                    OptoutCheckPolicy.respectOptOut(),
                                     now,
                                     env));