Merge remote-tracking branch 'refs/remotes/origin/master' into rubicon-bidder-meta-seat

Author: AntoxaAntoxic

.github/pull_request_template.md

@@ -1,40 +1,34 @@
 ### 🔧 Type of changes
 - [ ] new bid adapter
-- [ ] update bid adapter
+- [ ] bid adapter update
 - [ ] new feature
 - [ ] new analytics adapter
 - [ ] new module
+- [ ] module update
 - [ ] bugfix
 - [ ] documentation
 - [ ] configuration
+- [ ] dependency update
 - [ ] tech debt (test coverage, refactorings, etc.)
 
 ### ✨ What's the context?
-
-What's the context for the changes? Are there any
-
+What's the context for the changes?
 
 ### 🧠 Rationale behind the change
-
 Why did you choose to make these changes? Were there any trade-offs you had to consider?
 
-
 ### 🔎 New Bid Adapter Checklist
 - [ ] verify email contact works
-- [ ] NO fully dynamic hosts
+- [ ] NO fully dynamic hostnames
 - [ ] geographic host parameters are NOT required
-- [ ] NO direct use of HTTP is prohibited - *implement an existing Bidder interface that will do all the job*
+- [ ] direct use of HTTP is prohibited - *implement an existing Bidder interface that will do all the job*
 - [ ] if the ORTB is just forwarded to the endpoint, use the generic adapter - *define the new adapter as the alias of the generic adapter*
 - [ ] cover an adapter configuration with an integration test
 
-
 ### 🧪 Test plan
-
 How do you know the changes are safe to ship to production?
 
-
 ### 🏎 Quality check
-
 - [ ] Are your changes following [our code style guidelines](https://github.com/prebid/prebid-server-java/blob/master/docs/developers/code-style.md)?
 - [ ] Are there any breaking changes in your code?
 - [ ] Does your test coverage exceed 90%?

docs/application-settings.md

@@ -101,6 +101,7 @@ Keep in mind following restrictions:
 - `cookie-sync.pri` - a list of prioritized bidder codes
 - `cookie-sync.coop-sync.default` - if the "coopSync" value isn't specified in the `/cookie_sync` request, use this
 - `hooks` - configuration for Prebid Server Modules. For further details, see: https://docs.prebid.org/prebid-server/pbs-modules/index.html#2-define-an-execution-plan
+- `hooks.admin.module-execution` - a key-value map, where a key is a module name and a value is a boolean, that defines whether modules hooks should/should not be always executed; if the module is not specified it is executed by default when it's present in the execution plan
 - `settings.geo-lookup` - enables geo lookup for account if true. Defaults to false.
 
 Here are the definitions of the "purposes" that can be defined in the GDPR setting configurations:

docs/config-app.md

@@ -278,6 +278,7 @@ See [metrics documentation](metrics.md) for complete list of metrics submitted a
 for particular publisher account. Overrides `cache.banner-ttl-seconds` property.
 - `cache.account.<ACCOUNT>.video-ttl-seconds` - how long (in seconds) video creative will be available in Cache Service 
 for particular publisher account. Overrides `cache.video-ttl-seconds` property.
+- `cache.default-ttl-seconds.{banner, video, audio, native}` - a default value how long (in seconds) a creative of the specific type will be available in Cache Service
 
 ## Application settings (account configuration, stored ad unit configurations, stored requests)
 Preconfigured application settings can be obtained from multiple data sources consequently: 
@@ -439,6 +440,10 @@ If not defined in config all other Health Checkers would be disabled and endpoin
 - `analytics.pubstack.buffers.count` - threshold in events count for buffer to send events
 - `analytics.pubstack.buffers.report-ttl-ms` - max period between two reports.
 
+## Modules
+- `hooks.admin.module-execution` - a key-value map, where a key is a module name and a value is a boolean, that defines whether modules hooks should/should not be always executed; if the module is not specified it is executed by default when it's present in the execution plan
+- `settings.modules.require-config-to-invoke` - when enabled it requires a runtime config to exist for a module.
+
 ## Debugging
 - `debug.override-token` - special string token for overriding Prebid Server account and/or adapter debug information presence in the auction response.
 

extra/bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.17.0-SNAPSHOT</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 

extra/modules/confiant-ad-quality/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>confiant-ad-quality</artifactId>

extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java

@@ -3,10 +3,10 @@
 import com.iab.openrtb.response.Bid;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.bidder.model.BidderBid;
-import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.analytics.ActivityImpl;
-import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.analytics.AppliedToImpl;
-import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.analytics.ResultImpl;
-import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.analytics.TagsImpl;
+import org.prebid.server.hooks.execution.v1.analytics.ActivityImpl;
+import org.prebid.server.hooks.execution.v1.analytics.AppliedToImpl;
+import org.prebid.server.hooks.execution.v1.analytics.ResultImpl;
+import org.prebid.server.hooks.execution.v1.analytics.TagsImpl;
 import org.prebid.server.hooks.v1.analytics.AppliedTo;
 import org.prebid.server.hooks.v1.analytics.Result;
 import org.prebid.server.hooks.v1.analytics.Tags;

extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java

@@ -20,7 +20,7 @@
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues;
 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.execution.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;