Module Execution: Add Property to Require Account Config

prebid · Oct 24, 2024 · c6d6428 · c6d6428
1 parent 4f6ee8e
commit c6d6428
Show file tree

Hide file tree

Showing 31 changed files with 226 additions and 285 deletions.
diff --git a/...server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java b/...server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java
@@ -18,9 +18,9 @@
 import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsScanResult;
 import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsScanner;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues;
-import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
 import org.prebid.server.hooks.v1.bidder.AllProcessedBidResponsesHook;

diff --git a/...org/prebid/server/hooks/modules/com/confiant/adquality/v1/model/InvocationResultImpl.java b/...org/prebid/server/hooks/modules/com/confiant/adquality/v1/model/InvocationResultImpl.java
diff --git a/...ooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java b/...ooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java
@@ -2,10 +2,10 @@
 
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.boundary.CollectedEvidence;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.ModuleContext;
-import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationContext;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.entrypoint.EntrypointHook;
 import org.prebid.server.hooks.v1.entrypoint.EntrypointPayload;

diff --git a/...dules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java b/...dules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java
@@ -13,9 +13,9 @@
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.core.EnrichmentResult;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.core.SecureHeadersRetriever;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.ModuleContext;
-import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
 import org.prebid.server.hooks.v1.auction.AuctionRequestPayload;

diff --git a/...g/prebid/server/hooks/modules/fiftyone/devicedetection/v1/model/InvocationResultImpl.java b/...g/prebid/server/hooks/modules/fiftyone/devicedetection/v1/model/InvocationResultImpl.java
diff --git a/...ava/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHook.java b/...ava/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHook.java
@@ -11,9 +11,9 @@
 import org.prebid.server.hooks.modules.ortb2.blocking.core.model.ExecutionResult;
 import org.prebid.server.hooks.modules.ortb2.blocking.model.ModuleContext;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderRequestPayloadImpl;
-import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.bidder.BidderInvocationContext;
 import org.prebid.server.hooks.v1.bidder.BidderRequestHook;

diff --git a/...org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHook.java b/...org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHook.java
@@ -13,13 +13,13 @@
 import org.prebid.server.hooks.modules.ortb2.blocking.core.model.ExecutionResult;
 import org.prebid.server.hooks.modules.ortb2.blocking.model.ModuleContext;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderResponsePayloadImpl;
-import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.ActivityImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.AppliedToImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.ResultImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.TagsImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.analytics.Result;
 import org.prebid.server.hooks.v1.analytics.Tags;

diff --git a/...in/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/InvocationResultImpl.java b/...in/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/InvocationResultImpl.java
diff --git a/...org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java b/...org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java
@@ -28,9 +28,9 @@
 import org.prebid.server.hooks.modules.ortb2.blocking.model.ModuleContext;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderInvocationContextImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderRequestPayloadImpl;
-import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.PayloadUpdate;
 import org.prebid.server.hooks.v1.bidder.BidderRequestPayload;

diff --git a/...prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java b/...prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java
@@ -23,13 +23,13 @@
 import org.prebid.server.hooks.modules.ortb2.blocking.model.ModuleContext;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderInvocationContextImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.BidderResponsePayloadImpl;
-import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.ActivityImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.AppliedToImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.ResultImpl;
 import org.prebid.server.hooks.modules.ortb2.blocking.v1.model.analytics.TagsImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.PayloadUpdate;
 import org.prebid.server.hooks.v1.bidder.BidderResponsePayload;

diff --git a/...oks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java b/...oks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java
@@ -11,9 +11,9 @@
 import org.prebid.server.hooks.modules.pb.response.correction.core.ResponseCorrectionProvider;
 import org.prebid.server.hooks.modules.pb.response.correction.core.config.model.Config;
 import org.prebid.server.hooks.modules.pb.response.correction.core.correction.Correction;
-import org.prebid.server.hooks.modules.pb.response.correction.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
 import org.prebid.server.hooks.v1.bidder.AllProcessedBidResponsesHook;
@@ -57,7 +57,7 @@ public Future<InvocationResult<AllProcessedBidResponsesPayload>> call(AllProcess
             return noAction();
         }
 
-        final InvocationResult<AllProcessedBidResponsesPayload> invocationResult = InvocationResultImpl.builder()
+        final InvocationResult<AllProcessedBidResponsesPayload> invocationResult = InvocationResultImpl.<AllProcessedBidResponsesPayload>builder()
                 .status(InvocationStatus.success)
                 .action(InvocationAction.update)
                 .payloadUpdate(initialPayload -> AllProcessedBidResponsesPayloadImpl.of(
@@ -84,15 +84,15 @@ private static List<BidderResponse> applyCorrections(List<BidderResponse> bidder
     }
 
     private Future<InvocationResult<AllProcessedBidResponsesPayload>> failure(String message) {
-        return Future.succeededFuture(InvocationResultImpl.builder()
+        return Future.succeededFuture(InvocationResultImpl.<AllProcessedBidResponsesPayload>builder()
                 .status(InvocationStatus.failure)
                 .message(message)
                 .action(InvocationAction.no_action)
                 .build());
     }
 
     private static Future<InvocationResult<AllProcessedBidResponsesPayload>> noAction() {
-        return Future.succeededFuture(InvocationResultImpl.builder()
+        return Future.succeededFuture(InvocationResultImpl.<AllProcessedBidResponsesPayload>builder()
                 .status(InvocationStatus.success)
                 .action(InvocationAction.no_action)
                 .build());

diff --git a/...org/prebid/server/hooks/modules/pb/response/correction/v1/model/InvocationResultImpl.java b/...org/prebid/server/hooks/modules/pb/response/correction/v1/model/InvocationResultImpl.java
diff --git a/...r/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHook.java b/...r/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHook.java
@@ -12,13 +12,13 @@
 import org.prebid.server.hooks.modules.pb.richmedia.filter.model.AnalyticsResult;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.model.MraidFilterResult;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.model.PbRichMediaFilterProperties;
-import org.prebid.server.hooks.modules.pb.richmedia.filter.v1.model.InvocationResultImpl;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.v1.model.analytics.ActivityImpl;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.v1.model.analytics.AppliedToImpl;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.v1.model.analytics.ResultImpl;
 import org.prebid.server.hooks.modules.pb.richmedia.filter.v1.model.analytics.TagsImpl;
 import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
 import org.prebid.server.hooks.v1.InvocationStatus;
 import org.prebid.server.hooks.v1.analytics.Result;
 import org.prebid.server.hooks.v1.analytics.Tags;

diff --git a/src/main/java/org/prebid/server/hooks/execution/GroupExecutor.java b/src/main/java/org/prebid/server/hooks/execution/GroupExecutor.java
@@ -1,5 +1,6 @@
 package org.prebid.server.hooks.execution;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
@@ -8,8 +9,12 @@
 import org.prebid.server.hooks.execution.model.HookExecutionContext;
 import org.prebid.server.hooks.execution.model.HookId;
 import org.prebid.server.hooks.v1.Hook;
+import org.prebid.server.hooks.v1.InvocationAction;
 import org.prebid.server.hooks.v1.InvocationContext;
 import org.prebid.server.hooks.v1.InvocationResult;
+import org.prebid.server.hooks.v1.InvocationResultImpl;
+import org.prebid.server.hooks.v1.InvocationStatus;
+import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
 import org.prebid.server.log.ConditionalLogger;
 import org.prebid.server.log.LoggerFactory;
 
@@ -25,6 +30,7 @@ class GroupExecutor<PAYLOAD, CONTEXT extends InvocationContext> {
 
     private final Vertx vertx;
     private final Clock clock;
+    private final boolean isConfigToInvokeRequired;
 
     private ExecutionGroup group;
     private PAYLOAD initialPayload;
@@ -33,16 +39,18 @@ class GroupExecutor<PAYLOAD, CONTEXT extends InvocationContext> {
     private HookExecutionContext hookExecutionContext;
     private boolean rejectAllowed;
 
-    private GroupExecutor(Vertx vertx, Clock clock) {
+    private GroupExecutor(Vertx vertx, Clock clock, boolean isConfigToInvokeRequired) {
         this.vertx = vertx;
         this.clock = clock;
+        this.isConfigToInvokeRequired = isConfigToInvokeRequired;
     }
 
     public static <PAYLOAD, CONTEXT extends InvocationContext> GroupExecutor<PAYLOAD, CONTEXT> create(
             Vertx vertx,
-            Clock clock) {
+            Clock clock,
+            boolean isConfigToInvokeRequired) {
 
-        return new GroupExecutor<>(vertx, clock);
+        return new GroupExecutor<>(vertx, clock, isConfigToInvokeRequired);
     }
 
     public GroupExecutor<PAYLOAD, CONTEXT> withGroup(ExecutionGroup group) {
@@ -107,11 +115,19 @@ private Future<InvocationResult<PAYLOAD>> executeHook(
             return Future.failedFuture(new FailedException("Hook implementation does not exist or disabled"));
         }
 
-        return executeWithTimeout(
-                () -> hook.call(
-                        groupResult.payload(),
-                        invocationContextProvider.apply(timeout, hookId, moduleContextFor(hookId))),
-                timeout);
+        final CONTEXT invocationContext = invocationContextProvider.apply(timeout, hookId, moduleContextFor(hookId));
+
+        if (isConfigToInvokeRequired && invocationContext instanceof AuctionInvocationContext) {
+            final ObjectNode accountConfig = ((AuctionInvocationContext) invocationContext).accountConfig();
+            if (accountConfig == null || accountConfig.isNull()) {
+                return Future.succeededFuture(InvocationResultImpl.<PAYLOAD>builder()
+                        .status(InvocationStatus.success)
+                        .action(InvocationAction.no_action)
+                        .build());
+            }
+        }
+
+        return executeWithTimeout(() -> hook.call(groupResult.payload(), invocationContext), timeout);
     }
 
     private <T> Future<T> executeWithTimeout(Supplier<Future<T>> action, Long timeout) {