From 3163a3230be1ef9d193a87e450b7637adeffd240 Mon Sep 17 00:00:00 2001 From: antonbabak Date: Fri, 8 Nov 2024 11:02:29 +0100 Subject: [PATCH] Support Default Bids Cache TTL --- .../server/auction/BidResponseCreator.java | 54 +- .../prebid/server/auction/model/BidInfo.java | 2 +- .../prebid/server/cache/CoreCacheService.java | 2 +- .../spring/config/ServiceConfiguration.java | 17 +- .../model/CacheDefaultTtlProperties.java | 15 + .../auction/BidResponseCreatorTest.java | 502 +++++++++++++++++- .../server/it/amp/test-cache-request.json | 6 +- .../cache/update/test-auction-response.json | 2 + .../test-auction-33across-response.json | 1 + .../aax/test-auction-aax-response.json | 1 + .../aceex/test-auction-aceex-response.json | 1 + .../test-auction-acuityads-response.json | 1 + .../test-auction-adelement-response.json | 1 + .../adf/test-auction-adf-response.json | 2 + .../test-auction-adgeneration-response.json | 1 + .../adhese/test-auction-adhese-response.json | 1 + .../test-auction-adkernel-response.json | 1 + .../test-adkerneladn-bid-response.json | 2 +- .../test-auction-adkerneladn-response.json | 1 + .../adman/test-auction-adman-response.json | 1 + .../test-auction-admatic-response.json | 1 + .../admixer/test-admixer-bid-response.json | 2 +- .../test-auction-admixer-response.json | 1 + .../test-auction-adnuntius-response.json | 1 + .../test-auction-adocean-response.json | 1 + .../test-adoppler-bid-response-1.json | 2 +- .../test-auction-adoppler-response.json | 1 + .../adot/test-auction-adot-response.json | 3 +- .../adpone/test-adpone-bid-response.json | 2 +- .../adpone/test-auction-adpone-response.json | 1 + .../test-auction-adprime-response.json | 1 + .../test-auction-adquery-response.json | 1 + .../adrino/test-auction-adrino-response.json | 1 + .../test-auction-adsyield-response.json | 1 + .../test-adtarget-bid-response-1.json | 2 +- .../test-auction-adtarget-response.json | 1 + .../test-adtelligent-bid-response.json | 2 +- .../test-auction-adtelligent-response.json | 1 + .../test-auction-adtonos-response.json | 1 + .../test-auction-adtrgtme-response.json | 1 + .../test-auction-advangelists-response.json | 1 + .../adview/test-auction-adview-response.json | 1 + .../adxcg/test-auction-adxcg-response.json | 1 + .../test-adyoulike-bid-response.json | 2 +- .../test-auction-adyoulike-response.json | 1 + .../aidem/test-auction-aidem-response.json | 1 + .../openrtb2/aja/test-aja-bid-response.json | 2 +- .../aja/test-auction-aja-response.json | 1 + .../algorix/test-algorix-bid-response.json | 2 +- .../test-auction-algorix-response.json | 1 + .../alkimi/test-auction-alkimi-response.json | 1 + .../amx/test-auction-amx-response.json | 1 + .../test-auction-apacdex-response.json | 1 + .../appnexus/test-video-cache-request.json | 9 +- .../appush/test-auction-appush-response.json | 1 + .../aso/test-auction-aso-response.json | 1 + ...test-auction-audiencenetwork-response.json | 1 + .../test-auction-automatad-response.json | 1 + .../avocet/test-auction-avocet-response.json | 1 + .../axis/test-auction-axis-response.json | 1 + .../axonix/test-auction-axonix-response.json | 1 + .../bcmint/test-auction-bcmint-response.json | 1 + .../test-auction-beachfront-response.json | 1 + .../test-auction-beintoo-response.json | 1 + .../test-auction-bematterfull-response.json | 1 + .../test-auction-between-response.json | 1 + .../test-auction-beyondmedia-response.json | 1 + .../test-auction-bidagency-response.json | 1 + .../test-auction-bidmachine-response.json | 1 + .../test-auction-bidmatic-response.json | 1 + .../test-auction-bidmyadz-response.json | 1 + .../test-auction-bidscube-response.json | 1 + .../test-auction-bidstack-response.json | 1 + .../bigoad/test-auction-bigoad-response.json | 1 + .../blasto/test-auction-blasto-response.json | 1 + .../bliink/test-auction-bliink-response.json | 1 + .../test-auction-bluesea-response.json | 1 + .../bmtm/test-auction-bmtm-response.json | 1 + .../test-auction-boldwin-response.json | 1 + .../brave/test-auction-brave-response.json | 1 + .../bwx/test-auction-bwx-response.json | 1 + ...est-auction-cadentaperturemx-response.json | 1 + .../ccx/test-auction-ccx-response.json | 1 + .../test-auction-cointraffic-response.json | 1 + .../test-auction-coinzilla-response.json | 1 + .../test-auction-colossusssp-response.json | 1 + .../test-auction-colossus-response.json | 1 + .../test-auction-compass-response.json | 1 + .../test-auction-concert-response.json | 1 + .../test-auction-connectad-response.json | 1 + .../test-auction-consumable-response.json | 1 + .../test-auction-copper6-response.json | 1 + .../test-auction-copper6ssp-response.json | 1 + .../test-auction-cpmstar-response.json | 1 + .../criteo/test-auction-criteo-response.json | 1 + .../test-auction-datablocks-response.json | 1 + .../test-auction-decenterads-response.json | 1 + .../test-auction-deepintent-response.json | 1 + .../test-auction-definemedia-response.json | 1 + .../test-auction-dianomi-response.json | 1 + .../test-auction-displayio-response.json | 1 + .../dmx/test-auction-dmx-response.json | 1 + .../test-auction-driftpixel-response.json | 1 + .../test-auction-dxkulture-response.json | 1 + .../test-auction-edge226-response.json | 1 + .../test-auction-embimedia-response.json | 1 + .../emtv/test-auction-emtv-response.json | 1 + .../test-auction-emxdigital-response.json | 1 + .../test-auction-eplanning-response.json | 1 + .../epom/test-auction-epom-response.json | 1 + .../alias/test-auction-epsilon-response.json | 1 + .../test-auction-epsilon-response.json | 1 + .../test-auction-escalax-response.json | 1 + .../test-auction-evolution-response.json | 1 + .../test-auction-felixads-response.json | 1 + .../test-auction-filmzie-response.json | 1 + .../test-auction-finative-response.json | 1 + .../flipp/test-auction-flipp-response.json | 1 + .../test-auction-freewheelssp-response.json | 1 + .../test-auction-frvradn-response.json | 1 + .../gamma/test-auction-gamma-response.json | 1 + .../test-auction-gamoshi-response.json | 1 + .../test-auction-generic-response.json | 1 + .../test-auction-generic-response.json | 1 + .../test-cache-generic-request.json | 3 +- .../test-auction-globalsun-response.json | 1 + .../test-auction-gothamads-response.json | 1 + .../test-auction-greedygame-response.json | 1 + .../grid/test-auction-grid-response.json | 1 + .../gumgum/test-auction-gumgum-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-huaweiads-auction-response.json | 1 + .../test-auction-iionads-response.json | 1 + .../imds/test-auction-imds-response.json | 1 + .../test-auction-impactify-response.json | 1 + .../test-auction-improvedigital-response.json | 1 + .../test-auction-indicue-response.json | 1 + .../infytv/test-auction-infytv-response.json | 1 + .../inmobi/test-auction-inmobi-response.json | 1 + ...st-auction-interactiveoffers-response.json | 3 +- .../test-auction-intertech-response.json | 1 + .../test-auction-invibes-response.json | 1 + .../iqx/test-auction-iqx-response.json | 1 + .../iqzone/test-auction-iqzone-response.json | 1 + .../openrtb2/ix/test-auction-ix-response.json | 1 + .../test-auction-jdpmedia-response.json | 1 + .../jixie/test-auction-jixie-response.json | 1 + .../kargo/test-auction-kargo-response.json | 1 + .../kayzen/test-auction-kayzen-response.json | 1 + .../kidoz/test-auction-kidoz-response.json | 1 + .../test-auction-kiviads-response.json | 1 + .../test-auction-krushmedia-response.json | 1 + .../test-auction-lemmaDigital-response.json | 1 + .../test-auction-liftoff-response.json | 1 + ...est-auction-limelightDigital-response.json | 1 + .../test-auction-lmkiviads-response.json | 1 + .../test-auction-lockerdome-response.json | 1 + .../logan/test-auction-logan-response.json | 1 + .../test-auction-logicad-response.json | 1 + .../loopme/test-auction-loopme-response.json | 1 + .../loyal/test-auction-loyal-response.json | 1 + .../test-auction-lunamedia-response.json | 1 + .../test-auction-mabidder-response.json | 1 + .../test-auction-madvertise-response.json | 1 + .../test-auction-magnite-response.json | 1 + .../test-auction-markapp-response.json | 1 + .../test-auction-marsmedia-response.json | 1 + .../test-auction-mediago-response.json | 1 + .../test-auction-medianet-response.json | 1 + .../test-auction-melozen-response.json | 1 + .../metax/test-auction-metax-response.json | 1 + .../mgid/test-auction-mgid-response.json | 1 + .../mgidx/test-auction-mgidx-response.json | 1 + .../test-auction-minutemedia-response.json | 1 + .../test-auction-missena-response.json | 1 + .../test-auction-mobfoxpb-response.json | 1 + .../test-auction-mobilefuse-response.json | 1 + .../test-auction-motorik-response.json | 1 + ...auction-generic-genericAlias-response.json | 8 +- ...st-cache-generic-genericAlias-request.json | 12 +- .../test-auction-nextmillennium-response.json | 1 + .../nobid/test-auction-nobid-response.json | 1 + .../oms/test-auction-oms-response.json | 1 + .../onetag/test-auction-onetag-response.json | 1 + .../test-auction-openweb-response.json | 1 + .../openx/test-auction-openx-response.json | 1 + .../test-auction-operaads-response.json | 1 + .../oraki/test-auction-oraki-response.json | 1 + .../test-auction-orbidder-response.json | 1 + .../test-auction-outbrain-response.json | 1 + .../ownadx/test-auction-ownadx-response.json | 1 + .../pangle/test-auction-pangle-response.json | 1 + .../pgam/test-auction-pgam-response.json | 1 + .../test-auction-pgamssp-response.json | 1 + .../test-auction-playdigo-response.json | 1 + .../test-auction-preciso-response.json | 1 + .../test-auction-pubmatic-response.json | 1 + .../test-auction-pubnative-response.json | 1 + .../test-auction-pubrise-response.json | 1 + .../test-auction-pulsepoint-response.json | 1 + .../pwbid/test-auction-pwbid-response.json | 1 + .../openrtb2/qt/test-auction-qt-response.json | 1 + .../test-auction-readpeak-response.json | 1 + ...test-auction-relevantdigital-response.json | 1 + .../test-auction-resetdigital-response.json | 1 + .../test-auction-revcontent-response.json | 1 + .../test-auction-richaudience-response.json | 1 + .../rise/test-auction-rise-response.json | 1 + .../roulax/test-auction-roulax-response.json | 1 + .../test-auction-rtbhouse-response.json | 1 + .../test-auction-rubicon-response.json | 1 + .../test-auction-salunamedia-response.json | 1 + .../test-auction-screencore-response.json | 1 + ...test-auction-seedingAlliance-response.json | 1 + .../test-auction-sharethrough-response.json | 1 + .../test-auction-silvermob-response.json | 1 + .../test-auction-silverpush-response.json | 1 + .../smaato/test-auction-smaato-response.json | 1 + .../test-auction-smartadserver-response.json | 1 + .../test-auction-smarthub-response.json | 1 + .../test-auction-smartrtb-response.json | 1 + .../smartx/test-auction-smartx-response.json | 1 + .../test-auction-smartyads-response.json | 1 + .../test-auction-smilewanted-response.json | 1 + .../test-auction-smrtconnect-response.json | 1 + .../sonobi/test-auction-sonobi-response.json | 1 + .../sovrn/test-auction-sovrn-response.json | 1 + .../test-auction-sovrnxsp-response.json | 1 + .../sspbc/test-auction-sspbc-response.json | 1 + .../storedresponse/test-auction-response.json | 1 + .../storedresponse/test-cache-request.json | 3 +- .../test-auction-streamlyn-response.json | 1 + .../test-auction-stroeercore-response.json | 2 + .../test-auction-suntContent-response.json | 1 + .../test-auction-taboola-response.json | 2 + .../tappx/test-auction-tappx-response.json | 1 + .../teads/test-auction-teads-response.json | 1 + .../tgm/test-auction-tgm-response.json | 1 + .../theadx/test-auction-theadx-response.json | 1 + .../test-auction-thetradedesk-response.json | 1 + ...st-auction-thirtythreeacross-response.json | 1 + .../tpmn/test-auction-tpmn-response.json | 1 + .../test-auction-tradplus-response.json | 1 + .../test-auction-trafficgate-response.json | 1 + .../tredio/test-auction-tredio-response.json | 1 + .../test-auction-triplelift-response.json | 1 + ...st-auction-triplelift-native-response.json | 1 + .../test-auction-trustedstack-response.json | 1 + .../ttx/test-auction-ttx-response.json | 1 + .../test-auction-ucfunnel-response.json | 1 + .../test-auction-undertone-response.json | 1 + .../test-auction-unicorn-response.json | 1 + .../unruly/test-auction-unruly-response.json | 1 + .../test-auction-vidazoo-response.json | 1 + .../test-auction-videobyte-response.json | 1 + .../test-auction-videoheroes-response.json | 1 + .../test-auction-vidoomy-response.json | 1 + .../vimayx/test-auction-vimayx-response.json | 1 + ...test-auction-visiblemeasures-response.json | 1 + .../visx/test-auction-visx-response.json | 1 + .../vox/test-auction-vox-response.json | 1 + .../vrtcal/test-auction-vrtcal-response.json | 1 + .../vungle/test-auction-vungle-response.json | 1 + .../test-auction-xeworks-response.json | 1 + .../xtrmqb/test-auction-xtrmqb-response.json | 1 + .../test-auction-yahooads-response.json | 1 + .../yandex/test-auction-yandex-response.json | 1 + .../test-auction-yeahmobi-response.json | 1 + .../test-auction-yearxero-response.json | 1 + .../test-auction-yieldlab-response.json | 1 + .../test-auction-yieldmo-response.json | 1 + .../test-auction-yieldone-response.json | 1 + .../test-auction-zeroclickfraud-response.json | 1 + ...test-auction-zeta_global_ssp-response.json | 1 + .../test-auction-zmaticoo-response.json | 1 + 297 files changed, 865 insertions(+), 70 deletions(-) create mode 100644 src/main/java/org/prebid/server/spring/config/model/CacheDefaultTtlProperties.java diff --git a/src/main/java/org/prebid/server/auction/BidResponseCreator.java b/src/main/java/org/prebid/server/auction/BidResponseCreator.java index 1c0b837bb4e..1c43d9e67b4 100644 --- a/src/main/java/org/prebid/server/auction/BidResponseCreator.java +++ b/src/main/java/org/prebid/server/auction/BidResponseCreator.java @@ -95,6 +95,7 @@ import org.prebid.server.settings.model.AccountEventsConfig; import org.prebid.server.settings.model.AccountTargetingConfig; import org.prebid.server.settings.model.VideoStoredDataResult; +import org.prebid.server.spring.config.model.CacheDefaultTtlProperties; import org.prebid.server.util.StreamUtil; import org.prebid.server.vast.VastModifier; @@ -139,6 +140,7 @@ public class BidResponseCreator { private final Clock clock; private final JacksonMapper mapper; private final CacheTtl mediaTypeCacheTtl; + private final CacheDefaultTtlProperties cacheDefaultProperties; private final String cacheHost; private final String cachePath; @@ -156,7 +158,8 @@ public BidResponseCreator(CoreCacheService coreCacheService, int truncateAttrChars, Clock clock, JacksonMapper mapper, - CacheTtl mediaTypeCacheTtl) { + CacheTtl mediaTypeCacheTtl, + CacheDefaultTtlProperties cacheDefaultProperties) { this.coreCacheService = Objects.requireNonNull(coreCacheService); this.bidderCatalog = Objects.requireNonNull(bidderCatalog); @@ -171,6 +174,7 @@ public BidResponseCreator(CoreCacheService coreCacheService, this.clock = Objects.requireNonNull(clock); this.mapper = Objects.requireNonNull(mapper); this.mediaTypeCacheTtl = Objects.requireNonNull(mediaTypeCacheTtl); + this.cacheDefaultProperties = Objects.requireNonNull(cacheDefaultProperties); cacheHost = Objects.requireNonNull(coreCacheService.getEndpointHost()); cachePath = Objects.requireNonNull(coreCacheService.getEndpointPath()); @@ -436,8 +440,8 @@ private BidInfo toBidInfo(Bid bid, .bidType(type) .bidder(bidder) .correspondingImp(correspondingImp) - .ttl(resolveBannerTtl(bid, correspondingImp, cacheInfo, account)) - .videoTtl(type == BidType.video ? resolveVideoTtl(bid, correspondingImp, cacheInfo, account) : null) + .ttl(resolveTtl(bid, type, correspondingImp, cacheInfo, account)) + .vastTtl(type == BidType.video ? resolveVastTtl(bid, correspondingImp, cacheInfo, account) : null) .category(categoryMappingResult.getCategory(bid)) .satisfiedPriority(categoryMappingResult.isBidSatisfiesPriority(bid)) .build(); @@ -457,31 +461,43 @@ private static Optional correspondingImp(String impId, List imps) { .findFirst(); } - private Integer resolveBannerTtl(Bid bid, Imp imp, BidRequestCacheInfo cacheInfo, Account account) { - final AccountAuctionConfig accountAuctionConfig = account.getAuction(); + private Integer resolveTtl(Bid bid, BidType type, Imp imp, BidRequestCacheInfo cacheInfo, Account account) { final Integer bidTtl = bid.getExp(); final Integer impTtl = imp != null ? imp.getExp() : null; + final Integer requestTtl = cacheInfo.getCacheBidsTtl(); - return ObjectUtils.firstNonNull( - bidTtl, - impTtl, - cacheInfo.getCacheBidsTtl(), - accountAuctionConfig != null ? accountAuctionConfig.getBannerCacheTtl() : null, - mediaTypeCacheTtl.getBannerCacheTtl()); + final AccountAuctionConfig accountAuctionConfig = account.getAuction(); + final Integer accountTtl = accountAuctionConfig != null ? switch (type) { + case banner -> accountAuctionConfig.getBannerCacheTtl(); + case video -> accountAuctionConfig.getVideoCacheTtl(); + case audio, xNative -> null; + } : null; + + final Integer mediaTypeTtl = switch (type) { + case banner -> mediaTypeCacheTtl.getBannerCacheTtl(); + case video -> mediaTypeCacheTtl.getVideoCacheTtl(); + case audio, xNative -> null; + }; + final Integer defaultTtl = switch (type) { + case banner -> cacheDefaultProperties.getBannerTtl(); + case video -> cacheDefaultProperties.getVideoTtl(); + case audio -> cacheDefaultProperties.getAudioTtl(); + case xNative -> cacheDefaultProperties.getNativeTtl(); + }; + + return ObjectUtils.firstNonNull(bidTtl, impTtl, requestTtl, accountTtl, mediaTypeTtl, defaultTtl); } - private Integer resolveVideoTtl(Bid bid, Imp imp, BidRequestCacheInfo cacheInfo, Account account) { + private Integer resolveVastTtl(Bid bid, Imp imp, BidRequestCacheInfo cacheInfo, Account account) { final AccountAuctionConfig accountAuctionConfig = account.getAuction(); - final Integer bidTtl = bid.getExp(); - final Integer impTtl = imp != null ? imp.getExp() : null; - return ObjectUtils.firstNonNull( - bidTtl, - impTtl, + bid.getExp(), + imp != null ? imp.getExp() : null, cacheInfo.getCacheVideoBidsTtl(), accountAuctionConfig != null ? accountAuctionConfig.getVideoCacheTtl() : null, - mediaTypeCacheTtl.getVideoCacheTtl()); + mediaTypeCacheTtl.getVideoCacheTtl(), + cacheDefaultProperties.getVideoTtl()); } private Future> invokeProcessedBidderResponseHooks(List bidderResponses, @@ -1369,7 +1385,7 @@ private Bid toBid(BidInfo bidInfo, final Integer ttl = Optional.ofNullable(cacheInfo) .map(info -> ObjectUtils.max(cacheInfo.getTtl(), cacheInfo.getVideoTtl())) - .orElseGet(() -> ObjectUtils.max(bidInfo.getTtl(), bidInfo.getVideoTtl())); + .orElseGet(() -> ObjectUtils.max(bidInfo.getTtl(), bidInfo.getVastTtl())); return bid.toBuilder() .ext(updatedBidExt) diff --git a/src/main/java/org/prebid/server/auction/model/BidInfo.java b/src/main/java/org/prebid/server/auction/model/BidInfo.java index 1cb95bcf681..aa3be49fd48 100644 --- a/src/main/java/org/prebid/server/auction/model/BidInfo.java +++ b/src/main/java/org/prebid/server/auction/model/BidInfo.java @@ -33,7 +33,7 @@ public class BidInfo { Integer ttl; - Integer videoTtl; + Integer vastTtl; public String getBidId() { final ObjectNode extNode = bid != null ? bid.getExt() : null; diff --git a/src/main/java/org/prebid/server/cache/CoreCacheService.java b/src/main/java/org/prebid/server/cache/CoreCacheService.java index 5d5034e23ce..0a0a57545c2 100644 --- a/src/main/java/org/prebid/server/cache/CoreCacheService.java +++ b/src/main/java/org/prebid/server/cache/CoreCacheService.java @@ -250,7 +250,7 @@ private List getCacheBids(List bidInfos) { private List getVideoCacheBids(List bidInfos) { return bidInfos.stream() .filter(bidInfo -> Objects.equals(bidInfo.getBidType(), BidType.video)) - .map(bidInfo -> CacheBid.of(bidInfo, bidInfo.getVideoTtl())) + .map(bidInfo -> CacheBid.of(bidInfo, bidInfo.getVastTtl())) .toList(); } diff --git a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java index 71e014fcc23..36e39d819f4 100644 --- a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java @@ -107,6 +107,7 @@ import org.prebid.server.privacy.gdpr.TcfDefinerService; import org.prebid.server.settings.ApplicationSettings; import org.prebid.server.settings.model.BidValidationEnforcement; +import org.prebid.server.spring.config.model.CacheDefaultTtlProperties; import org.prebid.server.spring.config.model.ExternalConversionProperties; import org.prebid.server.spring.config.model.HttpClientCircuitBreakerProperties; import org.prebid.server.spring.config.model.HttpClientProperties; @@ -789,6 +790,16 @@ BidderErrorNotifier bidderErrorNotifier( metrics); } + @Bean + CacheDefaultTtlProperties cacheDefaultTtlProperties( + @Value("${cache.default-ttl-seconds.banner:300}") Integer bannerTtl, + @Value("${cache.default-ttl-seconds.video:1500}") Integer videoTtl, + @Value("${cache.default-ttl-seconds.audio:1500}") Integer audioTtl, + @Value("${cache.default-ttl-seconds.native:300}") Integer nativeTtl) { + + return CacheDefaultTtlProperties.of(bannerTtl, videoTtl, audioTtl, nativeTtl); + } + @Bean BidResponseCreator bidResponseCreator( CoreCacheService coreCacheService, @@ -804,7 +815,8 @@ BidResponseCreator bidResponseCreator( Clock clock, JacksonMapper mapper, @Value("${cache.banner-ttl-seconds:#{null}}") Integer bannerCacheTtl, - @Value("${cache.video-ttl-seconds:#{null}}") Integer videoCacheTtl) { + @Value("${cache.video-ttl-seconds:#{null}}") Integer videoCacheTtl, + CacheDefaultTtlProperties cacheDefaultTtlProperties) { return new BidResponseCreator( coreCacheService, @@ -819,7 +831,8 @@ BidResponseCreator bidResponseCreator( truncateAttrChars, clock, mapper, - CacheTtl.of(bannerCacheTtl, videoCacheTtl)); + CacheTtl.of(bannerCacheTtl, videoCacheTtl), + cacheDefaultTtlProperties); } @Bean diff --git a/src/main/java/org/prebid/server/spring/config/model/CacheDefaultTtlProperties.java b/src/main/java/org/prebid/server/spring/config/model/CacheDefaultTtlProperties.java new file mode 100644 index 00000000000..2a3e36b6ef1 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/model/CacheDefaultTtlProperties.java @@ -0,0 +1,15 @@ +package org.prebid.server.spring.config.model; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class CacheDefaultTtlProperties { + + Integer bannerTtl; + + Integer videoTtl; + + Integer audioTtl; + + Integer nativeTtl; +} diff --git a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java index 17de10e38b5..1b4d29f774e 100644 --- a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java +++ b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java @@ -113,6 +113,7 @@ import org.prebid.server.settings.model.AccountAuctionEventConfig; import org.prebid.server.settings.model.AccountEventsConfig; import org.prebid.server.settings.model.VideoStoredDataResult; +import org.prebid.server.spring.config.model.CacheDefaultTtlProperties; import org.prebid.server.vast.VastModifier; import java.math.BigDecimal; @@ -156,6 +157,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAdservertargetingRule.Source.xStatic; +import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative; @@ -190,6 +192,8 @@ public class BidResponseCreatorTest extends VertxTest { private ActivityInfrastructure activityInfrastructure; @Mock(strictness = LENIENT) private CacheTtl mediaTypeCacheTtl; + @Mock(strictness = LENIENT) + private CacheDefaultTtlProperties cacheDefaultProperties; @Spy private WinningBidComparatorFactory winningBidComparatorFactory; @@ -209,6 +213,11 @@ public void setUp() { given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(null); given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(null); + given(cacheDefaultProperties.getBannerTtl()).willReturn(null); + given(cacheDefaultProperties.getVideoTtl()).willReturn(null); + given(cacheDefaultProperties.getAudioTtl()).willReturn(null); + given(cacheDefaultProperties.getNativeTtl()).willReturn(null); + given(categoryMappingService.createCategoryMapping(any(), any(), any())) .willAnswer(invocationOnMock -> Future.succeededFuture( CategoryMappingResult.of(emptyMap(), emptyMap(), invocationOnMock.getArgument(0), null))); @@ -1640,7 +1649,8 @@ public void shouldTruncateTargetingKeywordsByGlobalConfig() { 20, clock, jacksonMapper, - mediaTypeCacheTtl); + mediaTypeCacheTtl, + cacheDefaultProperties); // when final BidResponse bidResponse = target.create(auctionContext, CACHE_INFO, MULTI_BIDS).result(); @@ -3807,7 +3817,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromBid() { final Imp imp = Imp.builder().id("impId").exp(20).build(); final List bidderResponses = asList(BidderResponse.of( "bidder1", - givenSeatBid(BidderBid.of(bid, banner, "USD")), + givenSeatBid(BidderBid.of(bid, video, "USD")), 100)); final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() @@ -3815,7 +3825,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromBid() { .shouldCacheBids(true) .shouldCacheVideoBids(true) .cacheBidsTtl(30) - .cacheVideoBidsTtl(40) + .cacheVideoBidsTtl(31) .build(); final AuctionContext auctionContext = givenAuctionContext( @@ -3825,7 +3835,8 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromBid() { builder -> builder.account(Account.builder() .id("accountId") .auction(AccountAuctionConfig.builder() - .bannerCacheTtl(60) + .bannerCacheTtl(40) + .videoCacheTtl(41) .events(AccountEventsConfig.of(true)) .build()) .build())) @@ -3834,6 +3845,11 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromBid() { // just a stub to get through method call chain givenCacheServiceResult(singletonList(CacheInfo.empty())); given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); // when final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); @@ -3855,6 +3871,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromBid() { final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(10); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnly(10); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -3869,7 +3886,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromImp() { final Imp imp = Imp.builder().id("impId").exp(20).build(); final List bidderResponses = asList(BidderResponse.of( "bidder1", - givenSeatBid(BidderBid.of(bid, banner, "USD")), + givenSeatBid(BidderBid.of(bid, video, "USD")), 100)); final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() @@ -3877,7 +3894,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromImp() { .shouldCacheBids(true) .shouldCacheVideoBids(true) .cacheBidsTtl(30) - .cacheVideoBidsTtl(40) + .cacheVideoBidsTtl(31) .build(); final AuctionContext auctionContext = givenAuctionContext( @@ -3887,7 +3904,8 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromImp() { builder -> builder.account(Account.builder() .id("accountId") .auction(AccountAuctionConfig.builder() - .bannerCacheTtl(60) + .bannerCacheTtl(40) + .videoCacheTtl(41) .events(AccountEventsConfig.of(true)) .build()) .build())) @@ -3896,6 +3914,11 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromImp() { // just a stub to get through method call chain givenCacheServiceResult(singletonList(CacheInfo.empty())); given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); // when final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); @@ -3917,6 +3940,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromImp() { final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(20); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnly(20); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -3931,7 +3955,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { final Imp imp = Imp.builder().id("impId").exp(null).build(); final List bidderResponses = asList(BidderResponse.of( "bidder1", - givenSeatBid(BidderBid.of(bid, banner, "USD")), + givenSeatBid(BidderBid.of(bid, video, "USD")), 100)); final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() @@ -3939,7 +3963,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { .shouldCacheBids(true) .shouldCacheVideoBids(true) .cacheBidsTtl(30) - .cacheVideoBidsTtl(40) + .cacheVideoBidsTtl(31) .build(); final AuctionContext auctionContext = givenAuctionContext( @@ -3949,7 +3973,8 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { builder -> builder.account(Account.builder() .id("accountId") .auction(AccountAuctionConfig.builder() - .bannerCacheTtl(60) + .bannerCacheTtl(40) + .videoCacheTtl(41) .events(AccountEventsConfig.of(true)) .build()) .build())) @@ -3958,6 +3983,11 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { // just a stub to get through method call chain givenCacheServiceResult(singletonList(CacheInfo.empty())); given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); // when final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); @@ -3968,7 +3998,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { assertThat(response.succeeded()).isTrue(); assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) - .containsExactly(30); + .containsExactly(31); verify(coreCacheService).cacheBidsOpenrtb( bidsArgumentCaptor.capture(), @@ -3979,6 +4009,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(30); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnly(31); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -3987,7 +4018,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromRequest() { } @Test - public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBannerTtl() { + public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBannerTtlForBannerBid() { // given final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); final Imp imp = Imp.builder().id("impId").exp(null).build(); @@ -4001,7 +4032,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne .shouldCacheBids(true) .shouldCacheVideoBids(true) .cacheBidsTtl(null) - .cacheVideoBidsTtl(40) + .cacheVideoBidsTtl(31) .build(); final AuctionContext auctionContext = givenAuctionContext( @@ -4011,7 +4042,8 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne builder -> builder.account(Account.builder() .id("accountId") .auction(AccountAuctionConfig.builder() - .bannerCacheTtl(60) + .bannerCacheTtl(40) + .videoCacheTtl(41) .events(AccountEventsConfig.of(true)) .build()) .build())) @@ -4020,6 +4052,11 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne // just a stub to get through method call chain givenCacheServiceResult(singletonList(CacheInfo.empty())); given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); // when final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); @@ -4030,7 +4067,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne assertThat(response.succeeded()).isTrue(); assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) - .containsExactly(60); + .containsExactly(40); verify(coreCacheService).cacheBidsOpenrtb( bidsArgumentCaptor.capture(), @@ -4040,7 +4077,8 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); - assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(60); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(40); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsNull(); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -4049,7 +4087,76 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountBanne } @Test - public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtl() { + public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromAccountVideoTtlForVideoBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, video, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(40) + .videoCacheTtl(41) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(41); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(41); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(41); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtlForBannerBid() { // given final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); final Imp imp = Imp.builder().id("impId").exp(null).build(); @@ -4063,7 +4170,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtl .shouldCacheBids(true) .shouldCacheVideoBids(true) .cacheBidsTtl(null) - .cacheVideoBidsTtl(40) + .cacheVideoBidsTtl(null) .build(); final AuctionContext auctionContext = givenAuctionContext( @@ -4074,6 +4181,7 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtl .id("accountId") .auction(AccountAuctionConfig.builder() .bannerCacheTtl(null) + .videoCacheTtl(41) .events(AccountEventsConfig.of(true)) .build()) .build())) @@ -4082,6 +4190,11 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtl // just a stub to get through method call chain givenCacheServiceResult(singletonList(CacheInfo.empty())); given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); // when final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); @@ -4103,6 +4216,352 @@ public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtl final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(50); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsNull(); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetTtlFromMediaTypeTtlForVideoBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, video, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(40) + .videoCacheTtl(null) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(51); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(51); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnly(51); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetDefaultTtlForBannerBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, banner, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(null) + .videoCacheTtl(41) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(null); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(60); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(60); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsNull(); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetDefaultTtlForVideoBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, video, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(40) + .videoCacheTtl(null) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(null); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(61); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(61); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnly(61); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetDefaultTtlForAudioBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, audio, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(40) + .videoCacheTtl(41) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(62); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(62); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsNull(); + assertThat(contextArgumentCaptor.getValue()) + .satisfies(context -> { + assertThat(context.isShouldCacheBids()).isTrue(); + assertThat(context.isShouldCacheVideoBids()).isTrue(); + }); + } + + @Test + public void createShouldSendCacheRequestWithExpectedTtlAndSetDefaultTtlForNativeBid() { + // given + final Bid bid = Bid.builder().id("bidId").impid("impId").exp(null).price(BigDecimal.valueOf(5.67)).build(); + final Imp imp = Imp.builder().id("impId").exp(null).build(); + final List bidderResponses = asList(BidderResponse.of( + "bidder1", + givenSeatBid(BidderBid.of(bid, xNative, "USD")), + 100)); + + final BidRequestCacheInfo cacheInfo = BidRequestCacheInfo.builder() + .doCaching(true) + .shouldCacheBids(true) + .shouldCacheVideoBids(true) + .cacheBidsTtl(null) + .cacheVideoBidsTtl(null) + .build(); + + final AuctionContext auctionContext = givenAuctionContext( + givenBidRequest(builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .events(mapper.createObjectNode()) + .build())), imp), + builder -> builder.account(Account.builder() + .id("accountId") + .auction(AccountAuctionConfig.builder() + .bannerCacheTtl(40) + .videoCacheTtl(41) + .events(AccountEventsConfig.of(true)) + .build()) + .build())) + .with(toAuctionParticipant(bidderResponses)); + + // just a stub to get through method call chain + givenCacheServiceResult(singletonList(CacheInfo.empty())); + given(mediaTypeCacheTtl.getBannerCacheTtl()).willReturn(50); + given(mediaTypeCacheTtl.getVideoCacheTtl()).willReturn(51); + given(cacheDefaultProperties.getBannerTtl()).willReturn(60); + given(cacheDefaultProperties.getVideoTtl()).willReturn(61); + given(cacheDefaultProperties.getAudioTtl()).willReturn(62); + given(cacheDefaultProperties.getNativeTtl()).willReturn(63); + + // when + final Future response = target.create(auctionContext, cacheInfo, MULTI_BIDS); + + // then + final ArgumentCaptor contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class); + final ArgumentCaptor> bidsArgumentCaptor = ArgumentCaptor.forClass(List.class); + + assertThat(response.succeeded()).isTrue(); + assertThat(response.result().getSeatbid()).flatExtracting(SeatBid::getBid).extracting(Bid::getExp) + .containsExactly(63); + + verify(coreCacheService).cacheBidsOpenrtb( + bidsArgumentCaptor.capture(), + same(auctionContext), + contextArgumentCaptor.capture(), + any()); + + final List capturedBidInfo = bidsArgumentCaptor.getValue(); + assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); + assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsOnly(63); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsNull(); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -4277,7 +4736,7 @@ public void createShouldSendCacheRequestWithVideoBidWithTtlMaxOfTtlAndVideoTtl() final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsExactly(30); - assertThat(capturedBidInfo).extracting(BidInfo::getVideoTtl).containsExactly(40); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsExactly(40); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -4336,7 +4795,7 @@ public void createShouldSendCacheRequestWithBannerBidWithTtlMaxOfTtlAndVideoTtl( final List capturedBidInfo = bidsArgumentCaptor.getValue(); assertThat(capturedBidInfo).extracting(bidInfo -> bidInfo.getBid().getId()).containsOnly("bidId"); assertThat(capturedBidInfo).extracting(BidInfo::getTtl).containsExactly(30); - assertThat(capturedBidInfo).extracting(BidInfo::getVideoTtl).containsOnlyNulls(); + assertThat(capturedBidInfo).extracting(BidInfo::getVastTtl).containsOnlyNulls(); assertThat(contextArgumentCaptor.getValue()) .satisfies(context -> { assertThat(context.isShouldCacheBids()).isTrue(); @@ -4576,7 +5035,8 @@ private BidResponseCreator givenBidResponseCreator(int truncateAttrChars) { truncateAttrChars, clock, jacksonMapper, - mediaTypeCacheTtl); + mediaTypeCacheTtl, + cacheDefaultProperties); } private static String toTargetingByKey(Bid bid, String targetingKey) { diff --git a/src/test/resources/org/prebid/server/it/amp/test-cache-request.json b/src/test/resources/org/prebid/server/it/amp/test-cache-request.json index 4908b67e9c1..fe8eba5c934 100644 --- a/src/test/resources/org/prebid/server/it/amp/test-cache-request.json +++ b/src/test/resources/org/prebid/server/it/amp/test-cache-request.json @@ -27,7 +27,8 @@ "origbidcpm": 12.09 } }, - "aid":"tid" + "aid":"tid", + "ttlseconds": 300 }, { "type": "json", @@ -60,7 +61,8 @@ "origbidcur": "USD" } }, - "aid":"tid" + "aid":"tid", + "ttlseconds": 300 } ] } diff --git a/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json b/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json index 9d49c702f5e..e6127bea4f0 100644 --- a/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json +++ b/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json @@ -11,6 +11,7 @@ "crid": "crid2", "w": 120, "h": 600, + "exp": 300, "ext": { "prebid": { "type": "banner", @@ -35,6 +36,7 @@ { "id": "31124", "impid": "impId-video-cache-update", + "exp": 1500, "price": 3, "adm": "adm1", "crid": "crid1", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/33across/test-auction-33across-response.json b/src/test/resources/org/prebid/server/it/openrtb2/33across/test-auction-33across-response.json index f086c053112..b7a0ac4311d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/33across/test-auction-33across-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/33across/test-auction-33across-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aax/test-auction-aax-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aax/test-auction-aax-response.json index c223e8f56d3..f6f8aa08087 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aax/test-auction-aax-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aax/test-auction-aax-response.json @@ -6,6 +6,7 @@ { "id": "randomid", "impid": "test-imp-id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "12345678", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aceex/test-auction-aceex-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aceex/test-auction-aceex-response.json index f80400fe5d1..b9b61a696c0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aceex/test-auction-aceex-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aceex/test-auction-aceex-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json index ba9ea7db56d..a0bab7d6cc2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adelement/test-auction-adelement-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adelement/test-auction-adelement-response.json index ee0b96cb442..0c48f3a8431 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adelement/test-auction-adelement-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adelement/test-auction-adelement-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "12345678", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adf/test-auction-adf-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adf/test-auction-adf-response.json index 320108794b5..f4417095fa3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adf/test-auction-adf-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adf/test-auction-adf-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 11.393, "adomain": [ ], @@ -22,6 +23,7 @@ { "id": "bid_id_banner", "impid": "imp_id_banner", + "exp": 300, "price": 11.393, "adomain": [], "adm": "", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json index 05c116d4aa2..25ebe533dcc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json @@ -6,6 +6,7 @@ { "id": "id", "impid": "id", + "exp": 300, "price": 46.6, "adm": "", "crid": "Dummy_supership.jp", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json index 9895195c325..f5fd5214de2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 2.184, "adm": "
\"\"
", "crid": "demo-424", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json index 92b00eb8c2b..a6a8e2bd0c8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 2.25, "adm": "", "adid": "2002", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-adkerneladn-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-adkerneladn-bid-response.json index 9f868cc7baa..53df688de45 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-adkerneladn-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-adkerneladn-bid-response.json @@ -24,4 +24,4 @@ } ], "bidid": "bid_id" -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json index f1d38a7780f..9563c1ff672 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "adm021", "adid": "19005", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json index 8d448c61116..8884760961e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json @@ -6,6 +6,7 @@ { "id": "bid_id1", "impid": "imp_id1", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/admatic/test-auction-admatic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/admatic/test-auction-admatic-response.json index 6ad0d2f637f..0277bb7f78d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/admatic/test-auction-admatic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/admatic/test-auction-admatic-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-admixer-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-admixer-bid-response.json index 5561b33da3b..aceadcc04ac 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-admixer-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-admixer-bid-response.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json index 4352d750af3..75f33a522f6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json @@ -16,6 +16,7 @@ }, "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01 } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-auction-adnuntius-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-auction-adnuntius-response.json index beffca0d359..61bac864a49 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-auction-adnuntius-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-auction-adnuntius-response.json @@ -6,6 +6,7 @@ { "id": "some_ad_id", "impid": "imp_id", + "exp": 300, "price": 42420.00, "adm": "some_html", "adid": "some_ad_id", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json index 76c4005d49c..3f62c1fb7db 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json @@ -6,6 +6,7 @@ { "id": "adoceanmyaozpniqismex", "impid": "imp_id", + "exp": 300, "price": 10, "adm": " ", "crid": "0af345b42983cc4bc0", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-adoppler-bid-response-1.json b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-adoppler-bid-response-1.json index ba80a545eed..4edc56ade74 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-adoppler-bid-response-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-adoppler-bid-response-1.json @@ -26,4 +26,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json index db0b1aeaa49..7822b00cdbb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json index dcff8f22c64..b2c52bb7d9e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.16346, "adm": "some-test-ad", "crid": "crid001", @@ -36,4 +37,4 @@ "auctiontimestamp": 1626182712962 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-adpone-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-adpone-bid-response.json index 7f09ff7886b..1682aad2c48 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-adpone-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-adpone-bid-response.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json index e24dfce9f48..3c4fc34a311 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 6.66, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json index 5b7e94562fd..073a812bcdb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adquery/test-auction-adquery-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adquery/test-auction-adquery-response.json index 0d05040052c..1d301f75624 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adquery/test-auction-adquery-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adquery/test-auction-adquery-response.json @@ -6,6 +6,7 @@ { "id": "22e26bd9a702bc1", "impid": "22e26bd9a702bc", + "exp": 300, "price": 1.090, "adm": "Tag_Example", "adomain": [ diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adrino/test-auction-adrino-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adrino/test-auction-adrino-response.json index d480aae971a..e1341dbdcca 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adrino/test-auction-adrino-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adrino/test-auction-adrino-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adid": "adid001", "cid": "cid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adsyield/test-auction-adsyield-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adsyield/test-auction-adsyield-response.json index b9d85d4e632..855d418643f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adsyield/test-auction-adsyield-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adsyield/test-auction-adsyield-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-adtarget-bid-response-1.json b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-adtarget-bid-response-1.json index 03c5ee91218..d5b04833e91 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-adtarget-bid-response-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-adtarget-bid-response-1.json @@ -17,4 +17,4 @@ "group": 0 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json index 23465125a4e..809b063e228 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-adtelligent-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-adtelligent-bid-response.json index 15d06b7c923..1da8f18279d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-adtelligent-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-adtelligent-bid-response.json @@ -17,4 +17,4 @@ "group": 0 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json index 458b300cb66..b73512ad65c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtonos/test-auction-adtonos-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtonos/test-auction-adtonos-response.json index e6795976a7f..c5bfdb6d592 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtonos/test-auction-adtonos-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtonos/test-auction-adtonos-response.json @@ -7,6 +7,7 @@ "id": "bid_id", "mtype": 1, "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtrgtme/test-auction-adtrgtme-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtrgtme/test-auction-adtrgtme-response.json index 60c2ad42bab..d786080f717 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtrgtme/test-auction-adtrgtme-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtrgtme/test-auction-adtrgtme-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "h": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json index df8ec148aa1..92ba70c5c42 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adview/test-auction-adview-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adview/test-auction-adview-response.json index eccc7f38dec..a6c118e0913 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adview/test-auction-adview-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adview/test-auction-adview-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adxcg/test-auction-adxcg-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adxcg/test-auction-adxcg-response.json index 81b8aa40e9e..0961b1f67ec 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adxcg/test-auction-adxcg-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adxcg/test-auction-adxcg-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-adyoulike-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-adyoulike-bid-response.json index e291739474c..a4c0edc3e09 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-adyoulike-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-adyoulike-bid-response.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-auction-adyoulike-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-auction-adyoulike-response.json index ec08af30179..96aa18de5d8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-auction-adyoulike-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adyoulike/test-auction-adyoulike-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aidem/test-auction-aidem-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aidem/test-auction-aidem-response.json index 1dff571757c..f5ee4e08e9c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aidem/test-auction-aidem-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aidem/test-auction-aidem-response.json @@ -7,6 +7,7 @@ "id": "bid_id", "mtype": 1, "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-aja-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-aja-bid-response.json index d2f3908c4b3..413a3ffe241 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-aja-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-aja-bid-response.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json index 5b8ce2dfb32..7010f75f5e6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 10, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-algorix-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-algorix-bid-response.json index e291739474c..a4c0edc3e09 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-algorix-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-algorix-bid-response.json @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-auction-algorix-response.json b/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-auction-algorix-response.json index f3b649ebbec..b61aebbccd6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-auction-algorix-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/algorix/test-auction-algorix-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alkimi/test-auction-alkimi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alkimi/test-auction-alkimi-response.json index ca0b59e06b3..b8ccdb2d3b3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alkimi/test-auction-alkimi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alkimi/test-auction-alkimi-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json index dc3186c5778..ec393ab7ca0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/apacdex/test-auction-apacdex-response.json b/src/test/resources/org/prebid/server/it/openrtb2/apacdex/test-auction-apacdex-response.json index e9c1f602280..2122bfc623a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/apacdex/test-auction-apacdex-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/apacdex/test-auction-apacdex-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/appnexus/test-video-cache-request.json b/src/test/resources/org/prebid/server/it/openrtb2/appnexus/test-video-cache-request.json index da99c54e188..15ae12d04c5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/appnexus/test-video-cache-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/appnexus/test-video-cache-request.json @@ -4,19 +4,22 @@ "type": "xml", "value": "some-test-ad-3", "aid": "bid_id", - "key": "2.0_IAB10-1_0s_{{uuid}}" + "key": "2.0_IAB10-1_0s_{{uuid}}", + "ttlseconds": 1500 }, { "type": "xml", "value": "some-test-ad", "aid": "bid_id", - "key": "5.5_IAB20-3_0s_{{uuid}}" + "key": "5.5_IAB20-3_0s_{{uuid}}", + "ttlseconds": 1500 }, { "type": "xml", "value": "some-test-ad-2", "aid": "bid_id", - "key": "2.5_IAB18-5_0s_{{uuid}}" + "key": "2.5_IAB18-5_0s_{{uuid}}", + "ttlseconds": 1500 } ] } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/appush/test-auction-appush-response.json b/src/test/resources/org/prebid/server/it/openrtb2/appush/test-auction-appush-response.json index 4a71755b12d..f673f770ad2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/appush/test-auction-appush-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/appush/test-auction-appush-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aso/test-auction-aso-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aso/test-auction-aso-response.json index cef76b6cec9..6b9a19e7187 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aso/test-auction-aso-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aso/test-auction-aso-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.7, "adm": "adm6_4.7", "nurl": "nurl_4.7", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/audiencenetwork/test-auction-audiencenetwork-response.json b/src/test/resources/org/prebid/server/it/openrtb2/audiencenetwork/test-auction-audiencenetwork-response.json index 376d88dbf44..e1d18a2ecb5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/audiencenetwork/test-auction-audiencenetwork-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/audiencenetwork/test-auction-audiencenetwork-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 9.0, "adm": "{\"bid_id\":\"10\"}", "adid": "10", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/automatad/test-auction-automatad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/automatad/test-auction-automatad-response.json index 64383cd93de..c4c971e466e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/automatad/test-auction-automatad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/automatad/test-auction-automatad-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json index cc260a44b94..6fca036d997 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 0.5, "adm": "some-test-ad", "adid": "29681110", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/axis/test-auction-axis-response.json b/src/test/resources/org/prebid/server/it/openrtb2/axis/test-auction-axis-response.json index 37c3691752c..676eb7d802a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/axis/test-auction-axis-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/axis/test-auction-axis-response.json @@ -6,6 +6,7 @@ { "id": "bid_id1", "impid": "imp_id1", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/axonix/test-auction-axonix-response.json b/src/test/resources/org/prebid/server/it/openrtb2/axonix/test-auction-axonix-response.json index 31a15adc1f9..e0e02fc7381 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/axonix/test-auction-axonix-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/axonix/test-auction-axonix-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bcmint/test-auction-bcmint-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bcmint/test-auction-bcmint-response.json index 1ca1cb7607c..c591ef97cfd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bcmint/test-auction-bcmint-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bcmint/test-auction-bcmint-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.7, "adm": "adm6_4.7", "nurl": "nurl_4.7", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json index 5338cc8c4d4..5e10a21b5de 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json @@ -6,6 +6,7 @@ { "id": "imp_idBanner", "impid": "imp_id", + "exp": 300, "price": 2.942807912826538, "adm": "
", "crid": "crid_3", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json index 9419a85783d..bed5b0e3939 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "bid_id", + "exp": 300, "price": 2.942808, "adid": "94395500", "crid": "94395500", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bematterfull/test-auction-bematterfull-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bematterfull/test-auction-bematterfull-response.json index 4b0e7de3f44..1d2bac9f898 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bematterfull/test-auction-bematterfull-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bematterfull/test-auction-bematterfull-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.7, "adm": "adm6", "crid": "crid6", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json b/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json index ed208dd5654..cf2a6e0d031 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beyondmedia/test-auction-beyondmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/beyondmedia/test-auction-beyondmedia-response.json index 605deba4cb1..e63089babb2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beyondmedia/test-auction-beyondmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beyondmedia/test-auction-beyondmedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidagency/test-auction-bidagency-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidagency/test-auction-bidagency-response.json index 80cfe99af9e..fdba12487c7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidagency/test-auction-bidagency-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidagency/test-auction-bidagency-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.7, "adm": "adm6_4.7", "nurl": "nurl_4.7", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidmachine/test-auction-bidmachine-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidmachine/test-auction-bidmachine-response.json index eb4e503494f..0ea56280b80 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidmachine/test-auction-bidmachine-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidmachine/test-auction-bidmachine-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidmatic/test-auction-bidmatic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidmatic/test-auction-bidmatic-response.json index a45f9eeb3c9..ba0b73cfaf1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidmatic/test-auction-bidmatic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidmatic/test-auction-bidmatic-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidmyadz/test-auction-bidmyadz-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidmyadz/test-auction-bidmyadz-response.json index ba657da0438..399a568d088 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidmyadz/test-auction-bidmyadz-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidmyadz/test-auction-bidmyadz-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidscube/test-auction-bidscube-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidscube/test-auction-bidscube-response.json index 8cb8a61c009..8c8b0128e98 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidscube/test-auction-bidscube-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidscube/test-auction-bidscube-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidstack/test-auction-bidstack-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidstack/test-auction-bidstack-response.json index 523bdbbcda4..9428b19fd0a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bidstack/test-auction-bidstack-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidstack/test-auction-bidstack-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adid": "adid001", "adm": "", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bigoad/test-auction-bigoad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bigoad/test-auction-bigoad-response.json index 287c05c61aa..013cd170712 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bigoad/test-auction-bigoad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bigoad/test-auction-bigoad-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "mtype": 1, "price": 3.33, "adm": "adm001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/blasto/test-auction-blasto-response.json b/src/test/resources/org/prebid/server/it/openrtb2/blasto/test-auction-blasto-response.json index 9bf200e6d9d..22a67229971 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/blasto/test-auction-blasto-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/blasto/test-auction-blasto-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bliink/test-auction-bliink-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bliink/test-auction-bliink-response.json index de26e4363ea..f4ddf9222af 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bliink/test-auction-bliink-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bliink/test-auction-bliink-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bluesea/test-auction-bluesea-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bluesea/test-auction-bluesea-response.json index 939897d89a1..71412aa8e6c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bluesea/test-auction-bluesea-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bluesea/test-auction-bluesea-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bmtm/test-auction-bmtm-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bmtm/test-auction-bmtm-response.json index 1d36233fd2d..cbbae431606 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bmtm/test-auction-bmtm-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bmtm/test-auction-bmtm-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/boldwin/test-auction-boldwin-response.json b/src/test/resources/org/prebid/server/it/openrtb2/boldwin/test-auction-boldwin-response.json index e9242e76699..4d5d8f5ce9e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/boldwin/test-auction-boldwin-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/boldwin/test-auction-boldwin-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/brave/test-auction-brave-response.json b/src/test/resources/org/prebid/server/it/openrtb2/brave/test-auction-brave-response.json index 39819c16e18..43de8398d78 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/brave/test-auction-brave-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/brave/test-auction-brave-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bwx/test-auction-bwx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bwx/test-auction-bwx-response.json index 6029a55596f..6107fe586a3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/bwx/test-auction-bwx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/bwx/test-auction-bwx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "mtype": 1, "adid": "adid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/cadentaperturemx/test-auction-cadentaperturemx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/cadentaperturemx/test-auction-cadentaperturemx-response.json index c5b97cc0914..f2f43ba2c1d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/cadentaperturemx/test-auction-cadentaperturemx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/cadentaperturemx/test-auction-cadentaperturemx-response.json @@ -6,6 +6,7 @@ { "id": "imp_id", "impid": "imp_id", + "exp": 300, "price": 2.942808, "adm": "
", "adid": "94395500", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ccx/test-auction-ccx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ccx/test-auction-ccx-response.json index 28eb0bc9e9d..7fcafb472c7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ccx/test-auction-ccx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ccx/test-auction-ccx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/cointraffic/test-auction-cointraffic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/cointraffic/test-auction-cointraffic-response.json index 4837ee79517..06fadbf0b09 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/cointraffic/test-auction-cointraffic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/cointraffic/test-auction-cointraffic-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/coinzilla/test-auction-coinzilla-response.json b/src/test/resources/org/prebid/server/it/openrtb2/coinzilla/test-auction-coinzilla-response.json index cbad770f0e5..9f59c942b28 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/coinzilla/test-auction-coinzilla-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/coinzilla/test-auction-coinzilla-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 6.66, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/colossus/aliases/test-auction-colossusssp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/colossus/aliases/test-auction-colossusssp-response.json index 3491c77189e..f551e12bbe4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/colossus/aliases/test-auction-colossusssp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/colossus/aliases/test-auction-colossusssp-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json index c4d521102b5..d7914b5fb58 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/compass/test-auction-compass-response.json b/src/test/resources/org/prebid/server/it/openrtb2/compass/test-auction-compass-response.json index 0da511e197e..20f86d6a348 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/compass/test-auction-compass-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/compass/test-auction-compass-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/concert/test-auction-concert-response.json b/src/test/resources/org/prebid/server/it/openrtb2/concert/test-auction-concert-response.json index aadc8da3482..666a177b9c1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/concert/test-auction-concert-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/concert/test-auction-concert-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "mtype": 1, "price": 3.33, "adm": "adm001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json index 9aa7d077c16..d24913feeef 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adm": "hi", "cid": "test_cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json index 1290f6775fa..a28d27cf14a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json @@ -7,6 +7,7 @@ { "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800", "impid": "test-imp-id", + "exp": 300, "price": 0.500000, "adm": "some-test-ad", "crid": "crid_10", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/copper6/test-auction-copper6-response.json b/src/test/resources/org/prebid/server/it/openrtb2/copper6/test-auction-copper6-response.json index 464f7df6b6a..3ac3ccb1672 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/copper6/test-auction-copper6-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/copper6/test-auction-copper6-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/copper6ssp/test-auction-copper6ssp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/copper6ssp/test-auction-copper6ssp-response.json index fb24eb9368c..52b36682c8a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/copper6ssp/test-auction-copper6ssp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/copper6ssp/test-auction-copper6ssp-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json index 9444279b4a6..6a685a06ba4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/criteo/test-auction-criteo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/criteo/test-auction-criteo-response.json index fb1c7803346..9d7e6b1ca5b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/criteo/test-auction-criteo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/criteo/test-auction-criteo-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json index 7ce6a9dd1ae..a73407d0bb8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 7.77, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/decenterads/test-auction-decenterads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/decenterads/test-auction-decenterads-response.json index dbbff620bf4..6b058b84507 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/decenterads/test-auction-decenterads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/decenterads/test-auction-decenterads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json index 8f1dfac20f0..223095836df 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/definemedia/test-auction-definemedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/definemedia/test-auction-definemedia-response.json index d24a92228d1..34d7cd3fbf2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/definemedia/test-auction-definemedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/definemedia/test-auction-definemedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 11.393, "adomain": [ ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/dianomi/test-auction-dianomi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/dianomi/test-auction-dianomi-response.json index 40de103c524..0725b710372 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/dianomi/test-auction-dianomi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/dianomi/test-auction-dianomi-response.json @@ -6,6 +6,7 @@ { "id": "bid_id_banner", "impid": "imp_id_banner", + "exp": 300, "price": 11.393, "adomain": [], "adm": "", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/displayio/test-auction-displayio-response.json b/src/test/resources/org/prebid/server/it/openrtb2/displayio/test-auction-displayio-response.json index 8c5b4ea599e..ad84acca12c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/displayio/test-auction-displayio-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/displayio/test-auction-displayio-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json index c34b9f61946..e7b10ebdda4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "cid": "test_cid", "crid": "test_banner_crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/driftpixel/test-auction-driftpixel-response.json b/src/test/resources/org/prebid/server/it/openrtb2/driftpixel/test-auction-driftpixel-response.json index 81da7b92978..d28852c4ccd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/driftpixel/test-auction-driftpixel-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/driftpixel/test-auction-driftpixel-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/dxkulture/test-auction-dxkulture-response.json b/src/test/resources/org/prebid/server/it/openrtb2/dxkulture/test-auction-dxkulture-response.json index 0c6bd826b02..b2442775de6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/dxkulture/test-auction-dxkulture-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/dxkulture/test-auction-dxkulture-response.json @@ -7,6 +7,7 @@ "id": "bid_id", "mtype": 1, "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/edge226/test-auction-edge226-response.json b/src/test/resources/org/prebid/server/it/openrtb2/edge226/test-auction-edge226-response.json index ce119ca7efd..2b9d8f83ca4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/edge226/test-auction-edge226-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/edge226/test-auction-edge226-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/embimedia/test-auction-embimedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/embimedia/test-auction-embimedia-response.json index 5de88ba03df..930aa7c8b06 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/embimedia/test-auction-embimedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/embimedia/test-auction-embimedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emtv/test-auction-emtv-response.json b/src/test/resources/org/prebid/server/it/openrtb2/emtv/test-auction-emtv-response.json index c71dd2560c2..3795c5a9c62 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/emtv/test-auction-emtv-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/emtv/test-auction-emtv-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json index 6d2e3cf823c..552b0f3a934 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json @@ -6,6 +6,7 @@ { "id": "imp_id", "impid": "imp_id", + "exp": 300, "price": 2.942808, "adm": "
", "adid": "94395500", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json index b3b8e50e406..ce65aba9a9b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "
test
", "adid": "imp_id", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/epom/test-auction-epom-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epom/test-auction-epom-response.json index 16a9acaefd1..f10ab8e286e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/epom/test-auction-epom-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epom/test-auction-epom-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json index aadd13302aa..3dd393badc9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 5.0, "adm": "adm4", "crid": "crid4", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json index 8cb45ddcbac..4aa8c6d0985 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 6.0, "adm": "adm4", "crid": "crid4", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/escalax/test-auction-escalax-response.json b/src/test/resources/org/prebid/server/it/openrtb2/escalax/test-auction-escalax-response.json index 0aa7a90e2d4..7f2babf609e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/escalax/test-auction-escalax-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/escalax/test-auction-escalax-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/evolution/test-auction-evolution-response.json b/src/test/resources/org/prebid/server/it/openrtb2/evolution/test-auction-evolution-response.json index 1d694702c90..d0043247edf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/evolution/test-auction-evolution-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/evolution/test-auction-evolution-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/felixads/test-auction-felixads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/felixads/test-auction-felixads-response.json index ae5c74865aa..0b63bd03f57 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/felixads/test-auction-felixads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/felixads/test-auction-felixads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/filmzie/test-auction-filmzie-response.json b/src/test/resources/org/prebid/server/it/openrtb2/filmzie/test-auction-filmzie-response.json index 4a1aac1a8c5..e2c3508d1ab 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/filmzie/test-auction-filmzie-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/filmzie/test-auction-filmzie-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/finative/test-auction-finative-response.json b/src/test/resources/org/prebid/server/it/openrtb2/finative/test-auction-finative-response.json index 4246d1a5016..e055b56bb65 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/finative/test-auction-finative-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/finative/test-auction-finative-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 11.393, "adm": "some adm price 10", "adomain": [ diff --git a/src/test/resources/org/prebid/server/it/openrtb2/flipp/test-auction-flipp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/flipp/test-auction-flipp-response.json index a6d946f403d..da840110dcf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/flipp/test-auction-flipp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/flipp/test-auction-flipp-response.json @@ -6,6 +6,7 @@ { "id": "183599115", "impid": "imp_id", + "exp": 300, "price": 12.34, "adm": "creativeContent", "crid": "81325690", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/freewheelssp/test-auction-freewheelssp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/freewheelssp/test-auction-freewheelssp-response.json index 834a4af5e9d..d583e32cc4f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/freewheelssp/test-auction-freewheelssp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/freewheelssp/test-auction-freewheelssp-response.json @@ -6,6 +6,7 @@ { "id": "12345_freewheelssp-test_1", "impid": "imp-1", + "exp": 1500, "price": 1.0, "adid": "7857", "adm": "", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/frvradn/test-auction-frvradn-response.json b/src/test/resources/org/prebid/server/it/openrtb2/frvradn/test-auction-frvradn-response.json index fb69a968abd..683c42863d0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/frvradn/test-auction-frvradn-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/frvradn/test-auction-frvradn-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json index ca56cb19b7e..ce0e41775aa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "29681110", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json index c88d409c2c2..4d6ea3f9060 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/generic/test-auction-generic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/generic/test-auction-generic-response.json index 808b06e512e..8f2d2e4407c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/generic/test-auction-generic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/generic/test-auction-generic-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-auction-generic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-auction-generic-response.json index 552408995c8..4ee1ff6a6c8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-auction-generic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-auction-generic-response.json @@ -6,6 +6,7 @@ { "id": "bid001", "impid": "impId001", + "exp": 1500, "price": 2.997, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-cache-generic-request.json b/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-cache-generic-request.json index 1b5c1802325..a6d65dfcae0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-cache-generic-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/generic_core_functionality/test-cache-generic-request.json @@ -36,7 +36,8 @@ "origbidcpm": 3.33 } }, - "aid": "tid" + "aid": "tid", + "ttlseconds" : 1500 } ] } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/globalsun/test-auction-globalsun-response.json b/src/test/resources/org/prebid/server/it/openrtb2/globalsun/test-auction-globalsun-response.json index 7ab5cf7f347..505a3ca4b5c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/globalsun/test-auction-globalsun-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/globalsun/test-auction-globalsun-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gothamads/test-auction-gothamads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gothamads/test-auction-gothamads-response.json index 4554400f4b1..728dccb2b13 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gothamads/test-auction-gothamads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gothamads/test-auction-gothamads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/greedygame/test-auction-greedygame-response.json b/src/test/resources/org/prebid/server/it/openrtb2/greedygame/test-auction-greedygame-response.json index df8a43a904f..7d19f2a3f5c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/greedygame/test-auction-greedygame-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/greedygame/test-auction-greedygame-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json index a71711d597d..f6a034ca8a3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json index 682e43e4516..7c131a1f180 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_app_promotion_type/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_app_promotion_type/test-huaweiads-auction-response.json index 95248ad02c0..2068eb254c5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_app_promotion_type/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_app_promotion_type/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ch_endpoint/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ch_endpoint/test-huaweiads-auction-response.json index c576adccb02..931449bc021 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ch_endpoint/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ch_endpoint/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_eu_endpoint/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_eu_endpoint/test-huaweiads-auction-response.json index c576adccb02..931449bc021 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_eu_endpoint/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_eu_endpoint/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_imei/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_imei/test-huaweiads-auction-response.json index c576adccb02..931449bc021 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_imei/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_imei/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_interstitial_type/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_interstitial_type/test-huaweiads-auction-response.json index 1ad60895c93..3f3b9084e45 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_interstitial_type/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_interstitial_type/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_mccmnc/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_mccmnc/test-huaweiads-auction-response.json index 033288ceb0e..d6d29d2c614 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_mccmnc/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_mccmnc/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 250, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 300, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_non_integer_mccmnc/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_non_integer_mccmnc/test-huaweiads-auction-response.json index 033288ceb0e..d6d29d2c614 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_non_integer_mccmnc/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_non_integer_mccmnc/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 250, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 300, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_not_app_promotion_type/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_not_app_promotion_type/test-huaweiads-auction-response.json index 3e1b8422400..05a00845f55 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_not_app_promotion_type/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_not_app_promotion_type/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 300, "w": 250, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ru_endpoint/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ru_endpoint/test-huaweiads-auction-response.json index 2b08c0e9f75..dee5e9c6ebb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ru_endpoint/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_ru_endpoint/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58025103", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 250, "w": 300, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_with_user_geo/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_with_user_geo/test-huaweiads-auction-response.json index 033288ceb0e..d6d29d2c614 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_with_user_geo/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_with_user_geo/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 250, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 300, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_device_geo/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_device_geo/test-huaweiads-auction-response.json index 033288ceb0e..d6d29d2c614 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_device_geo/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_device_geo/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 250, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 300, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_userext/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_userext/test-huaweiads-auction-response.json index 621a43422cf..2fcaffd7d5b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_userext/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_without_userext/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 300, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 250, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_wrong_mccmnc/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_wrong_mccmnc/test-huaweiads-auction-response.json index 033288ceb0e..d6d29d2c614 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_wrong_mccmnc/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/banner_wrong_mccmnc/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 250, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 300, "nurl":"" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_include_video/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_include_video/test-huaweiads-auction-response.json index aa5fa9e4250..78e93b06659 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_include_video/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_include_video/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58022259", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 500, "w": 600, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_single_image/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_single_image/test-huaweiads-auction-response.json index dde9fbcb4ea..3da566123a6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_single_image/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_single_image/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58022259", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 1280, "w": 720, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image/test-huaweiads-auction-response.json index 22f804c5841..8253f6b3e62 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58022259", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 350, "w": 400, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image_include_icon/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image_include_icon/test-huaweiads-auction-response.json index 898142d244c..b67ae7292e1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image_include_icon/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/native_three_image_include_icon/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58022259", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "h": 350, "w": 400, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/simple_video/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/simple_video/test-huaweiads-auction-response.json index a32f2cdc011..928b8e37d12 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/simple_video/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/simple_video/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 1280, "w": 720, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/test-huaweiads-auction-response.json index 048960f1312..c59dbe20672 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/test-huaweiads-auction-response.json @@ -29,6 +29,7 @@ "h": 300, "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 0.404, "w": 250, "nurl": "" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_interstitial_type/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_interstitial_type/test-huaweiads-auction-response.json index 84bfd612d2e..2d7403f3e7e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_interstitial_type/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_interstitial_type/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 500, "w": 600, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_no_icons_no_images/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_no_icons_no_images/test-huaweiads-auction-response.json index 84bfd612d2e..2d7403f3e7e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_no_icons_no_images/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_no_icons_no_images/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 500, "w": 600, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_icon/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_icon/test-huaweiads-auction-response.json index edf5ff6ca1e..72686361101 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_icon/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_icon/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 500, "w": 600, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_images/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_images/test-huaweiads-auction-response.json index aa9c0cccf38..9425d23926c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_images/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_rewarded_type_with_images/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 500, "w": 600, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_roll_type/test-huaweiads-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_roll_type/test-huaweiads-auction-response.json index dde2af86099..16f6247161f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_roll_type/test-huaweiads-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/huaweiads/video_roll_type/test-huaweiads-auction-response.json @@ -21,6 +21,7 @@ "crid": "58001445", "id": "test-imp-id", "impid": "test-imp-id", + "exp": 1500, "price": 0.404, "h": 1280, "w": 720, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/iionads/test-auction-iionads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/iionads/test-auction-iionads-response.json index e5e6af0ffa2..e37c977df53 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/iionads/test-auction-iionads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/iionads/test-auction-iionads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/imds/test-auction-imds-response.json b/src/test/resources/org/prebid/server/it/openrtb2/imds/test-auction-imds-response.json index 42b87323685..8eae0a3d518 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/imds/test-auction-imds-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/imds/test-auction-imds-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 7.77, "adm": "adm001", "adid": "adid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json index 4bfd0bcee03..9ea7cb8766f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json index 2ed506e5a4c..a826a40c221 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/indicue/test-auction-indicue-response.json b/src/test/resources/org/prebid/server/it/openrtb2/indicue/test-auction-indicue-response.json index c561c6a98e8..6361cafe796 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/indicue/test-auction-indicue-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/indicue/test-auction-indicue-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/infytv/test-auction-infytv-response.json b/src/test/resources/org/prebid/server/it/openrtb2/infytv/test-auction-infytv-response.json index d5d69df907e..55bd555ed6b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/infytv/test-auction-infytv-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/infytv/test-auction-infytv-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json index ea2a8cebd9e..d2d1bd207fa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/interactiveoffers/test-auction-interactiveoffers-response.json b/src/test/resources/org/prebid/server/it/openrtb2/interactiveoffers/test-auction-interactiveoffers-response.json index 174c7a0894b..3100814d919 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/interactiveoffers/test-auction-interactiveoffers-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/interactiveoffers/test-auction-interactiveoffers-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 10, "adomain": [ ], @@ -33,4 +34,4 @@ "auctiontimestamp": 0 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/intertech/test-auction-intertech-response.json b/src/test/resources/org/prebid/server/it/openrtb2/intertech/test-auction-intertech-response.json index 9255d5d9323..9a0fc145939 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/intertech/test-auction-intertech-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/intertech/test-auction-intertech-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json index c07c5d21b49..4322850fa9d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.3, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/iqx/test-auction-iqx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/iqx/test-auction-iqx-response.json index 76ef74b808d..3fc5c87e169 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/iqx/test-auction-iqx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/iqx/test-auction-iqx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "mtype": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/iqzone/test-auction-iqzone-response.json b/src/test/resources/org/prebid/server/it/openrtb2/iqzone/test-auction-iqzone-response.json index 4a6e48aac57..b73fb55b074 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/iqzone/test-auction-iqzone-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/iqzone/test-auction-iqzone-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "mtype": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json index 8685c8ede1a..c2c8e90c3f5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.7, "adm": "adm6", "crid": "crid6", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/jdpmedia/test-auction-jdpmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/jdpmedia/test-auction-jdpmedia-response.json index 48fed77c3e7..31a01fdf368 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/jdpmedia/test-auction-jdpmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/jdpmedia/test-auction-jdpmedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/jixie/test-auction-jixie-response.json b/src/test/resources/org/prebid/server/it/openrtb2/jixie/test-auction-jixie-response.json index f9c2484affa..196ed6b59e7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/jixie/test-auction-jixie-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/jixie/test-auction-jixie-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kargo/test-auction-kargo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kargo/test-auction-kargo-response.json index 10481c0accb..2589f6a4a4d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kargo/test-auction-kargo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kargo/test-auction-kargo-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kayzen/test-auction-kayzen-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kayzen/test-auction-kayzen-response.json index 6b513b46072..aaccad9be2d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kayzen/test-auction-kayzen-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kayzen/test-auction-kayzen-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json index 668b51a85a8..5cec9fef037 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kiviads/test-auction-kiviads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kiviads/test-auction-kiviads-response.json index 046aeaa3005..07da2713c33 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kiviads/test-auction-kiviads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kiviads/test-auction-kiviads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json index 25228273c75..56f25641c69 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lemmaDigital/test-auction-lemmaDigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lemmaDigital/test-auction-lemmaDigital-response.json index a21706f9abf..59dc0706b2d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lemmaDigital/test-auction-lemmaDigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lemmaDigital/test-auction-lemmaDigital-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/liftoff/test-auction-liftoff-response.json b/src/test/resources/org/prebid/server/it/openrtb2/liftoff/test-auction-liftoff-response.json index 999b4184dbd..e90d9b5f6aa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/liftoff/test-auction-liftoff-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/liftoff/test-auction-liftoff-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adid": "adid001", "adm": "", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/limelightDigital/test-auction-limelightDigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/limelightDigital/test-auction-limelightDigital-response.json index 409ecdcd328..5bf9bad0853 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/limelightDigital/test-auction-limelightDigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/limelightDigital/test-auction-limelightDigital-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lmkiviads/test-auction-lmkiviads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lmkiviads/test-auction-lmkiviads-response.json index 1036e1e84d0..200e13238f8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lmkiviads/test-auction-lmkiviads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lmkiviads/test-auction-lmkiviads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json index 0433389b511..d1ae959bebe 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 7.35, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/logan/test-auction-logan-response.json b/src/test/resources/org/prebid/server/it/openrtb2/logan/test-auction-logan-response.json index 5079a616a00..f5503cf319d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/logan/test-auction-logan-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/logan/test-auction-logan-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json index dd7aa14d18c..4319787685b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/loopme/test-auction-loopme-response.json b/src/test/resources/org/prebid/server/it/openrtb2/loopme/test-auction-loopme-response.json index 2c86435fb5b..30397fe4de4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/loopme/test-auction-loopme-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/loopme/test-auction-loopme-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/loyal/test-auction-loyal-response.json b/src/test/resources/org/prebid/server/it/openrtb2/loyal/test-auction-loyal-response.json index 80cbbdf2ebb..58b5b47ee41 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/loyal/test-auction-loyal-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/loyal/test-auction-loyal-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "mtype": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json index a7c3e9ba1e2..194301eae99 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mabidder/test-auction-mabidder-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mabidder/test-auction-mabidder-response.json index dacba278abe..28e33d7e084 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mabidder/test-auction-mabidder-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mabidder/test-auction-mabidder-response.json @@ -6,6 +6,7 @@ { "id": "test-imp-id", "impid": "test-imp-id", + "exp": 300, "price": 2.734, "adm": "", "adomain": [ diff --git a/src/test/resources/org/prebid/server/it/openrtb2/madvertise/test-auction-madvertise-response.json b/src/test/resources/org/prebid/server/it/openrtb2/madvertise/test-auction-madvertise-response.json index c7c4540bd47..1c31dddaea0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/madvertise/test-auction-madvertise-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/madvertise/test-auction-madvertise-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-auction-magnite-response.json b/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-auction-magnite-response.json index fd8cbf0a699..111e147d710 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-auction-magnite-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-auction-magnite-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/markapp/test-auction-markapp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/markapp/test-auction-markapp-response.json index dad8c29bdf5..a6bccc7525a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/markapp/test-auction-markapp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/markapp/test-auction-markapp-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json index 8bd2fdc004e..b2536b23494 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 7.35, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mediago/test-auction-mediago-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mediago/test-auction-mediago-response.json index 5c5f50670a2..7eb299b660f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mediago/test-auction-mediago-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mediago/test-auction-mediago-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/medianet/test-auction-medianet-response.json b/src/test/resources/org/prebid/server/it/openrtb2/medianet/test-auction-medianet-response.json index 14ebb3b62f8..55b8dba2496 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/medianet/test-auction-medianet-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/medianet/test-auction-medianet-response.json @@ -6,6 +6,7 @@ { "id": "randomid", "impid": "test-imp-id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "12345678", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/melozen/test-auction-melozen-response.json b/src/test/resources/org/prebid/server/it/openrtb2/melozen/test-auction-melozen-response.json index 42c6696f9bb..a810ba066a1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/melozen/test-auction-melozen-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/melozen/test-auction-melozen-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/metax/test-auction-metax-response.json b/src/test/resources/org/prebid/server/it/openrtb2/metax/test-auction-metax-response.json index b37ebc3ebea..82cc50b31be 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/metax/test-auction-metax-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/metax/test-auction-metax-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json index 89dc1790afe..f2c474641aa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.5, "nurl": "nurl", "adm": "some-test-ad", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mgidx/test-auction-mgidx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mgidx/test-auction-mgidx-response.json index 217cac91e56..d24c8274ed9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mgidx/test-auction-mgidx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mgidx/test-auction-mgidx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/minutemedia/test-auction-minutemedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/minutemedia/test-auction-minutemedia-response.json index 898532edc4b..10cdbd0a6f5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/minutemedia/test-auction-minutemedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/minutemedia/test-auction-minutemedia-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "banner_imp_id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "29681110", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/missena/test-auction-missena-response.json b/src/test/resources/org/prebid/server/it/openrtb2/missena/test-auction-missena-response.json index d76e9f071e5..28f9caabf7e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/missena/test-auction-missena-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/missena/test-auction-missena-response.json @@ -6,6 +6,7 @@ { "id": "request_id", "impid": "imp_id", + "exp": 300, "price": 10.2, "adm": "adm", "crid": "id", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json index 1c1fbe7791b..fb8a20ae2b0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "", "cid": "test_cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json index d4ff118ad3c..3f22980426a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adm": "hi", "cid": "test_cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/motorik/test-auction-motorik-response.json b/src/test/resources/org/prebid/server/it/openrtb2/motorik/test-auction-motorik-response.json index 17ba2b420b7..fba432c5be4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/motorik/test-auction-motorik-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/motorik/test-auction-motorik-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-auction-generic-genericAlias-response.json b/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-auction-generic-genericAlias-response.json index bfd9600aa75..1e4f6f4a489 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-auction-generic-genericAlias-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-auction-generic-genericAlias-response.json @@ -11,7 +11,7 @@ "crid": "crid1", "w": 300, "h": 250, - "exp": 120, + "exp": 1500, "ext": { "prebid": { "type": "video", @@ -68,7 +68,7 @@ "crid": "crid1", "w": 300, "h": 250, - "exp": 120, + "exp": 1500, "ext": { "prebid": { "type": "video", @@ -128,7 +128,7 @@ "iurl": "http://nym1-ib.adnxs.com/cr?id=29681110", "cid": "958", "crid": "29681110", - "exp": 120, + "exp": 1500, "ext": { "prebid": { "type": "video", @@ -179,7 +179,7 @@ "iurl": "http://nym1-ib.adnxs.com/cr?id=69595837", "cid": "958", "crid": "69595837", - "exp": 120, + "exp": 1500, "ext": { "prebid": { "type": "video", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-cache-generic-genericAlias-request.json b/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-cache-generic-genericAlias-request.json index 2d951abdbab..770ee7c9d39 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-cache-generic-genericAlias-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/multi_bid/test-cache-generic-genericAlias-request.json @@ -32,7 +32,8 @@ }, "wurl": "http://localhost:8080/event?t=win&b=21521324&a=5001&aid=tid&ts=1000&bidder=generic&f=i&int=" }, - "aid": "tid" + "aid": "tid", + "ttlseconds": 1500 }, { "type": "json", @@ -68,7 +69,8 @@ }, "wurl": "http://localhost:8080/event?t=win&b=7706636740145184841&a=5001&aid=tid&ts=1000&bidder=genericAlias&f=i&int=" }, - "aid": "tid" + "aid": "tid", + "ttlseconds": 1500 }, { "type": "json", @@ -102,7 +104,8 @@ }, "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&aid=tid&ts=1000&bidder=generic&f=i&int=" }, - "aid": "tid" + "aid": "tid", + "ttlseconds": 1500 }, { "type": "json", @@ -138,7 +141,8 @@ }, "wurl": "http://localhost:8080/event?t=win&b=222214214214&a=5001&aid=tid&ts=1000&bidder=genericAlias&f=i&int=" }, - "aid": "tid" + "aid": "tid", + "ttlseconds": 1500 }, { "type": "xml", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nextmillennium/test-auction-nextmillennium-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nextmillennium/test-auction-nextmillennium-response.json index 71068f2cb94..be5cf8b9277 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nextmillennium/test-auction-nextmillennium-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nextmillennium/test-auction-nextmillennium-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "mtype": 1, "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json index fc7edb8ce86..ebeea62aba0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/oms/test-auction-oms-response.json b/src/test/resources/org/prebid/server/it/openrtb2/oms/test-auction-oms-response.json index f6a94e868a8..315114b4f75 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/oms/test-auction-oms-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/oms/test-auction-oms-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/onetag/test-auction-onetag-response.json b/src/test/resources/org/prebid/server/it/openrtb2/onetag/test-auction-onetag-response.json index 80373e03cb7..4496bc2e4b6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/onetag/test-auction-onetag-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/onetag/test-auction-onetag-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "adid", "cid": "cid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/openweb/test-auction-openweb-response.json b/src/test/resources/org/prebid/server/it/openrtb2/openweb/test-auction-openweb-response.json index 53761fd9c76..a996e780237 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/openweb/test-auction-openweb-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/openweb/test-auction-openweb-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "mtype": 1, "price": 5.78, "adm": "adm00", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json index 8ffbc819833..0c22b5e89b9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 5.78, "adm": "adm00", "crid": "crid00", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/operaads/test-auction-operaads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/operaads/test-auction-operaads-response.json index 2c7b4e4f22c..91f9dc59e5c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/operaads/test-auction-operaads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/operaads/test-auction-operaads-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/oraki/test-auction-oraki-response.json b/src/test/resources/org/prebid/server/it/openrtb2/oraki/test-auction-oraki-response.json index 6871f609875..4bbd63fe482 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/oraki/test-auction-oraki-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/oraki/test-auction-oraki-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json index 1a260bfa518..40a02aff7f5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json @@ -16,6 +16,7 @@ }, "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "mtype": 1 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/outbrain/test-auction-outbrain-response.json b/src/test/resources/org/prebid/server/it/openrtb2/outbrain/test-auction-outbrain-response.json index 6c19a2a44b7..cb7fbc34fe8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/outbrain/test-auction-outbrain-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/outbrain/test-auction-outbrain-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ownadx/test-auction-ownadx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ownadx/test-auction-ownadx-response.json index 38e6c451540..d7a74ef6d6d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ownadx/test-auction-ownadx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ownadx/test-auction-ownadx-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "mtype": 1, "price": 3.33, "adm": "adm001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pangle/test-auction-pangle-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pangle/test-auction-pangle-response.json index 7a0cf377706..b0995267c08 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pangle/test-auction-pangle-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pangle/test-auction-pangle-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 1.25, "adm": "adm001", "crid": "crid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pgam/test-auction-pgam-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pgam/test-auction-pgam-response.json index 79f17402a81..82e6a8182df 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pgam/test-auction-pgam-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pgam/test-auction-pgam-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pgamssp/test-auction-pgamssp-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pgamssp/test-auction-pgamssp-response.json index f2c7121be84..303e8a7826c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pgamssp/test-auction-pgamssp-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pgamssp/test-auction-pgamssp-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.01, "adid": "2068416", "cid": "8048", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/playdigo/test-auction-playdigo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/playdigo/test-auction-playdigo-response.json index 1c26c09c8c7..8bfc8b3f515 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/playdigo/test-auction-playdigo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/playdigo/test-auction-playdigo-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "mtype": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/preciso/test-auction-preciso-response.json b/src/test/resources/org/prebid/server/it/openrtb2/preciso/test-auction-preciso-response.json index 2b363db2f29..c26bf519990 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/preciso/test-auction-preciso-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/preciso/test-auction-preciso-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "some-test-ad", "adid": "12345678", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json index 53731b03bf0..4df8cf0c723 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "test-imp-id", + "exp": 1500, "price": 4.75, "adm": "adm9", "crid": "crid9", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json index 7b7334c52fe..d263e2b1f43 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubrise/test-auction-pubrise-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pubrise/test-auction-pubrise-response.json index a49d1f99e75..752b5519b40 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubrise/test-auction-pubrise-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubrise/test-auction-pubrise-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json index 332e1cae3ac..88c15aebf71 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 4.75, "adm": "adm8", "crid": "crid8", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pwbid/test-auction-pwbid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pwbid/test-auction-pwbid-response.json index 0f38f603a90..b6c810ede52 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pwbid/test-auction-pwbid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pwbid/test-auction-pwbid-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 8.43, "adm": "adm14", "crid": "crid14", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/qt/test-auction-qt-response.json b/src/test/resources/org/prebid/server/it/openrtb2/qt/test-auction-qt-response.json index 4ebd8ee119a..16db7e67c68 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/qt/test-auction-qt-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/qt/test-auction-qt-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 1.25, "adm": "adm001", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/readpeak/test-auction-readpeak-response.json b/src/test/resources/org/prebid/server/it/openrtb2/readpeak/test-auction-readpeak-response.json index 101455149d7..06a8c3170aa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/readpeak/test-auction-readpeak-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/readpeak/test-auction-readpeak-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "crid": "creativeId", "mtype": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/relevantdigital/test-auction-relevantdigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/relevantdigital/test-auction-relevantdigital-response.json index 9e1e479b4ed..d3531b49cca 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/relevantdigital/test-auction-relevantdigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/relevantdigital/test-auction-relevantdigital-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 1500, "price": 5.78, "adm": "adm", "crid": "crid", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/resetdigital/test-auction-resetdigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/resetdigital/test-auction-resetdigital-response.json index c3de29e49d4..f595ea39c9f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/resetdigital/test-auction-resetdigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/resetdigital/test-auction-resetdigital-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 3.33, "adm": "adm001", "adid": "adid001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json index a2acc3d4df5..4e6047c3738 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json @@ -6,6 +6,7 @@ { "id": "bid_id", "impid": "imp_id", + "exp": 300, "price": 0.5, "adm": "