diff --git a/extra/modules/pb-ortb2-blocking/README.md b/extra/modules/pb-ortb2-blocking/README.md index e0ae450b370..a964edd7a85 100644 --- a/extra/modules/pb-ortb2-blocking/README.md +++ b/extra/modules/pb-ortb2-blocking/README.md @@ -12,7 +12,7 @@ This module allows Prebid Server host companies to better support adapters that # Maintainer contacts -Any suggestions or questions can be directed to [header-bidding@rubiconproject.com](header-bidding@rubiconproject.com) +Any suggestions or questions can be directed to [header-bidding@magnite.com](header-bidding@magnite.com) e-mail. Or just open new [issue](https://github.com/prebid/prebid-server-java/issues/new) diff --git a/sample/configs/prebid-config-db.yaml b/sample/configs/prebid-config-db.yaml index 666ffb69a55..8fb31f4a22e 100644 --- a/sample/configs/prebid-config-db.yaml +++ b/sample/configs/prebid-config-db.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/sample/configs/prebid-config-s3.yaml b/sample/configs/prebid-config-s3.yaml index 09620ceec87..ff2e9e15086 100644 --- a/sample/configs/prebid-config-s3.yaml +++ b/sample/configs/prebid-config-s3.yaml @@ -13,7 +13,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/sample/configs/prebid-config-with-51d-dd.yaml b/sample/configs/prebid-config-with-51d-dd.yaml index 1e29ec1d997..c5ddea986d0 100644 --- a/sample/configs/prebid-config-with-51d-dd.yaml +++ b/sample/configs/prebid-config-with-51d-dd.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/sample/configs/prebid-config-with-module.yaml b/sample/configs/prebid-config-with-module.yaml index 959a4cef2af..9c0fc93ca42 100644 --- a/sample/configs/prebid-config-with-module.yaml +++ b/sample/configs/prebid-config-with-module.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/sample/configs/prebid-config-with-optable.yaml b/sample/configs/prebid-config-with-optable.yaml index ef2d59037bf..d5a938f47ac 100644 --- a/sample/configs/prebid-config-with-optable.yaml +++ b/sample/configs/prebid-config-with-optable.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true improvedigital: enabled: true diff --git a/sample/configs/prebid-config-with-wurfl.yaml b/sample/configs/prebid-config-with-wurfl.yaml index 9a82d459195..f7faf43d178 100644 --- a/sample/configs/prebid-config-with-wurfl.yaml +++ b/sample/configs/prebid-config-with-wurfl.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/sample/configs/prebid-config.yaml b/sample/configs/prebid-config.yaml index f969f25bd60..6079c7a0d36 100644 --- a/sample/configs/prebid-config.yaml +++ b/sample/configs/prebid-config.yaml @@ -8,7 +8,7 @@ adapters: enabled: true pubmatic: enabled: true - rubicon: + magnite: enabled: true metrics: prefix: prebid diff --git a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java index 16af4e15d71..a7224de4efc 100644 --- a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java +++ b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java @@ -35,7 +35,7 @@ public class TargetingKeywordsCreator { */ private static final String ENV_KEY = "_env"; /** - * Name of the Bidder. For example, "appnexus" or "rubicon". + * Name of the Bidder. For example, "appnexus" or "magnite". */ private static final String BIDDER_KEY = "_bidder"; /** diff --git a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java b/src/main/java/org/prebid/server/bidder/magnite/MagniteBidder.java similarity index 85% rename from src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java rename to src/main/java/org/prebid/server/bidder/magnite/MagniteBidder.java index 827822ab127..06250d70528 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java +++ b/src/main/java/org/prebid/server/bidder/magnite/MagniteBidder.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon; +package org.prebid.server.bidder.magnite; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; @@ -34,39 +34,39 @@ import org.apache.commons.lang3.math.NumberUtils; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.ViewabilityVendors; +import org.prebid.server.bidder.magnite.proto.request.MagniteAppExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteBannerExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteBannerExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteDeviceExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteDeviceExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteExtPrebidBidders; +import org.prebid.server.bidder.magnite.proto.request.MagniteExtPrebidBiddersBidder; +import org.prebid.server.bidder.magnite.proto.request.MagniteExtPrebidBiddersBidderDebug; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRpRtb; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRpTrack; +import org.prebid.server.bidder.magnite.proto.request.MagniteNative; +import org.prebid.server.bidder.magnite.proto.request.MagnitePubExt; +import org.prebid.server.bidder.magnite.proto.request.MagnitePubExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteSiteExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteSiteExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargeting; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargetingExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargetingExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteUserExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteUserExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteVideoExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteVideoExtRp; +import org.prebid.server.bidder.magnite.proto.response.MagniteBid; +import org.prebid.server.bidder.magnite.proto.response.MagniteBidResponse; +import org.prebid.server.bidder.magnite.proto.response.MagniteSeatBid; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; import org.prebid.server.bidder.model.BidderError; import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.PriceFloorInfo; import org.prebid.server.bidder.model.Result; -import org.prebid.server.bidder.rubicon.proto.request.RubiconAppExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconBannerExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconBannerExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconDeviceExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconDeviceExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconExtPrebidBidders; -import org.prebid.server.bidder.rubicon.proto.request.RubiconExtPrebidBiddersBidder; -import org.prebid.server.bidder.rubicon.proto.request.RubiconExtPrebidBiddersBidderDebug; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRpRtb; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRpTrack; -import org.prebid.server.bidder.rubicon.proto.request.RubiconNative; -import org.prebid.server.bidder.rubicon.proto.request.RubiconPubExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconPubExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconSiteExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconSiteExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargeting; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargetingExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargetingExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconUserExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconUserExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconVideoExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconVideoExtRp; -import org.prebid.server.bidder.rubicon.proto.response.RubiconBid; -import org.prebid.server.bidder.rubicon.proto.response.RubiconBidResponse; -import org.prebid.server.bidder.rubicon.proto.response.RubiconSeatBid; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.exception.PreBidException; import org.prebid.server.floors.PriceFloorResolver; @@ -96,9 +96,9 @@ import org.prebid.server.proto.openrtb.ext.request.ExtSource; import org.prebid.server.proto.openrtb.ext.request.ExtUser; import org.prebid.server.proto.openrtb.ext.request.ImpMediaType; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubicon; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubiconDebug; -import org.prebid.server.proto.openrtb.ext.request.rubicon.RubiconVideoParams; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagnite; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagniteDebug; +import org.prebid.server.proto.openrtb.ext.request.magnite.MagniteVideoParams; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidMeta; @@ -128,9 +128,9 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -public class RubiconBidder implements Bidder { +public class MagniteBidder implements Bidder { - private static final Logger logger = LoggerFactory.getLogger(RubiconBidder.class); + private static final Logger logger = LoggerFactory.getLogger(MagniteBidder.class); private static final ConditionalLogger missingVideoSizeLogger = new ConditionalLogger("missing_video_size", logger); @@ -168,7 +168,7 @@ public class RubiconBidder implements Bidder { private static final Set STYPE_TO_REMOVE = new HashSet<>(Arrays.asList(PPUID_STYPE, SHA256EMAIL_STYPE, DMP_STYPE)); - private static final TypeReference> RUBICON_EXT_TYPE_REFERENCE = + private static final TypeReference> MAGNITE_EXT_TYPE_REFERENCE = new TypeReference<>() { }; private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = @@ -192,7 +192,7 @@ public class RubiconBidder implements Bidder { private final MultiMap headers; - public RubiconBidder(String bidderName, + public MagniteBidder(String bidderName, String endpoint, String defaultTkXInt, String externalUrl, @@ -231,18 +231,18 @@ public Result>> makeHttpRequests(BidRequest bidRequ final List imps = extractValidImps(bidRequest, errors); if (CollectionUtils.isEmpty(imps)) { - errors.add(BidderError.badInput("There are no valid impressions to create bid request to rubicon bidder")); + errors.add(BidderError.badInput("There are no valid impressions to create bid request to magnite bidder")); return Result.withErrors(errors); } - final Map impToImpExt = parseRubiconImpExts(imps, errors); + final Map impToImpExt = parseMagniteImpExts(imps, errors); final String language = firstImpExtLanguage(impToImpExt.values()); final String uri = makeUri(bidRequest); - for (Map.Entry impToExt : impToImpExt.entrySet()) { + for (Map.Entry impToExt : impToImpExt.entrySet()) { try { final Imp imp = impToExt.getKey(); - final ExtImpRubicon impExt = impToExt.getValue(); + final ExtImpMagnite impExt = impToExt.getValue(); final String pbBidId = generateBidId ? idGenerator.generateId() : null; final List impBidRequests = isMultiformatEnabled(impExt) ? createMultiFormatRequests(bidRequest, imp, impExt, pbBidId, language, errors) @@ -259,7 +259,7 @@ public Result>> makeHttpRequests(BidRequest bidRequ private List createMultiFormatRequests(BidRequest bidRequest, Imp imp, - ExtImpRubicon impExt, + ExtImpMagnite impExt, String pbBidId, String language, List errors) { @@ -316,8 +316,8 @@ private List> createImpHttpRequests(Imp imp, List> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final List errors = new ArrayList<>(); - final RubiconBidResponse bidResponse = - mapper.decodeValue(httpCall.getResponse().getBody(), RubiconBidResponse.class); + final MagniteBidResponse bidResponse = + mapper.decodeValue(httpCall.getResponse().getBody(), MagniteBidResponse.class); return Result.of(extractBids(bidRequest, httpCall.getRequest().getPayload(), bidResponse, errors), errors); } catch (DecodeException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); @@ -326,26 +326,26 @@ public Result> makeBids(BidderCall httpCall, BidRequ @Override public Map extractTargeting(ObjectNode extBidBidder) { - final RubiconTargetingExt rubiconTargetingExt; + final MagniteTargetingExt magniteTargetingExt; try { - rubiconTargetingExt = mapper.mapper().convertValue(extBidBidder, RubiconTargetingExt.class); + magniteTargetingExt = mapper.mapper().convertValue(extBidBidder, MagniteTargetingExt.class); } catch (IllegalArgumentException e) { - logger.warn("Error adding rubicon specific targeting to amp response", e); + logger.warn("Error adding magnite specific targeting to amp response", e); return Collections.emptyMap(); } - final RubiconTargetingExtRp rp = rubiconTargetingExt.getRp(); - final List targetings = rp != null ? rp.getTargeting() : null; + final MagniteTargetingExtRp rp = magniteTargetingExt.getRp(); + final List targetings = rp != null ? rp.getTargeting() : null; return targetings != null ? targetings.stream() .filter(targeting -> !CollectionUtils.isEmpty(targeting.getValues())) - .collect(Collectors.toMap(RubiconTargeting::getKey, targeting -> targeting.getValues().getFirst())) + .collect(Collectors.toMap(MagniteTargeting::getKey, targeting -> targeting.getValues().getFirst())) : Collections.emptyMap(); } private List extractValidImps(BidRequest bidRequest, List errors) { final Map> isValidToImps = bidRequest.getImp().stream() - .collect(Collectors.groupingBy(RubiconBidder::isValidType)); + .collect(Collectors.groupingBy(MagniteBidder::isValidType)); isValidToImps.getOrDefault(false, Collections.emptyList()).stream() .map(this::impTypeErrorMessage) @@ -391,11 +391,11 @@ private static String authHeader(String xapiUsername, String xapiPassword) { return "Basic " + Base64.getEncoder().encodeToString((xapiUsername + ':' + xapiPassword).getBytes()); } - private Map parseRubiconImpExts(List imps, List errors) { - final Map impToImpExt = new HashMap<>(); + private Map parseMagniteImpExts(List imps, List errors) { + final Map impToImpExt = new HashMap<>(); for (final Imp imp : imps) { try { - impToImpExt.put(imp, parseRubiconExt(imp)); + impToImpExt.put(imp, parseMagniteExt(imp)); } catch (PreBidException e) { errors.add(BidderError.badInput(e.getMessage())); } @@ -403,26 +403,26 @@ private Map parseRubiconImpExts(List imps, List rubiconImpExts) { - return rubiconImpExts.stream() + private static String firstImpExtLanguage(Collection magniteImpExts) { + return magniteImpExts.stream() .filter(Objects::nonNull) - .map(ExtImpRubicon::getVideo) + .map(ExtImpMagnite::getVideo) .filter(Objects::nonNull) - .map(RubiconVideoParams::getLanguage) + .map(MagniteVideoParams::getLanguage) .filter(StringUtils::isNotBlank) .findFirst() .orElse(null); @@ -430,18 +430,18 @@ private static String firstImpExtLanguage(Collection rubiconImpEx private BidRequest createSingleRequest(BidRequest bidRequest, Imp imp, - ExtImpRubicon extImpRubicon, + ExtImpMagnite extImpMagnite, String pbBidId, Set formats, String impLanguage, List errors) { return bidRequest.toBuilder() - .imp(Collections.singletonList(makeImp(imp, extImpRubicon, bidRequest, pbBidId, formats, errors))) - .user(downgradeUserConsent(makeUser(bidRequest.getUser(), extImpRubicon))) + .imp(Collections.singletonList(makeImp(imp, extImpMagnite, bidRequest, pbBidId, formats, errors))) + .user(downgradeUserConsent(makeUser(bidRequest.getUser(), extImpMagnite))) .device(makeDevice(bidRequest.getDevice())) - .site(makeSite(bidRequest.getSite(), impLanguage, extImpRubicon)) - .app(makeApp(bidRequest.getApp(), extImpRubicon)) + .site(makeSite(bidRequest.getSite(), impLanguage, extImpMagnite)) + .app(makeApp(bidRequest.getApp(), extImpMagnite)) .source(makeSource(bidRequest.getSource())) .cur(null) // suppress currencies .regs(makeRegs(bidRequest.getRegs())) @@ -469,13 +469,13 @@ private String tkXintValue(BidRequest bidRequest) { return StringUtils.stripToNull(integration); } - private RubiconExtPrebidBiddersBidder extPrebidBiddersRubicon(ExtRequest extRequest) { + private MagniteExtPrebidBiddersBidder extPrebidBiddersMagnite(ExtRequest extRequest) { final ExtRequestPrebid prebid = extRequest == null ? null : extRequest.getPrebid(); final ObjectNode biddersNode = prebid == null ? null : prebid.getBidders(); if (biddersNode != null) { try { - final RubiconExtPrebidBidders bidders = mapper.mapper().convertValue(biddersNode, - RubiconExtPrebidBidders.class); + final MagniteExtPrebidBidders bidders = mapper.mapper().convertValue(biddersNode, + MagniteExtPrebidBidders.class); return bidders == null ? null : bidders.getBidder(); } catch (IllegalArgumentException e) { return null; @@ -485,7 +485,7 @@ private RubiconExtPrebidBiddersBidder extPrebidBiddersRubicon(ExtRequest extRequ } private Imp makeImp(Imp imp, - ExtImpRubicon extImpRubicon, + ExtImpMagnite extImpMagnite, BidRequest bidRequest, String pbImpId, Set formats, @@ -498,7 +498,7 @@ private Imp makeImp(Imp imp, final List priceFloorsWarnings = new ArrayList<>(); final PriceFloorResult priceFloorResult = resolvePriceFloors(bidRequest, imp, impType, priceFloorsWarnings); - final Set resolvedFormats = ObjectUtils.defaultIfNull(extImpRubicon.getFormats(), formats); + final Set resolvedFormats = ObjectUtils.defaultIfNull(extImpMagnite.getFormats(), formats); final BigDecimal ipfFloor = ObjectUtil.getIfNotNull(priceFloorResult, PriceFloorResult::getFloorValue); final String ipfCurrency = ipfFloor != null @@ -512,7 +512,7 @@ private Imp makeImp(Imp imp, final Imp.ImpBuilder builder = imp.toBuilder() .metric(makeMetrics(imp)) .ext(mapper.mapper().valueToTree( - makeImpExt(imp, extImpRubicon, resolvedFormats, site, app, extRequest, pbImpId))); + makeImpExt(imp, extImpMagnite, resolvedFormats, site, app, extRequest, pbImpId))); final BigDecimal resolvedBidFloor = ipfFloor != null ? convertToXAPICurrency(ipfFloor, ipfCurrency, imp, bidRequest) @@ -529,7 +529,7 @@ private Imp makeImp(Imp imp, .banner(null) .xNative(null) .rwdd(null) - .video(makeVideo(imp, extImpRubicon.getVideo(), referer(site))); + .video(makeVideo(imp, extImpMagnite.getVideo(), referer(site))); case banner -> builder .banner(makeBanner(imp)) .xNative(null) @@ -667,27 +667,27 @@ private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, } } - private RubiconImpExt makeImpExt(Imp imp, - ExtImpRubicon rubiconImpExt, + private MagniteImpExt makeImpExt(Imp imp, + ExtImpMagnite magniteImpExt, Set formats, Site site, App app, ExtRequest extRequest, String pbBidId) { - final RubiconImpExtRpRtb rubiconImpExtRpRtb = CollectionUtils.isNotEmpty(formats) - ? RubiconImpExtRpRtb.of(formats) + final MagniteImpExtRpRtb magniteImpExtRpRtb = CollectionUtils.isNotEmpty(formats) + ? MagniteImpExtRpRtb.of(formats) : null; - final RubiconImpExtRp rubiconImpExtRp = RubiconImpExtRp.of( - rubiconImpExt.getZoneId(), - makeTarget(imp, rubiconImpExt, site, app), - RubiconImpExtRpTrack.of("", ""), - rubiconImpExtRpRtb, + final MagniteImpExtRp magniteImpExtRp = MagniteImpExtRp.of( + magniteImpExt.getZoneId(), + makeTarget(imp, magniteImpExt, site, app), + MagniteImpExtRpTrack.of("", ""), + magniteImpExtRpRtb, pbBidId); - return RubiconImpExt.builder() - .rp(rubiconImpExtRp) + return MagniteImpExt.builder() + .rp(magniteImpExtRp) .viewabilityvendors(mapVendorsNamesToUrls(imp.getMetric())) .maxbids(getMaxBids(extRequest)) .gpid(getGpid(imp.getExt())) @@ -696,14 +696,14 @@ private RubiconImpExt makeImpExt(Imp imp, .build(); } - private JsonNode makeTarget(Imp imp, ExtImpRubicon rubiconImpExt, Site site, App app) { + private JsonNode makeTarget(Imp imp, ExtImpMagnite magniteImpExt, Site site, App app) { final ObjectNode result = mapper.mapper().createObjectNode(); - populateFirstPartyDataAttributes(rubiconImpExt.getInventory(), result); + populateFirstPartyDataAttributes(magniteImpExt.getInventory(), result); mergeFirstPartyDataFromSite(site, result); mergeFirstPartyDataFromApp(app, result); - mergeFirstPartyDataFromImp(imp, rubiconImpExt, result); + mergeFirstPartyDataFromImp(imp, magniteImpExt, result); result.put(PBS_LOGIN, xapiUsername); result.put(PBS_VERSION, versionProvider.getNameVersionRecord()); @@ -732,13 +732,13 @@ private void mergeFirstPartyDataFromApp(App app, ObjectNode result) { } private void mergeFirstPartyDataFromImp(Imp imp, - ExtImpRubicon rubiconImpExt, + ExtImpMagnite magniteImpExt, ObjectNode result) { mergeFirstPartyDataFromData(imp, result); mergeFirstPartyDataKeywords(imp, result); - // merge OPENRTB.imp[].ext.rubicon.keywords to XAPI.imp[].ext.rp.target.keywords - mergeCollectionAttributeIntoArray(result, rubiconImpExt, ExtImpRubicon::getKeywords, FPD_KEYWORDS_FIELD); + // merge OPENRTB.imp[].ext.magnite.keywords to XAPI.imp[].ext.rp.target.keywords + mergeCollectionAttributeIntoArray(result, magniteImpExt, ExtImpMagnite::getKeywords, FPD_KEYWORDS_FIELD); } private void mergeFirstPartyDataFromData(Imp imp, ObjectNode result) { @@ -966,12 +966,12 @@ private static String referer(Site site) { return site != null ? site.getPage() : null; } - private Video makeVideo(Imp imp, RubiconVideoParams rubiconVideoParams, String referer) { + private Video makeVideo(Imp imp, MagniteVideoParams magniteVideoParams, String referer) { final Video video = imp.getVideo(); - final Integer skip = rubiconVideoParams != null ? rubiconVideoParams.getSkip() : null; - final Integer skipDelay = rubiconVideoParams != null ? rubiconVideoParams.getSkipdelay() : null; - final Integer resolvedSizeId = resolveSizeId(rubiconVideoParams, imp, referer); + final Integer skip = magniteVideoParams != null ? magniteVideoParams.getSkip() : null; + final Integer skipDelay = magniteVideoParams != null ? magniteVideoParams.getSkipdelay() : null; + final Integer resolvedSizeId = resolveSizeId(magniteVideoParams, imp, referer); final Integer rewarded = imp.getRwdd(); final String videoType = rewarded != null && rewarded == 1 ? "rewarded" : null; @@ -983,15 +983,15 @@ private Video makeVideo(Imp imp, RubiconVideoParams rubiconVideoParams, String r return video.toBuilder() .ext(mapper.mapper().valueToTree( - RubiconVideoExt.of(skip, + MagniteVideoExt.of(skip, skipDelay, - resolvedSizeId != null ? RubiconVideoExtRp.of(resolvedSizeId) : null, + resolvedSizeId != null ? MagniteVideoExtRp.of(resolvedSizeId) : null, videoType))) .build(); } - private Integer resolveSizeId(RubiconVideoParams rubiconVideoParams, Imp imp, String referer) { - final Integer sizeId = rubiconVideoParams != null ? rubiconVideoParams.getSizeId() : null; + private Integer resolveSizeId(MagniteVideoParams magniteVideoParams, Imp imp, String referer) { + final Integer sizeId = magniteVideoParams != null ? magniteVideoParams.getSizeId() : null; final Integer resolvedSizeId = BidderUtil.isNullOrZero(sizeId) ? null : sizeId; @@ -1016,12 +1016,12 @@ private Banner makeBanner(Imp imp) { final Integer height = banner.getH(); final List format = banner.getFormat(); if ((width == null || height == null) && CollectionUtils.isEmpty(format)) { - throw new PreBidException("rubicon imps must have at least one size element [w, h, format]"); + throw new PreBidException("magnite imps must have at least one size element [w, h, format]"); } return banner.toBuilder() .ext(mapper.mapper().valueToTree( - RubiconBannerExt.of(RubiconBannerExtRp.of("text/html")))) + MagniteBannerExt.of(MagniteBannerExtRp.of("text/html")))) .build(); } @@ -1041,7 +1041,7 @@ private Native makeNative(Imp imp) { String.format("Error in native object for imp with id %s: %s", imp.getId(), e.getMessage())); } - return RubiconNative.builder() + return MagniteNative.builder() .requestNative((ObjectNode) requestNode) .request(xNative.getRequest()) .ver(xNative.getVer()) @@ -1080,7 +1080,7 @@ private void validateNativeRequest(JsonNode requestNode) { } } - private User makeUser(User user, ExtImpRubicon rubiconImpExt) { + private User makeUser(User user, ExtImpMagnite magniteImpExt) { final String userId = user != null ? user.getId() : null; final List userEids = user != null ? user.getEids() : null; final String resolvedId = userId == null ? resolveUserId(userEids) : null; @@ -1090,7 +1090,7 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { ? prepareUserEids(userEids) : userEids; final boolean hasDataToRemove = ObjectUtil.getIfNotNull(user, User::getData) != null; - final RubiconUserExtRp userExtRp = rubiconUserExtRp(user, rubiconImpExt); + final MagniteUserExtRp userExtRp = magniteUserExtRp(user, magniteImpExt); final ObjectNode userExtData = extUser != null ? extUser.getData() : null; if (userExtRp == null @@ -1108,7 +1108,7 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { .eids(resolvedUserEids) .build(); - final RubiconUserExt rubiconUserExt = RubiconUserExt.builder() + final MagniteUserExt magniteUserExt = MagniteUserExt.builder() .rp(userExtRp) .build(); @@ -1121,7 +1121,7 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { .geo(null) .data(null) .eids(null) - .ext(mapper.fillExtension(userExt, rubiconUserExt)) + .ext(mapper.fillExtension(userExt, magniteUserExt)) .build(); } @@ -1181,7 +1181,7 @@ private static boolean hasStypeToRemove(List userEids) { .map(Eid::getUids) .filter(Objects::nonNull) .flatMap(Collection::stream) - .map(RubiconBidder::getUserEidUidStype) + .map(MagniteBidder::getUserEidUidStype) .filter(Objects::nonNull) .anyMatch(STYPE_TO_REMOVE::contains); } @@ -1189,14 +1189,14 @@ private static boolean hasStypeToRemove(List userEids) { private static List prepareUserEids(List userEids) { return CollectionUtils.emptyIfNull(userEids).stream() .filter(Objects::nonNull) - .map(RubiconBidder::prepareExtUserEid) + .map(MagniteBidder::prepareExtUserEid) .toList(); } private static Eid prepareExtUserEid(Eid extUserEid) { final List extUserEidUids = CollectionUtils.emptyIfNull(extUserEid.getUids()).stream() .filter(Objects::nonNull) - .map(RubiconBidder::cleanExtUserEidUidStype) + .map(MagniteBidder::cleanExtUserEidUidStype) .toList(); return extUserEid.toBuilder().uids(extUserEidUids).build(); } @@ -1213,14 +1213,14 @@ private static Uid cleanExtUserEidUidStype(Uid extUserEidUid) { return extUserEidUid.toBuilder().ext(extUserEidUidExtCopy).build(); } - private RubiconUserExtRp rubiconUserExtRp(User user, ExtImpRubicon rubiconImpExt) { - final JsonNode target = rubiconUserExtRpTarget(rubiconImpExt.getVisitor(), user); + private MagniteUserExtRp magniteUserExtRp(User user, ExtImpMagnite magniteImpExt) { + final JsonNode target = magniteUserExtRpTarget(magniteImpExt.getVisitor(), user); - return target != null ? RubiconUserExtRp.of(target) : null; + return target != null ? MagniteUserExtRp.of(target) : null; } - private JsonNode rubiconUserExtRpTarget(ObjectNode visitor, User user) { - final ObjectNode result = existingRubiconUserExtRpTarget(user); + private JsonNode magniteUserExtRpTarget(ObjectNode visitor, User user) { + final ObjectNode result = existingMagniteUserExtRpTarget(user); populateFirstPartyDataAttributes(visitor, result); @@ -1233,13 +1233,13 @@ private JsonNode rubiconUserExtRpTarget(ObjectNode visitor, User user) { return !result.isEmpty() ? result : null; } - private ObjectNode existingRubiconUserExtRpTarget(User user) { + private ObjectNode existingMagniteUserExtRpTarget(User user) { final ExtUser userExt = user != null ? user.getExt() : null; - final RubiconUserExt userRubiconExt = userExt != null - ? mapper.mapper().convertValue(userExt, RubiconUserExt.class) + final MagniteUserExt userMagniteExt = userExt != null + ? mapper.mapper().convertValue(userExt, MagniteUserExt.class) : null; - final RubiconUserExtRp userRubiconRpExt = userRubiconExt != null ? userRubiconExt.getRp() : null; - final JsonNode target = userRubiconRpExt != null ? userRubiconRpExt.getTarget() : null; + final MagniteUserExtRp userMagniteRpExt = userMagniteExt != null ? userMagniteExt.getRp() : null; + final JsonNode target = userMagniteRpExt != null ? userMagniteRpExt.getTarget() : null; return target != null && target.isObject() ? (ObjectNode) target : mapper.mapper().createObjectNode(); } @@ -1297,11 +1297,11 @@ private Device makeDevice(Device device) { return device == null ? null : device.toBuilder() .ext(mapper.fillExtension( ExtDevice.empty(), - RubiconDeviceExt.of(RubiconDeviceExtRp.of(device.getPxratio())))) + MagniteDeviceExt.of(MagniteDeviceExtRp.of(device.getPxratio())))) .build(); } - private Site makeSite(Site site, String impLanguage, ExtImpRubicon rubiconImpExt) { + private Site makeSite(Site site, String impLanguage, ExtImpMagnite magniteImpExt) { if (site == null && StringUtils.isBlank(impLanguage)) { return null; } @@ -1311,9 +1311,9 @@ private Site makeSite(Site site, String impLanguage, ExtImpRubicon rubiconImpExt .content(makeSiteContent(null, impLanguage)) .build() : site.toBuilder() - .publisher(makePublisher(rubiconImpExt)) + .publisher(makePublisher(magniteImpExt)) .content(makeSiteContent(site.getContent(), impLanguage)) - .ext(makeSiteExt(site, rubiconImpExt)) + .ext(makeSiteExt(site, magniteImpExt)) .build(); } @@ -1335,19 +1335,19 @@ private static Content makeSiteContent(Content siteContent, String impLanguage) : siteContent; } - private Publisher makePublisher(ExtImpRubicon rubiconImpExt) { + private Publisher makePublisher(ExtImpMagnite magniteImpExt) { return Publisher.builder() - .ext(makePublisherExt(rubiconImpExt)) + .ext(makePublisherExt(magniteImpExt)) .build(); } - private ExtPublisher makePublisherExt(ExtImpRubicon rubiconImpExt) { + private ExtPublisher makePublisherExt(ExtImpMagnite magniteImpExt) { return mapper.fillExtension( ExtPublisher.empty(), - RubiconPubExt.of(RubiconPubExtRp.of(rubiconImpExt.getAccountId()))); + MagnitePubExt.of(MagnitePubExtRp.of(magniteImpExt.getAccountId()))); } - private ExtSite makeSiteExt(Site site, ExtImpRubicon rubiconImpExt) { + private ExtSite makeSiteExt(Site site, ExtImpMagnite magniteImpExt) { final ExtSite extSite = site != null ? site.getExt() : null; final Integer siteExtAmp = extSite != null ? extSite.getAmp() : null; final Content siteContent = site != null ? site.getContent() : null; @@ -1355,36 +1355,36 @@ private ExtSite makeSiteExt(Site site, ExtImpRubicon rubiconImpExt) { ObjectNode target = null; if (CollectionUtils.isNotEmpty(siteContentData)) { - target = existingRubiconSiteExtRpTargetOrEmptyNode(extSite); + target = existingMagniteSiteExtRpTargetOrEmptyNode(extSite); enrichWithIabAndSegtaxAttribute(target, siteContentData, SITE_SEGTAXES); } return mapper.fillExtension( ExtSite.of(siteExtAmp, null), - RubiconSiteExt.of(RubiconSiteExtRp.of(rubiconImpExt.getSiteId(), + MagniteSiteExt.of(MagniteSiteExtRp.of(magniteImpExt.getSiteId(), target != null && !target.isEmpty() ? target : null))); } - private ObjectNode existingRubiconSiteExtRpTargetOrEmptyNode(ExtSite siteExt) { - final RubiconSiteExt rubiconSiteExt = siteExt != null - ? mapper.mapper().convertValue(siteExt, RubiconSiteExt.class) + private ObjectNode existingMagniteSiteExtRpTargetOrEmptyNode(ExtSite siteExt) { + final MagniteSiteExt magniteSiteExt = siteExt != null + ? mapper.mapper().convertValue(siteExt, MagniteSiteExt.class) : null; - final RubiconSiteExtRp rubiconSiteExtRp = rubiconSiteExt != null ? rubiconSiteExt.getRp() : null; - final JsonNode target = rubiconSiteExtRp != null ? rubiconSiteExtRp.getTarget() : null; + final MagniteSiteExtRp magniteSiteExtRp = magniteSiteExt != null ? magniteSiteExt.getRp() : null; + final JsonNode target = magniteSiteExtRp != null ? magniteSiteExtRp.getTarget() : null; return target != null && target.isObject() ? (ObjectNode) target : mapper.mapper().createObjectNode(); } - private App makeApp(App app, ExtImpRubicon rubiconImpExt) { + private App makeApp(App app, ExtImpMagnite magniteImpExt) { return app == null ? null : app.toBuilder() - .publisher(makePublisher(rubiconImpExt)) - .ext(makeAppExt(rubiconImpExt)) + .publisher(makePublisher(magniteImpExt)) + .ext(makeAppExt(magniteImpExt)) .build(); } - private ExtApp makeAppExt(ExtImpRubicon rubiconImpExt) { + private ExtApp makeAppExt(ExtImpMagnite magniteImpExt) { return mapper.fillExtension(ExtApp.of(null, null), - RubiconAppExt.of(RubiconSiteExtRp.of(rubiconImpExt.getSiteId(), null))); + MagniteAppExt.of(MagniteSiteExtRp.of(magniteImpExt.getSiteId(), null))); } private static Source makeSource(Source source) { @@ -1463,7 +1463,7 @@ private List> createDealsRequests(BidRequest bidRequest, private BidRequest createLineItemBidRequest(ExtDealLine lineItem, BidRequest bidRequest, Imp imp) { final Imp dealsImp = imp.toBuilder() .banner(modifyBanner(imp.getBanner(), lineItem.getSizes())) - .ext(modifyRubiconImpExt(imp.getExt(), bidRequest.getExt(), lineItem.getExtLineItemId(), + .ext(modifyMagniteImpExt(imp.getExt(), bidRequest.getExt(), lineItem.getExtLineItemId(), getAdSlot(imp))) .build(); @@ -1476,23 +1476,23 @@ private static Banner modifyBanner(Banner banner, List sizes) { return CollectionUtils.isEmpty(sizes) || banner == null ? banner : banner.toBuilder().format(sizes).build(); } - private ObjectNode modifyRubiconImpExt(ObjectNode impExtNode, ExtRequest extRequest, String extLineItemId, + private ObjectNode modifyMagniteImpExt(ObjectNode impExtNode, ExtRequest extRequest, String extLineItemId, String adSlot) { - final RubiconImpExt rubiconImpExt = mapper.mapper().convertValue(impExtNode, RubiconImpExt.class); - final RubiconImpExtRp impExtRp = rubiconImpExt.getRp(); + final MagniteImpExt magniteImpExt = mapper.mapper().convertValue(impExtNode, MagniteImpExt.class); + final MagniteImpExtRp impExtRp = magniteImpExt.getRp(); final ObjectNode targetNode = impExtRp.getTarget() == null || impExtRp.getTarget().isNull() ? mapper.mapper().createObjectNode() : (ObjectNode) impExtRp.getTarget(); final ObjectNode modifiedTargetNode = targetNode.put("line_item", extLineItemId); - final RubiconImpExtRp modifiedImpExtRp = RubiconImpExtRp.of( + final MagniteImpExtRp modifiedImpExtRp = MagniteImpExtRp.of( impExtRp.getZoneId(), modifiedTargetNode, impExtRp.getTrack(), impExtRp.getRtb(), impExtRp.getPbBidId()); - return mapper.mapper().valueToTree(rubiconImpExt.toBuilder() + return mapper.mapper().valueToTree(magniteImpExt.toBuilder() .rp(modifiedImpExtRp) .maxbids(getMaxBids(extRequest)) .gpid(adSlot) @@ -1502,7 +1502,7 @@ private ObjectNode modifyRubiconImpExt(ObjectNode impExtNode, ExtRequest extRequ private List extractBids(BidRequest prebidRequest, BidRequest bidRequest, - RubiconBidResponse bidResponse, + MagniteBidResponse bidResponse, List errors) { return bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid()) ? Collections.emptyList() @@ -1511,14 +1511,14 @@ private List extractBids(BidRequest prebidRequest, private List bidsFromResponse(BidRequest prebidRequest, BidRequest bidRequest, - RubiconBidResponse bidResponse, + MagniteBidResponse bidResponse, List errors) { final Map idToImp = prebidRequest.getImp().stream() .collect(Collectors.toMap(Imp::getId, Function.identity())); - final Map idToRubiconImp = bidRequest.getImp().stream() + final Map idToMagniteImp = bidRequest.getImp().stream() .collect(Collectors.toMap(Imp::getId, Function.identity())); - final RubiconExtPrebidBiddersBidder extPrebidBiddersBidder = extPrebidBiddersRubicon(prebidRequest.getExt()); + final MagniteExtPrebidBiddersBidder extPrebidBiddersBidder = extPrebidBiddersMagnite(prebidRequest.getExt()); final Float cpmOverrideFromRequest = cpmOverrideFromRequest(extPrebidBiddersBidder); final boolean hasApexRenderer = hasApexRenderer(extPrebidBiddersBidder); final BidType bidType = bidType(bidRequest); @@ -1531,7 +1531,7 @@ private List bidsFromResponse(BidRequest prebidRequest, bid, seatBid, idToImp.get(bid.getImpid()), - idToRubiconImp.get(bid.getImpid()), + idToMagniteImp.get(bid.getImpid()), bidType, cpmOverrideFromRequest, hasApexRenderer, @@ -1539,7 +1539,7 @@ private List bidsFromResponse(BidRequest prebidRequest, .filter(Objects::nonNull) .map(bid -> createBidderBid( bid, - idToRubiconImp.get(bid.getImpid()), + idToMagniteImp.get(bid.getImpid()), bidType, bidResponse.getCur())) .toList()) @@ -1547,10 +1547,10 @@ private List bidsFromResponse(BidRequest prebidRequest, .toList(); } - private Bid updateBid(RubiconBid bid, - RubiconSeatBid seatBid, + private Bid updateBid(MagniteBid bid, + MagniteSeatBid seatBid, Imp imp, - Imp rubiconImp, + Imp magniteImp, BidType bidType, Float cpmOverrideFromRequest, boolean hasApexRenderer, @@ -1570,18 +1570,18 @@ private Bid updateBid(RubiconBid bid, ? new BigDecimal(String.valueOf(cpmOverride)) : bid.getPrice(); - final RubiconBid updatedRubiconBid = bid.toBuilder() - .id(resolveBidId(rubiconImp, bid)) + final MagniteBid updatedMagniteBid = bid.toBuilder() + .id(resolveBidId(magniteImp, bid)) .adm(resolveAdm(bid.getAdm(), bid.getAdmNative())) .price(bidPrice) .ext(updateBidExt) .build(); - return bidFromRubiconBid(updatedRubiconBid); + return bidFromMagniteBid(updatedMagniteBid); } - private ObjectNode prepareBidExt(RubiconBid bid, - RubiconSeatBid seatBid, + private ObjectNode prepareBidExt(MagniteBid bid, + MagniteSeatBid seatBid, Imp imp, BidType bidType, boolean hasApexRenderer) { @@ -1629,7 +1629,7 @@ private ExtPrebid getExtPrebid(ObjectNode bidExt, Stri } } - private static Integer resolveNetworkId(RubiconSeatBid seatBid) { + private static Integer resolveNetworkId(MagniteSeatBid seatBid) { final String buyer = seatBid.getBuyer(); final int networkId = NumberUtils.toInt(buyer, 0); return networkId <= 0 ? null : networkId; @@ -1660,7 +1660,7 @@ private static Integer resolveAdvertiserId(ObjectNode bidExt) { .map(ext -> ext.get("rp")) .filter(JsonNode::isObject) .map(rp -> rp.get("advid")) - .map(RubiconBidder::convertToInt) + .map(MagniteBidder::convertToInt) .orElse(null); } @@ -1680,9 +1680,9 @@ private static Integer convertToInt(JsonNode jsonNode) { return null; } - private String resolveBidId(Imp rubiconImp, RubiconBid bid) { + private String resolveBidId(Imp magniteImp, MagniteBid bid) { return generateBidId - ? Optional.ofNullable(rubiconImp) + ? Optional.ofNullable(magniteImp) .map(Imp::getExt) .map(ext -> ext.get("rp")) .map(rp -> rp.get("pb_bid_id")) @@ -1699,11 +1699,11 @@ private String resolveAdm(String bidAdm, ObjectNode admobject) { return admobject != null ? admobject.toString() : null; } - private Bid bidFromRubiconBid(RubiconBid rubiconBid) { + private Bid bidFromMagniteBid(MagniteBid magniteBid) { try { - return mapper.mapper().convertValue(rubiconBid, Bid.class); + return mapper.mapper().convertValue(magniteBid, Bid.class); } catch (IllegalArgumentException e) { - throw new PreBidException("Error converting rubiconBid to ortbBid: " + e.getMessage(), e); + throw new PreBidException("Error converting magniteBid to ortbBid: " + e.getMessage(), e); } } @@ -1716,21 +1716,21 @@ private static BidderBid createBidderBid(Bid bid, Imp imp, BidType bidType, Stri .build(); } - private static Float cpmOverrideFromRequest(RubiconExtPrebidBiddersBidder bidder) { - final RubiconExtPrebidBiddersBidderDebug debug = bidder != null ? bidder.getDebug() : null; + private static Float cpmOverrideFromRequest(MagniteExtPrebidBiddersBidder bidder) { + final MagniteExtPrebidBiddersBidderDebug debug = bidder != null ? bidder.getDebug() : null; return debug != null ? debug.getCpmoverride() : null; } private Float cpmOverrideFromImp(Imp imp) { return Optional.ofNullable(imp) - .map(this::parseRubiconExt) - .map(ExtImpRubicon::getDebug) - .map(ExtImpRubiconDebug::getCpmoverride) + .map(this::parseMagniteExt) + .map(ExtImpMagnite::getDebug) + .map(ExtImpMagniteDebug::getCpmoverride) .orElse(null); } - private static boolean hasApexRenderer(RubiconExtPrebidBiddersBidder bidder) { - return Optional.ofNullable(bidder).map(RubiconExtPrebidBiddersBidder::getApexRenderer).orElse(false); + private static boolean hasApexRenderer(MagniteExtPrebidBiddersBidder bidder) { + return Optional.ofNullable(bidder).map(MagniteExtPrebidBiddersBidder::getApexRenderer).orElse(false); } private static BidType bidType(BidRequest bidRequest) { diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteAppExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteAppExt.java new file mode 100644 index 00000000000..ae089e9ae58 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteAppExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteAppExt { + + MagniteSiteExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExt.java new file mode 100644 index 00000000000..5c60c4419b6 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteBannerExt { + + MagniteBannerExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExtRp.java new file mode 100644 index 00000000000..0342e8ab507 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteBannerExtRp.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteBannerExtRp { + + String mime; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExt.java new file mode 100644 index 00000000000..93bcecdebb9 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteDeviceExt { + + MagniteDeviceExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExtRp.java similarity index 56% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExtRp.java index 6cfcb37b934..6d572786616 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteDeviceExtRp.java @@ -1,11 +1,11 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; import java.math.BigDecimal; @Value(staticConstructor = "of") -public class RubiconDeviceExtRp { +public class MagniteDeviceExtRp { BigDecimal pixelratio; } diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBidders.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBidders.java new file mode 100644 index 00000000000..edaa111cf70 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBidders.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteExtPrebidBidders { + + MagniteExtPrebidBiddersBidder bidder; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidder.java similarity index 57% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidder.java index f2988ffe165..5a96dce03ea 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidder.java @@ -1,14 +1,14 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconExtPrebidBiddersBidder { +public class MagniteExtPrebidBiddersBidder { String integration; - RubiconExtPrebidBiddersBidderDebug debug; + MagniteExtPrebidBiddersBidderDebug debug; @JsonProperty("apexRenderer") Boolean apexRenderer; diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidderDebug.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidderDebug.java new file mode 100644 index 00000000000..8c2c23854bf --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteExtPrebidBiddersBidderDebug.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteExtPrebidBiddersBidderDebug { + + Float cpmoverride; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExt.java similarity index 66% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExt.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExt.java index d40333b891a..1def70255da 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExt.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExt.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Builder; @@ -8,9 +8,9 @@ @Value @Builder(toBuilder = true) -public class RubiconImpExt { +public class MagniteImpExt { - RubiconImpExtRp rp; + MagniteImpExtRp rp; List viewabilityvendors; @@ -22,5 +22,5 @@ public class RubiconImpExt { String tid; - RubiconImpExtPrebid prebid; + MagniteImpExtPrebid prebid; } diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtPrebid.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtPrebid.java similarity index 72% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtPrebid.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtPrebid.java index 039fec04fbe..99bb646e896 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtPrebid.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtPrebid.java @@ -1,10 +1,10 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; import org.prebid.server.proto.openrtb.ext.request.ExtImpPrebidFloors; @Value(staticConstructor = "of") -public class RubiconImpExtPrebid { +public class MagniteImpExtPrebid { /** * Defines the contract for bidrequest.imp[i].ext.prebid.floors diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRp.java similarity index 53% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRp.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRp.java index fae19232ebe..c9ff5b69e38 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRp.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRp.java @@ -1,18 +1,18 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.databind.JsonNode; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconImpExtRp { +public class MagniteImpExtRp { Integer zoneId; JsonNode target; - RubiconImpExtRpTrack track; + MagniteImpExtRpTrack track; - RubiconImpExtRpRtb rtb; + MagniteImpExtRpRtb rtb; String pbBidId; } diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpRtb.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpRtb.java similarity index 66% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpRtb.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpRtb.java index d127ed39502..7e43447b3d0 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpRtb.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpRtb.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; import org.prebid.server.proto.openrtb.ext.request.ImpMediaType; @@ -6,7 +6,7 @@ import java.util.Set; @Value(staticConstructor = "of") -public class RubiconImpExtRpRtb { +public class MagniteImpExtRpRtb { Set formats; } diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpTrack.java similarity index 52% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpTrack.java index 0ff71bc5aaa..c4876b59f6d 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteImpExtRpTrack.java @@ -1,9 +1,9 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconImpExtRpTrack { +public class MagniteImpExtRpTrack { String mint; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconNative.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteNative.java similarity index 73% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconNative.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteNative.java index 7ab007d1212..0aae1982c33 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconNative.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteNative.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.Native; @@ -9,7 +9,7 @@ @Value @SuperBuilder @EqualsAndHashCode(callSuper = true) -public class RubiconNative extends Native { +public class MagniteNative extends Native { ObjectNode requestNative; } diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExt.java new file mode 100644 index 00000000000..01df78d8def --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagnitePubExt { + + MagnitePubExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExtRp.java new file mode 100644 index 00000000000..d8c16c28864 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagnitePubExtRp.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagnitePubExtRp { + + Integer accountId; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExt.java new file mode 100644 index 00000000000..37ac0d4aef2 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteSiteExt { + + MagniteSiteExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExtRp.java similarity index 62% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExtRp.java index 7c8c7f88d33..00960de9aa6 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteSiteExtRp.java @@ -1,10 +1,10 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.databind.JsonNode; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconSiteExtRp { +public class MagniteSiteExtRp { Integer siteId; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargeting.java similarity index 58% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargeting.java index ee8ff245729..b5827d6944d 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargeting.java @@ -1,11 +1,11 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; import java.util.List; @Value(staticConstructor = "of") -public class RubiconTargeting { +public class MagniteTargeting { String key; diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExt.java new file mode 100644 index 00000000000..583ca78f6ee --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExt.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteTargetingExt { + + MagniteTargetingExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExtRp.java new file mode 100644 index 00000000000..29ade94387a --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteTargetingExtRp.java @@ -0,0 +1,11 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +import java.util.List; + +@Value(staticConstructor = "of") +public class MagniteTargetingExtRp { + + List targeting; +} diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExt.java new file mode 100644 index 00000000000..c6dbd36a7e3 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExt.java @@ -0,0 +1,11 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Builder; +import lombok.Value; + +@Builder +@Value +public class MagniteUserExt { + + MagniteUserExtRp rp; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExtRp.java similarity index 59% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExtRp.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExtRp.java index a3f16f3a5f2..0e3b44d3bc4 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExtRp.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteUserExtRp.java @@ -1,10 +1,10 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import com.fasterxml.jackson.databind.JsonNode; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconUserExtRp { +public class MagniteUserExtRp { JsonNode target; } diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExt.java similarity index 52% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExt.java index fe85f28ad09..f08ffc273dc 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExt.java @@ -1,15 +1,15 @@ -package org.prebid.server.bidder.rubicon.proto.request; +package org.prebid.server.bidder.magnite.proto.request; import lombok.Value; @Value(staticConstructor = "of") -public class RubiconVideoExt { +public class MagniteVideoExt { Integer skip; Integer skipdelay; - RubiconVideoExtRp rp; + MagniteVideoExtRp rp; String videotype; } diff --git a/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExtRp.java b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExtRp.java new file mode 100644 index 00000000000..fc9af2335b3 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/request/MagniteVideoExtRp.java @@ -0,0 +1,9 @@ +package org.prebid.server.bidder.magnite.proto.request; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class MagniteVideoExtRp { + + Integer sizeId; +} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBid.java b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBid.java similarity index 89% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBid.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBid.java index c8580f53323..7ce36d6eded 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBid.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBid.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.response; +package org.prebid.server.bidder.magnite.proto.response; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Builder; @@ -9,7 +9,7 @@ @Builder(toBuilder = true) @Value -public class RubiconBid { +public class MagniteBid { String id; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBidResponse.java b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBidResponse.java similarity index 67% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBidResponse.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBidResponse.java index 23317236057..25c3891623d 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconBidResponse.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteBidResponse.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.response; +package org.prebid.server.bidder.magnite.proto.response; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Builder; @@ -8,11 +8,11 @@ @Builder @Value -public class RubiconBidResponse { +public class MagniteBidResponse { String id; - List seatbid; + List seatbid; String bidid; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconSeatBid.java b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteSeatBid.java similarity index 67% rename from src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconSeatBid.java rename to src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteSeatBid.java index 6c58cd64c5d..f3f6c17ee96 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/response/RubiconSeatBid.java +++ b/src/main/java/org/prebid/server/bidder/magnite/proto/response/MagniteSeatBid.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon.proto.response; +package org.prebid.server.bidder.magnite.proto.response; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Builder; @@ -8,9 +8,9 @@ @Builder(toBuilder = true) @Value -public class RubiconSeatBid { +public class MagniteSeatBid { - List bid; + List bid; String seat; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java deleted file mode 100644 index 905527302b9..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconAppExt { - - RubiconSiteExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java deleted file mode 100644 index 95625d80fd7..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconBannerExt { - - RubiconBannerExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java deleted file mode 100644 index 6aaadbb26f0..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconBannerExtRp { - - String mime; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java deleted file mode 100644 index 2d3ea5de017..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconDeviceExt { - - RubiconDeviceExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java deleted file mode 100644 index d7fa100c490..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconExtPrebidBidders { - - RubiconExtPrebidBiddersBidder bidder; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidderDebug.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidderDebug.java deleted file mode 100644 index 0947162a9f9..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidderDebug.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconExtPrebidBiddersBidderDebug { - - Float cpmoverride; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java deleted file mode 100644 index 507a0354b8c..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconPubExt { - - RubiconPubExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java deleted file mode 100644 index 274ff2c4576..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconPubExtRp { - - Integer accountId; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExt.java deleted file mode 100644 index ba3bd531196..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconSiteExt { - - RubiconSiteExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java deleted file mode 100644 index 23fcfc62e86..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconTargetingExt { - - RubiconTargetingExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java deleted file mode 100644 index 75835a959c3..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -import java.util.List; - -@Value(staticConstructor = "of") -public class RubiconTargetingExtRp { - - List targeting; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java deleted file mode 100644 index 1f3d8116629..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Builder; -import lombok.Value; - -@Builder -@Value -public class RubiconUserExt { - - RubiconUserExtRp rp; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java deleted file mode 100644 index 602dd9f5409..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class RubiconVideoExtRp { - - Integer sizeId; -} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubicon.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagnite.java similarity index 75% rename from src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubicon.java rename to src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagnite.java index c1cd0e3e326..103b54cf2d1 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubicon.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagnite.java @@ -1,4 +1,4 @@ -package org.prebid.server.proto.openrtb.ext.request.rubicon; +package org.prebid.server.proto.openrtb.ext.request.magnite; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -10,11 +10,11 @@ import java.util.Set; /** - * Defines the contract for bidrequest.imp[i].ext.rubicon + * Defines the contract for bidrequest.imp[i].ext.magnite */ @Builder @Value -public class ExtImpRubicon { +public class ExtImpMagnite { @JsonProperty("accountId") Integer accountId; @@ -34,11 +34,11 @@ public class ExtImpRubicon { ObjectNode visitor; - RubiconVideoParams video; + MagniteVideoParams video; List keywords; Set formats; - ExtImpRubiconDebug debug; + ExtImpMagniteDebug debug; } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubiconDebug.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagniteDebug.java similarity index 71% rename from src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubiconDebug.java rename to src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagniteDebug.java index 42590bd46f2..934a52a3656 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/ExtImpRubiconDebug.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/ExtImpMagniteDebug.java @@ -1,12 +1,12 @@ -package org.prebid.server.proto.openrtb.ext.request.rubicon; +package org.prebid.server.proto.openrtb.ext.request.magnite; import lombok.Value; /** - * Defines the contract for bidrequest.imp[i].ext.prebid.bidder.rubicon.debug + * Defines the contract for bidrequest.imp[i].ext.prebid.bidder.magnite.debug */ @Value(staticConstructor = "of") -public class ExtImpRubiconDebug { +public class ExtImpMagniteDebug { /** * This should be used only for testing. diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconVideoParams.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/MagniteVideoParams.java similarity index 77% rename from src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconVideoParams.java rename to src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/MagniteVideoParams.java index d41e897514c..8bdaafa5d4c 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconVideoParams.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/magnite/MagniteVideoParams.java @@ -1,4 +1,4 @@ -package org.prebid.server.proto.openrtb.ext.request.rubicon; +package org.prebid.server.proto.openrtb.ext.request.magnite; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; @@ -6,7 +6,7 @@ @Builder @Value -public class RubiconVideoParams { +public class MagniteVideoParams { String language; diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MagniteConfiguration.java similarity index 80% rename from src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java rename to src/main/java/org/prebid/server/spring/config/bidder/MagniteConfiguration.java index a43ba818f86..15a5d537305 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MagniteConfiguration.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.prebid.server.bidder.BidderDeps; -import org.prebid.server.bidder.rubicon.RubiconBidder; +import org.prebid.server.bidder.magnite.MagniteBidder; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.floors.PriceFloorResolver; import org.prebid.server.identity.UUIDIdGenerator; @@ -25,29 +25,29 @@ import jakarta.validation.constraints.NotNull; @Configuration -@PropertySource(value = "classpath:/bidder-config/rubicon.yaml", factory = YamlPropertySourceFactory.class) -public class RubiconConfiguration { +@PropertySource(value = "classpath:/bidder-config/magnite.yaml", factory = YamlPropertySourceFactory.class) +public class MagniteConfiguration { - private static final String BIDDER_NAME = "rubicon"; + private static final String BIDDER_NAME = "magnite"; - @Bean("rubiconConfigurationProperties") - @ConfigurationProperties("adapters.rubicon") - RubiconConfigurationProperties configurationProperties() { - return new RubiconConfigurationProperties(); + @Bean("magniteConfigurationProperties") + @ConfigurationProperties("adapters.magnite") + MagniteConfigurationProperties configurationProperties() { + return new MagniteConfigurationProperties(); } @Bean - BidderDeps rubiconBidderDeps(RubiconConfigurationProperties rubiconConfigurationProperties, + BidderDeps magniteBidderDeps(MagniteConfigurationProperties magniteConfigurationProperties, @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, PriceFloorResolver floorResolver, PrebidVersionProvider versionProvider, JacksonMapper mapper) { - return BidderDepsAssembler.forBidder(BIDDER_NAME) - .withConfig(rubiconConfigurationProperties) + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(magniteConfigurationProperties) .bidderCreator(config -> - new RubiconBidder( + new MagniteBidder( BIDDER_NAME, config.getEndpoint(), config.getDefaultTkXInt(), @@ -69,7 +69,7 @@ BidderDeps rubiconBidderDeps(RubiconConfigurationProperties rubiconConfiguration @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor - private static class RubiconConfigurationProperties extends BidderConfigurationProperties { + private static class MagniteConfigurationProperties extends BidderConfigurationProperties { @Valid @NotNull diff --git a/src/main/java/org/prebid/server/validation/BidderParamValidator.java b/src/main/java/org/prebid/server/validation/BidderParamValidator.java index 71a21b13341..dd1cb0dfc79 100644 --- a/src/main/java/org/prebid/server/validation/BidderParamValidator.java +++ b/src/main/java/org/prebid/server/validation/BidderParamValidator.java @@ -59,7 +59,7 @@ public Set validate(String bidder, JsonNode jsonNode) { * "audienceNetwork": { * "schema": "..." * }, - * "rubicon": { + * "magnite": { * "schema": "...." * } * } diff --git a/src/main/resources/bidder-config/rubicon.yaml b/src/main/resources/bidder-config/magnite.yaml similarity index 93% rename from src/main/resources/bidder-config/rubicon.yaml rename to src/main/resources/bidder-config/magnite.yaml index 88d48fafd27..64a95dd98bd 100644 --- a/src/main/resources/bidder-config/rubicon.yaml +++ b/src/main/resources/bidder-config/magnite.yaml @@ -1,5 +1,5 @@ adapters: - rubicon: + magnite: ortb-version: "2.6" # Contact global-support@magnite.com to ask about enabling a connection to the Magnite (formerly Rubicon) exchange. # We have the following regional endpoint domains: exapi-us-east, exapi-us-west, exapi-apac, exapi-eu @@ -9,12 +9,12 @@ adapters: geoscope: - global aliases: - magnite: + rubicon: enabled: false ortb: multiformat-supported: true meta-info: - maintainer-email: header-bidding@rubiconproject.com + maintainer-email: header-bidding@magnite.com app-media-types: - banner - video diff --git a/src/main/resources/static/bidder-params/rubicon.json b/src/main/resources/static/bidder-params/magnite.json similarity index 92% rename from src/main/resources/static/bidder-params/rubicon.json rename to src/main/resources/static/bidder-params/magnite.json index 4e9ef90cf72..5f0ea8ea33e 100644 --- a/src/main/resources/static/bidder-params/rubicon.json +++ b/src/main/resources/static/bidder-params/magnite.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Rubicon Adapter Params", - "description": "A schema which validates params accepted by the Rubicon adapter", + "title": "Magnite Adapter Params", + "description": "A schema which validates params accepted by the Magnite adapter", "type": "object", "properties": { "accountId": { @@ -55,7 +55,7 @@ }, "video": { "type": "object", - "description": "An object defining additional Rubicon video parameters", + "description": "An object defining additional Magnite video parameters", "properties": { "language": { "type": "string", @@ -71,7 +71,7 @@ }, "size_id": { "type": "integer", - "description": "Rubicon size_id, used to describe type of video ad (preroll, postroll, etc)" + "description": "Magnite size_id, used to describe type of video ad (preroll, postroll, etc)" }, "skip": { "type": "integer", diff --git a/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy b/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy index 8971403ffed..1061cf4a348 100644 --- a/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy @@ -15,9 +15,9 @@ enum BidderName { GENERIC_CAMEL_CASE("GeNerIc"), GENERIC("generic"), GENER_X("gener_x"), - RUBICON("rubicon"), + MAGNITE("magnite"), APPNEXUS("appnexus"), - RUBICON_ALIAS("rubiconAlias"), + MAGNITE_ALIAS("magniteAlias"), OPENX("openx"), OPENX_ALIAS("openxalias"), ACEEX("aceex"), diff --git a/src/test/groovy/org/prebid/server/functional/model/bidder/Rubicon.groovy b/src/test/groovy/org/prebid/server/functional/model/bidder/Magnite.groovy similarity index 74% rename from src/test/groovy/org/prebid/server/functional/model/bidder/Rubicon.groovy rename to src/test/groovy/org/prebid/server/functional/model/bidder/Magnite.groovy index 9ccdd3db258..87358054807 100644 --- a/src/test/groovy/org/prebid/server/functional/model/bidder/Rubicon.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/bidder/Magnite.groovy @@ -2,14 +2,14 @@ package org.prebid.server.functional.model.bidder import org.prebid.server.functional.util.PBSUtils -class Rubicon implements BidderAdapter { +class Magnite implements BidderAdapter { Integer accountId Integer siteId Integer zoneId - static Rubicon getDefaultRubicon() { - new Rubicon().tap { + static Magnite getDefaultMagnite() { + new Magnite().tap { accountId = PBSUtils.randomNumber siteId = PBSUtils.randomNumber zoneId = PBSUtils.randomNumber diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy index 9c4a17ec5cf..5ea7a7d3270 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy @@ -6,7 +6,7 @@ import groovy.transform.ToString import org.prebid.server.functional.model.bidder.AppNexus import org.prebid.server.functional.model.bidder.Generic import org.prebid.server.functional.model.bidder.Openx -import org.prebid.server.functional.model.bidder.Rubicon +import org.prebid.server.functional.model.bidder.Magnite @ToString(includeNames = true, ignoreNulls = true) class Bidder { @@ -19,7 +19,7 @@ class Bidder { Generic generX @JsonProperty("GeNerIc") Generic genericCamelCase - Rubicon rubicon + Magnite magnite @JsonProperty("appnexus") AppNexus appNexus Openx openx diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Imp.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Imp.groovy index 13c97a36ba4..0a3d1471fbd 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Imp.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Imp.groovy @@ -88,7 +88,7 @@ class Imp { (bidder.alias) : BidderName.ALIAS, (bidder.generic) : BidderName.GENERIC, (bidder.genericCamelCase): BidderName.GENERIC_CAMEL_CASE, - (bidder.rubicon) : BidderName.RUBICON, + (bidder.magnite) : BidderName.MAGNITE, (bidder.appNexus) : BidderName.APPNEXUS, (bidder.openx) : BidderName.OPENX, (bidder.ix) : BidderName.IX diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExt.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExt.groovy index ebd963b0737..a95e6b4ad69 100644 --- a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExt.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExt.groovy @@ -6,7 +6,7 @@ import groovy.transform.ToString import org.prebid.server.functional.model.bidder.AppNexus import org.prebid.server.functional.model.bidder.GeneralBidderAdapter import org.prebid.server.functional.model.bidder.Generic -import org.prebid.server.functional.model.bidder.Rubicon +import org.prebid.server.functional.model.bidder.Magnite import org.prebid.server.functional.model.bidderspecific.Rp @ToString(includeNames = true, ignoreNulls = true) @@ -16,7 +16,7 @@ class ImpExt { ImpExtPrebid prebid Generic generic @Deprecated - Rubicon rubicon + Magnite magnite @Deprecated @JsonProperty("appnexus") AppNexus appNexus diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy index 975aa9c710a..81dcd788b7d 100644 --- a/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy @@ -7,7 +7,7 @@ enum ErrorType { GENERAL("general"), GENERIC("generic"), GENERIC_CAMEL_CASE("GeNerIc"), - RUBICON("rubicon"), + MAGNITE("magnite"), APPNEXUS("appnexus"), PREBID("prebid"), CACHE("cache"), diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy index a2a9452971c..2c8837301bc 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy @@ -34,7 +34,7 @@ import static org.prebid.server.functional.model.bidder.BidderName.ALIAS import static org.prebid.server.functional.model.bidder.BidderName.AMX import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.request.auction.AdjustmentType.CPM import static org.prebid.server.functional.model.request.auction.AdjustmentType.MULTIPLIER import static org.prebid.server.functional.model.request.auction.AdjustmentType.STATIC @@ -152,7 +152,7 @@ class BidAdjustmentSpec extends BaseSpec { assert response?.seatbid?.first?.bid?.first?.price == bidResponse.seatbid.first.bid.first.price where: - adjustmentBidder << [RUBICON, APPNEXUS] + adjustmentBidder << [MAGNITE, APPNEXUS] } def "PBS should adjust bid price based on media type only when request contains corresponding media type adjustment for bidder"() { diff --git a/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy index 9dfee8ae272..0fea9561336 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/CookieSyncSpec.groovy @@ -36,7 +36,7 @@ import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS import static org.prebid.server.functional.model.bidder.BidderName.BOGUS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.bidder.BidderName.OPENX -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.request.cookiesync.FilterType.EXCLUDE import static org.prebid.server.functional.model.request.cookiesync.FilterType.INCLUDE import static org.prebid.server.functional.model.response.cookiesync.CookieSyncResponse.Status.NO_COOKIE @@ -50,7 +50,7 @@ import static org.prebid.server.functional.util.HttpUtil.SET_COOKIE_HEADER import static org.prebid.server.functional.util.privacy.CcpaConsent.Signal.ENFORCED import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID import static org.prebid.server.functional.util.privacy.TcfConsent.PurposeId.BASIC_ADS -import static org.prebid.server.functional.util.privacy.TcfConsent.RUBICON_VENDOR_ID +import static org.prebid.server.functional.util.privacy.TcfConsent.MAGNITE_VENDOR_ID class CookieSyncSpec extends BaseSpec { @@ -66,12 +66,12 @@ class CookieSyncSpec extends BaseSpec { "adapters.${ACEEX.value}.enabled" : "true", "adapters.${ACEEX.value}.usersync.cookie-family-name" : ACEEX.value, "adapters.${ACEEX.value}.usersync.redirect.url" : "https://test.redirect.endpoint.com={redirect_url}"] - private static final Map RUBICON_CONFIG = [ - "adapters.${RUBICON.value}.enabled" : "true", - "adapters.${RUBICON.value}.meta-info.vendor-id" : RUBICON_VENDOR_ID as String, - "adapters.${RUBICON.value}.usersync.cookie-family-name" : RUBICON.value, - "adapters.${RUBICON.value}.usersync.redirect.url" : "https://test.redirect.endpoint.com", - "adapters.${RUBICON.value}.usersync.iframe.url" : "https://test.iframe.endpoint.com&redir={redirect_url}"] + private static final Map MAGNITE_CONFIG = [ + "adapters.${MAGNITE.value}.enabled" : "true", + "adapters.${MAGNITE.value}.meta-info.vendor-id" : MAGNITE_VENDOR_ID as String, + "adapters.${MAGNITE.value}.usersync.cookie-family-name" : MAGNITE.value, + "adapters.${MAGNITE.value}.usersync.redirect.url" : "https://test.redirect.endpoint.com", + "adapters.${MAGNITE.value}.usersync.iframe.url" : "https://test.iframe.endpoint.com&redir={redirect_url}"] private static final Map OPENX_CONFIG = [ "adapters.${OPENX.value}.enabled" : "true", "adapters.${OPENX.value}.usersync.cookie-family-name" : OPENX.value, @@ -91,7 +91,7 @@ class CookieSyncSpec extends BaseSpec { ] - private static final Map PBS_CONFIG = APPNEXUS_CONFIG + RUBICON_CONFIG + OPENX_CONFIG + + private static final Map PBS_CONFIG = APPNEXUS_CONFIG + MAGNITE_CONFIG + OPENX_CONFIG + GENERIC_CONFIG + ACEEX_CONFIG + AAX_CONFIG + ACUITYADS_CONFIG + ADKERNEL_CONFIG + ["cookie-sync.pri": "grid, ix, adkernel"] @@ -161,7 +161,7 @@ class CookieSyncSpec extends BaseSpec { def "PBS cookie sync request should replace bidder without config and fill up response with enabled bidders to the limit in request"() { given: "PBS bidder config" - def prebidServerService = pbsServiceFactory.getService(RUBICON_CONFIG + GENERIC_CONFIG + def prebidServerService = pbsServiceFactory.getService(MAGNITE_CONFIG + GENERIC_CONFIG + ["adapters.${BOGUS.value}.enabled": "true"]) and: "Default Cookie sync request" @@ -183,13 +183,13 @@ class CookieSyncSpec extends BaseSpec { assert !response.getBidderUserSync(BOGUS) and: "Response should contain coop-synced bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(GENERIC) } def "PBS cookie sync request should replace unknown bidder and fill up response with enabled bidders to the limit in request"() { given: "PBS bidder config" - def prebidServerService = pbsServiceFactory.getService(RUBICON_CONFIG + APPNEXUS_CONFIG) + def prebidServerService = pbsServiceFactory.getService(MAGNITE_CONFIG + APPNEXUS_CONFIG) and: "Cookie sync request" def requestLimit = 2 @@ -210,13 +210,13 @@ class CookieSyncSpec extends BaseSpec { assert !response.getBidderUserSync(BOGUS) and: "Response should contain coop-synced bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(APPNEXUS) } def "PBS cookie sync request should replace disabled bidder and fill up response with enabled bidders to the limit in request"() { given: "PBS bidder config" - def prebidServerService = pbsServiceFactory.getService(RUBICON_CONFIG + APPNEXUS_CONFIG + def prebidServerService = pbsServiceFactory.getService(MAGNITE_CONFIG + APPNEXUS_CONFIG + ["adapters.${GENERIC.value}.enabled": "false",]) and: "Default Cookie sync request" @@ -238,13 +238,13 @@ class CookieSyncSpec extends BaseSpec { assert !response.getBidderUserSync(GENERIC) and: "Response should contain coop-synced bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(APPNEXUS) } def "PBS cookie sync request should replace filtered bidder and fill up response with enabled bidders to the limit in request"() { given: "PBS bidder config" - def prebidServerService = pbsServiceFactory.getService(RUBICON_CONFIG + APPNEXUS_CONFIG) + def prebidServerService = pbsServiceFactory.getService(MAGNITE_CONFIG + APPNEXUS_CONFIG) and: "Cookie sync request" def requestLimit = 2 @@ -266,7 +266,7 @@ class CookieSyncSpec extends BaseSpec { assert !response.getBidderUserSync(GENERIC) and: "Response should contain coop-synced bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(APPNEXUS) } @@ -880,7 +880,7 @@ class CookieSyncSpec extends BaseSpec { def accountId = PBSUtils.randomNumber def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { limit = requestLimit - bidders = [RUBICON, APPNEXUS, GENERIC] + bidders = [MAGNITE, APPNEXUS, GENERIC] account = accountId debug = false } @@ -906,7 +906,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 3 bidders" def accountId = PBSUtils.randomNumber def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { - bidders = [RUBICON, APPNEXUS, GENERIC] + bidders = [MAGNITE, APPNEXUS, GENERIC] account = accountId debug = false } @@ -934,7 +934,7 @@ class CookieSyncSpec extends BaseSpec { def requestLimit = 1 def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { limit = requestLimit - bidders = [RUBICON, APPNEXUS, GENERIC] + bidders = [MAGNITE, APPNEXUS, GENERIC] debug = false } @@ -953,7 +953,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 2 bidders" def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { - bidders = [GENERIC, RUBICON] + bidders = [GENERIC, MAGNITE] debug = false } @@ -973,7 +973,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 3 bidders" def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { - bidders = [GENERIC, APPNEXUS, RUBICON] + bidders = [GENERIC, APPNEXUS, MAGNITE] limit = 5 debug = false } @@ -994,7 +994,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 3 bidders" def accountId = PBSUtils.randomNumber def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { - bidders = [GENERIC, APPNEXUS, RUBICON] + bidders = [GENERIC, APPNEXUS, MAGNITE] limit = 5 account = accountId debug = false @@ -1094,7 +1094,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 2 bidders and limit of 1" def limit = 1 - def bidders = [GENERIC, RUBICON] + def bidders = [GENERIC, MAGNITE] def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { it.limit = limit it.bidders = bidders @@ -1423,7 +1423,7 @@ class CookieSyncSpec extends BaseSpec { "cookie-sync.default-limit": limit as String] + PBS_CONFIG) and: "Default cookie sync request with 2 bidders" - def bidders = [GENERIC, RUBICON] + def bidders = [GENERIC, MAGNITE] def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { it.bidders = bidders } @@ -1450,7 +1450,7 @@ class CookieSyncSpec extends BaseSpec { and: "Default cookie sync request with 2 bidders" def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { coopSync = true - bidders = [RUBICON] + bidders = [MAGNITE] } when: "PBS processes cookie sync request" @@ -1476,12 +1476,12 @@ class CookieSyncSpec extends BaseSpec { assert HttpUtil.findUrlParameterValue(genericBidderStatus.userSync?.url, "f") == PIXEL.name and: "Response should contain '#formatParam' format parameter" - def rubiconBidderStatus = response.getBidderUserSync(RUBICON) - assert rubiconBidderStatus?.userSync?.type == IFRAME - assert HttpUtil.findUrlParameterValue(rubiconBidderStatus.userSync?.url, "f") == BLANK.name + def magniteBidderStatus = response.getBidderUserSync(MAGNITE) + assert magniteBidderStatus?.userSync?.type == IFRAME + assert HttpUtil.findUrlParameterValue(magniteBidderStatus.userSync?.url, "f") == BLANK.name and: "Response should contain coop-synced bidder" - assert response.bidderStatus.bidder.containsAll(ADKERNEL, ACUITYADS, ACEEX, APPNEXUS, AAX, RUBICON, OPENX, GENERIC) + assert response.bidderStatus.bidder.containsAll(ADKERNEL, ACUITYADS, ACEEX, APPNEXUS, AAX, MAGNITE, OPENX, GENERIC) } def "PBS cookie sync request shouldn't return bidder due to filter setting request"() { @@ -1512,7 +1512,7 @@ class CookieSyncSpec extends BaseSpec { def "PBS cookie sync request should include all bidder due to filterSettings"() { given: "Cookie sync request with filter setting" def filterSettings = new FilterSettings().tap { - iframe = new MethodFilter(bidders: [RUBICON], filter: INCLUDE) + iframe = new MethodFilter(bidders: [MAGNITE], filter: INCLUDE) image = new MethodFilter(bidders: [APPNEXUS], filter: INCLUDE) } def cookieSyncRequest = new CookieSyncRequest(filterSettings: filterSettings, limit: 0) @@ -1525,7 +1525,7 @@ class CookieSyncSpec extends BaseSpec { and: "Bidder should be include by filter" assert response.getBidderUserSync(APPNEXUS) - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) } def "PBS cookie sync request should exclude all iframe bidders when asterisk present in bidders filterSettings"() { @@ -1650,7 +1650,7 @@ class CookieSyncSpec extends BaseSpec { and: "Response should contain configured bidders" assert response?.getBidderStatus()?.bidder?.sort() == - [GENERIC, RUBICON, APPNEXUS, OPENX, ACEEX, ACUITYADS, AAX, ADKERNEL].sort() + [GENERIC, MAGNITE, APPNEXUS, OPENX, ACEEX, ACUITYADS, AAX, ADKERNEL].sort() } def "PBS cookie sync request should return url for all bidders when no uids cookie is present"() { @@ -1687,7 +1687,7 @@ class CookieSyncSpec extends BaseSpec { and: "Response should contain configured bidders" assert response?.getBidderStatus()?.bidder?.sort() == - [RUBICON, APPNEXUS, OPENX, ACEEX, ACUITYADS, AAX, ADKERNEL].sort() + [MAGNITE, APPNEXUS, OPENX, ACEEX, ACUITYADS, AAX, ADKERNEL].sort() } def "PBS cookie sync request shouldn't return iframe sync url included by sync type bidders for bidder in cookie"() { @@ -1765,7 +1765,7 @@ class CookieSyncSpec extends BaseSpec { assert response.getBidderUserSync(OPENX) assert response.getBidderUserSync(GENERIC) assert response.getBidderUserSync(APPNEXUS) - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(ACEEX) } @@ -1820,7 +1820,7 @@ class CookieSyncSpec extends BaseSpec { def "PBS cookie sync request should contain only request bidders with limit when coop sync off and limit specified"() { given: "Default cookie sync request" def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap { - bidders = [APPNEXUS, GENERIC, RUBICON] + bidders = [APPNEXUS, GENERIC, MAGNITE] coopSync = false limit = 2 } @@ -1840,11 +1840,11 @@ class CookieSyncSpec extends BaseSpec { def "PBS cookie sync request should return only requested bidder and reduce image list by filter settings"() { given: "Default cookie sync request" def cookieSyncRequest = new CookieSyncRequest().tap { - bidders = [RUBICON, APPNEXUS, ACEEX] + bidders = [MAGNITE, APPNEXUS, ACEEX] coopSync = false filterSettings = new FilterSettings().tap { image = new MethodFilter(bidders: [ACEEX], filter: EXCLUDE) - iframe = new MethodFilter(bidders: [RUBICON], filter: INCLUDE) + iframe = new MethodFilter(bidders: [MAGNITE], filter: INCLUDE) } } @@ -1856,7 +1856,7 @@ class CookieSyncSpec extends BaseSpec { and: "Response should contain two requested bidders" assert response.getBidderStatus().size() == cookieSyncRequest.bidders.size() - 1 - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) assert response.getBidderUserSync(APPNEXUS) and: "Response shouldn't contain requested bidders due to filter" @@ -1882,7 +1882,7 @@ class CookieSyncSpec extends BaseSpec { def "PBS cookie sync request shouldn't return all bidders when coop sync #coopSync and limit param specified"() { given: "Cookie sync request with bidders and limit" - def cookieSyncRequest = new CookieSyncRequest(coopSync: coopSync, bidders: [APPNEXUS, RUBICON], limit: 1) + def cookieSyncRequest = new CookieSyncRequest(coopSync: coopSync, bidders: [APPNEXUS, MAGNITE], limit: 1) when: "PBS processes cookie sync request without cookies" def response = prebidServerService.sendCookieSyncRequest(cookieSyncRequest) @@ -1901,8 +1901,8 @@ class CookieSyncSpec extends BaseSpec { given: "Empty cookie sync request body" def cookieSyncRequest = new CookieSyncRequest().tap { limit = 1 - bidders = [RUBICON, GENERIC] - filterSettings = new FilterSettings(image: new MethodFilter(bidders: [RUBICON, GENERIC], filter: INCLUDE)) + bidders = [MAGNITE, GENERIC] + filterSettings = new FilterSettings(image: new MethodFilter(bidders: [MAGNITE, GENERIC], filter: INCLUDE)) } when: "PBS processes cookie sync request without cookies" @@ -1950,8 +1950,8 @@ class CookieSyncSpec extends BaseSpec { given: "Cookie sync request body" def cookieSyncRequest = new CookieSyncRequest().tap { it.coopSync = false - it.bidders = [GENERIC, RUBICON] - it.filterSettings = new FilterSettings(image: new MethodFilter(bidders: [GENERIC, RUBICON, APPNEXUS], filter: INCLUDE)) + it.bidders = [GENERIC, MAGNITE] + it.filterSettings = new FilterSettings(image: new MethodFilter(bidders: [GENERIC, MAGNITE, APPNEXUS], filter: INCLUDE)) } when: "PBS processes cookie sync request without cookies" @@ -1961,7 +1961,7 @@ class CookieSyncSpec extends BaseSpec { assert response.bidderStatus.bidder.size() == cookieSyncRequest.bidders.size() and: "Should contain requested bidders" - assert response.bidderStatus.bidder.containsAll(GENERIC, RUBICON) + assert response.bidderStatus.bidder.containsAll(GENERIC, MAGNITE) } def "PBS cookie sync request should fill response with all available coop sync bidder when limit is not specified"() { @@ -1996,7 +1996,7 @@ class CookieSyncSpec extends BaseSpec { given: "Cookie sync request body" def cookieSyncRequest = new CookieSyncRequest().tap { coopSync = false - bidders = [ACEEX, RUBICON] + bidders = [ACEEX, MAGNITE] filterSettings = new FilterSettings(image: new MethodFilter(bidders: [ACEEX], filter: EXCLUDE)) debug = true } @@ -2009,15 +2009,15 @@ class CookieSyncSpec extends BaseSpec { assert bidderStatus.error == "Rejected by request filter" and: "Response should contain one valid bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) } def "PBS cookie sync request shouldn't include bidder when bidder specified in uids cookie"() { given: "Cookie sync request body" def cookieSyncRequest = new CookieSyncRequest().tap { coopSync = false - bidders = [APPNEXUS, RUBICON] - filterSettings = new FilterSettings(image: new MethodFilter(bidders: [APPNEXUS, RUBICON], filter: INCLUDE)) + bidders = [APPNEXUS, MAGNITE] + filterSettings = new FilterSettings(image: new MethodFilter(bidders: [APPNEXUS, MAGNITE], filter: INCLUDE)) debug = false } @@ -2028,7 +2028,7 @@ class CookieSyncSpec extends BaseSpec { def response = prebidServerService.sendCookieSyncRequest(cookieSyncRequest, cookie) then: "Response should contain valid bidder" - assert response.getBidderUserSync(RUBICON) + assert response.getBidderUserSync(MAGNITE) and: "Response shouldn't contain bidder that present in uids cookie" assert !response.getBidderUserSync(APPNEXUS) diff --git a/src/test/groovy/org/prebid/server/functional/tests/EidsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/EidsSpec.groovy index 6bc172f3fa4..53ff2b7813d 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/EidsSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/EidsSpec.groovy @@ -18,7 +18,7 @@ import static org.prebid.server.functional.model.bidder.BidderName.ALIAS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.bidder.BidderName.GENERIC_CAMEL_CASE import static org.prebid.server.functional.model.bidder.BidderName.OPENX -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.bidder.BidderName.UNKNOWN import static org.prebid.server.functional.model.bidder.BidderName.WILDCARD import static org.prebid.server.functional.model.request.auction.DebugCondition.DISABLED @@ -344,7 +344,7 @@ class EidsSpec extends BaseSpec { def "PBS should pass user.eids to all bidders when any of required eid permissions doesn't match"() { given: "Default BidRequest with eids" - def eidPermission = EidPermission.getDefaultEidPermission([RUBICON]) + def eidPermission = EidPermission.getDefaultEidPermission([MAGNITE]) def userEid = updateEidClosure(Eid.from(eidPermission)) def bidRequest = BidRequest.defaultBidRequest.tap { @@ -382,7 +382,7 @@ class EidsSpec extends BaseSpec { def "PBS shouldn't pass user.eids to unmatched bidders when eidPermissions fields match user.eids"() { given: "Default BidRequest with eids" def eidPermissionWithUnmatchedBidder = eidPermission.tap { - bidders = [RUBICON] + bidders = [MAGNITE] } def userEid = updateEidClosure(eidPermissionWithUnmatchedBidder) @@ -416,7 +416,7 @@ class EidsSpec extends BaseSpec { def "PBS should filter only unauthorized eids when multiple eids with different permissions are present"() { given: "Default BidRequest with eids" - def eidPermissionWithUnmatchedBidder = EidPermission.getDefaultEidPermission([RUBICON]) + def eidPermissionWithUnmatchedBidder = EidPermission.getDefaultEidPermission([MAGNITE]) def userEid = Eid.from(eidPermissionWithUnmatchedBidder) def properEids = [Eid.defaultEid, Eid.defaultEid] def bidRequest = BidRequest.defaultBidRequest.tap { @@ -475,7 +475,7 @@ class EidsSpec extends BaseSpec { given: "Default BidRequest with eids" def userEid = Eid.getDefaultEid() def moreSpecificEidPermission = moreSpecificPermissionClosure(userEid).tap { - it.bidders = [RUBICON] + it.bidders = [MAGNITE] } def lessSpecificEidPermission = lessSpecificPermissionClosure(userEid).tap { it.bidders = [GENERIC] @@ -513,7 +513,7 @@ class EidsSpec extends BaseSpec { it.bidders = [GENERIC] } def lessSpecificEidPermission = lessSpecificPermissionClosure(userEid).tap { - it.bidders = [RUBICON] + it.bidders = [MAGNITE] } def bidRequest = BidRequest.defaultBidRequest.tap { user = new User(eids: [userEid]) @@ -548,7 +548,7 @@ class EidsSpec extends BaseSpec { it.bidders = [GENERIC] } def restrictingRule = restrictingPermissionClosure(userEid).tap { - it.bidders = [RUBICON] + it.bidders = [MAGNITE] } def bidRequest = BidRequest.defaultBidRequest.tap { user = new User(eids: [userEid]) diff --git a/src/test/groovy/org/prebid/server/functional/tests/HttpInteractionSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/HttpInteractionSpec.groovy index 1220be38b66..ff865b5cc42 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/HttpInteractionSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/HttpInteractionSpec.groovy @@ -2,7 +2,7 @@ package org.prebid.server.functional.tests import org.prebid.server.functional.model.bidder.BidderName import org.prebid.server.functional.model.bidder.Generic -import org.prebid.server.functional.model.bidder.Rubicon +import org.prebid.server.functional.model.bidder.Magnite import org.prebid.server.functional.model.request.auction.BidRequest import org.prebid.server.functional.model.request.logging.httpinteraction.HttpInteractionRequest import org.prebid.server.functional.util.PBSUtils @@ -11,7 +11,7 @@ import spock.lang.Retry import java.time.Instant import static org.prebid.server.functional.model.bidder.BidderName.GENERIC -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE class HttpInteractionSpec extends BaseSpec { @@ -27,7 +27,7 @@ class HttpInteractionSpec extends BaseSpec { and: "Default basic generic BidRequest" def bidRequest = BidRequest.defaultBidRequest bidRequest.imp.first().ext.prebid.bidder.generic = new Generic() - bidRequest.imp.first().ext.prebid.bidder.rubicon = new Rubicon(accountId: PBSUtils.randomNumber, + bidRequest.imp.first().ext.prebid.bidder.magnite = new Magnite(accountId: PBSUtils.randomNumber, siteId: PBSUtils.randomNumber, zoneId: PBSUtils.randomNumber) when: "PBS processes bidders params request" @@ -42,9 +42,9 @@ class HttpInteractionSpec extends BaseSpec { and: "PBS log should contain request to allowed adapter" def logs = defaultPbsService.getLogsByTime(startTime) def genericBidderLogs = getLogsByBidder(logs, GENERIC) - def rubiconBidderLogs = getLogsByBidder(logs, RUBICON) + def magniteBidderLogs = getLogsByBidder(logs, MAGNITE) assert getLogsByText(genericBidderLogs, bidRequest.id).size() == 1 - assert getLogsByText(rubiconBidderLogs, bidRequest.id).size() == 0 + assert getLogsByText(magniteBidderLogs, bidRequest.id).size() == 0 } def "PBS should not log request to adapter when it is not allowed"() { @@ -72,10 +72,10 @@ class HttpInteractionSpec extends BaseSpec { def request = HttpInteractionRequest.defaultHttpInteractionRequest request.bidder = GENERIC - and: "Default basic generic BidRequest with rubicon" + and: "Default basic generic BidRequest with magnite" def bidRequest = BidRequest.defaultBidRequest bidRequest.imp.first().ext.prebid.bidder.generic = new Generic() - bidRequest.imp.first().ext.prebid.bidder.rubicon = new Rubicon(accountId: PBSUtils.randomNumber, + bidRequest.imp.first().ext.prebid.bidder.magnite = new Magnite(accountId: PBSUtils.randomNumber, siteId: PBSUtils.randomNumber, zoneId: PBSUtils.randomNumber) when: "PBS processes bidders params request" @@ -97,13 +97,13 @@ class HttpInteractionSpec extends BaseSpec { and: "Logged request should not contain bidder parameters in imp[].ext.prebid.bidder.BIDDER" assert !retrievedRequest?.imp?.first()?.ext?.prebid?.bidder?.generic - assert !retrievedRequest?.imp?.first()?.ext?.prebid?.bidder?.rubicon + assert !retrievedRequest?.imp?.first()?.ext?.prebid?.bidder?.magnite and: "Logged request should contain bidder parameters in imp[].ext.BIDDER" assert retrievedRequest?.imp?.first()?.ext?.generic and: "Logged request should contain only bidder parameters for the named bidder" - assert !retrievedRequest?.imp?.first()?.ext?.rubicon + assert !retrievedRequest?.imp?.first()?.ext?.magnite } private static List getLogsByBidder(List logs, BidderName bidderName) { diff --git a/src/test/groovy/org/prebid/server/functional/tests/ImpRequestSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/ImpRequestSpec.groovy index 7a2f5923d56..2b0e4146a6c 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/ImpRequestSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/ImpRequestSpec.groovy @@ -16,7 +16,7 @@ import static org.prebid.server.functional.model.bidder.BidderName.EMPTY import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.bidder.BidderName.GENERIC_CAMEL_CASE import static org.prebid.server.functional.model.bidder.BidderName.OPENX -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.bidder.BidderName.UNKNOWN import static org.prebid.server.functional.model.bidder.BidderName.WILDCARD import static org.prebid.server.functional.model.bidder.BidderName.GENER_X @@ -206,7 +206,7 @@ class ImpRequestSpec extends BaseSpec { def bidRequest = BidRequest.defaultBidRequest.tap { imp.first.tap { pmp = impPmp - ext.prebid.imp = [(RUBICON): new Imp(pmp: Pmp.defaultPmp)] + ext.prebid.imp = [(MAGNITE): new Imp(pmp: Pmp.defaultPmp)] } } diff --git a/src/test/groovy/org/prebid/server/functional/tests/SetUidSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/SetUidSpec.groovy index f7f8594f95f..b767cec7f4e 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/SetUidSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/SetUidSpec.groovy @@ -23,14 +23,14 @@ import static org.prebid.server.functional.model.bidder.BidderName.GENERIC_CAMEL import static org.prebid.server.functional.model.bidder.BidderName.GRID import static org.prebid.server.functional.model.bidder.BidderName.OPENX import static org.prebid.server.functional.model.bidder.BidderName.OPENX_ALIAS -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.bidder.BidderName.UNKNOWN import static org.prebid.server.functional.model.bidder.BidderName.WILDCARD import static org.prebid.server.functional.model.request.setuid.UidWithExpiry.defaultUidWithExpiry import static org.prebid.server.functional.model.response.cookiesync.UserSyncInfo.Type.REDIRECT import static org.prebid.server.functional.testcontainers.Dependencies.networkServiceContainer import static org.prebid.server.functional.util.privacy.TcfConsent.GENERIC_VENDOR_ID -import static org.prebid.server.functional.util.privacy.TcfConsent.RUBICON_VENDOR_ID +import static org.prebid.server.functional.util.privacy.TcfConsent.MAGNITE_VENDOR_ID class SetUidSpec extends BaseSpec { @@ -50,8 +50,8 @@ class SetUidSpec extends BaseSpec { private static final Map PBS_CONFIG = ["host-cookie.max-cookie-size-bytes" : MAX_COOKIE_SIZE as String, - "adapters.${RUBICON.value}.enabled" : "true", - "adapters.${RUBICON.value}.usersync.cookie-family-name" : RUBICON.value, + "adapters.${MAGNITE.value}.enabled" : "true", + "adapters.${MAGNITE.value}.usersync.cookie-family-name" : MAGNITE.value, "adapters.${OPENX.value}.enabled" : "true", "adapters.${OPENX.value}.usersync.cookie-family-name" : OPENX.value, @@ -131,7 +131,7 @@ class SetUidSpec extends BaseSpec { def "PBS setuid should remove expired uids cookie"() { given: "Default SetuidRequest" def request = SetuidRequest.defaultSetuidRequest - def uidsCookie = UidsCookie.getDefaultUidsCookie(RUBICON, -RANDOM_EXPIRE_DAY) + def uidsCookie = UidsCookie.getDefaultUidsCookie(MAGNITE, -RANDOM_EXPIRE_DAY) when: "PBS processes setuid request" def response = singleCookiesPbsService.sendSetUidRequest(request, uidsCookie) @@ -150,7 +150,7 @@ class SetUidSpec extends BaseSpec { uid = UUID.randomUUID().toString() } def uidsCookie = UidsCookie.defaultUidsCookie.tap { - tempUIDs = [(RUBICON): defaultUidWithExpiry] + tempUIDs = [(MAGNITE): defaultUidWithExpiry] } when: "PBS processes setuid request" @@ -158,7 +158,7 @@ class SetUidSpec extends BaseSpec { then: "Response should contain requested tempUIDs" assert response.uidsCookie.tempUIDs[GENERIC] - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] cleanup: "Stop and remove pbs container" pbsServiceFactory.removeContainer(pbsConfig) @@ -175,17 +175,17 @@ class SetUidSpec extends BaseSpec { it.bidder = genericBidder uid = UUID.randomUUID().toString() } - def rubiconBidder = RUBICON + def magniteBidder = MAGNITE def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY + 1), - (rubiconBidder): getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] + (magniteBidder): getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] } when: "PBS processes setuid request" def response = prebidServerService.sendSetUidRequest(request, uidsCookie) then: "Response should contain uids cookies" - assert response.uidsCookie.tempUIDs[rubiconBidder] + assert response.uidsCookie.tempUIDs[magniteBidder] assert response.uidsCookie.tempUIDs[genericBidder] cleanup: "Stop and remove pbs container" @@ -205,18 +205,18 @@ class SetUidSpec extends BaseSpec { def appnexusUidWithExpiry = defaultUidWithExpiry.tap { expires = ZonedDateTime.now(Clock.systemUTC()).plusDays(5) } - def rubiconUidWithExpiry = defaultUidWithExpiry.tap { + def magniteUidWithExpiry = defaultUidWithExpiry.tap { expires = ZonedDateTime.now(Clock.systemUTC()).plusDays(1) } tempUIDs = [(APPNEXUS): appnexusUidWithExpiry, - (RUBICON) : rubiconUidWithExpiry] + (MAGNITE) : magniteUidWithExpiry] } when: "PBS processes setuid request" def response = prebidServerService.sendSetUidRequest(request, uidsCookie) then: "Response should contain uids cookies" - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] assert response.uidsCookie.tempUIDs[GENERIC] cleanup: "Stop and remove pbs container" @@ -237,7 +237,7 @@ class SetUidSpec extends BaseSpec { def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS): defaultUidWithExpiry, - (RUBICON) : defaultUidWithExpiry] + (MAGNITE) : defaultUidWithExpiry] } when: "PBS processes setuid request" @@ -249,7 +249,7 @@ class SetUidSpec extends BaseSpec { and: "Response should contain uids cookies" assert response.uidsCookie.tempUIDs[APPNEXUS] - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] cleanup: "Stop and remove pbs container" pbsServiceFactory.removeContainer(pbsConfig) @@ -257,19 +257,19 @@ class SetUidSpec extends BaseSpec { def "PBS setuid should reject bidder when cookie's filled and requested bidder in pri and rejected by tcf"() { given: "Setuid request" - def pbsConfig = PBS_CONFIG + ["gdpr.host-vendor-id": RUBICON_VENDOR_ID.toString(), - "cookie-sync.pri" : RUBICON.value] + def pbsConfig = PBS_CONFIG + ["gdpr.host-vendor-id": MAGNITE_VENDOR_ID.toString(), + "cookie-sync.pri" : MAGNITE.value] def prebidServerService = pbsServiceFactory.getService(pbsConfig) def request = SetuidRequest.defaultSetuidRequest.tap { - it.bidder = RUBICON + it.bidder = MAGNITE gdpr = "1" gdprConsent = new TcfConsent.Builder().setDisclosedVendors([GENERIC_VENDOR_ID]).build() } def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS): defaultUidWithExpiry, - (RUBICON) : defaultUidWithExpiry] + (MAGNITE) : defaultUidWithExpiry] } when: "PBS processes setuid request" @@ -282,7 +282,7 @@ class SetUidSpec extends BaseSpec { and: "usersync.BIDDER.tcf.blocked metric should be updated" def metric = prebidServerService.sendCollectedMetricsRequest() - assert metric["usersync.${RUBICON.value}.tcf.blocked"] == 1 + assert metric["usersync.${MAGNITE.value}.tcf.blocked"] == 1 cleanup: "Stop and remove pbs container" pbsServiceFactory.removeContainer(pbsConfig) @@ -303,7 +303,7 @@ class SetUidSpec extends BaseSpec { def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS): getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY), - (RUBICON) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY + 1)] + (MAGNITE) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY + 1)] } when: "PBS processes setuid request" @@ -311,7 +311,7 @@ class SetUidSpec extends BaseSpec { and: "usersync.FAMILY.sizeblocked metric should be updated" def metrics = prebidServerService.sendCollectedMetricsRequest() - assert metrics["usersync.${RUBICON.value}.sizeblocked"] == 1 + assert metrics["usersync.${MAGNITE.value}.sizeblocked"] == 1 then: "Response should contain uids cookies" assert response.uidsCookie.tempUIDs[APPNEXUS] @@ -335,7 +335,7 @@ class SetUidSpec extends BaseSpec { and: "Set up set uid cookie" def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS): getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY + 1), - (RUBICON) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] + (MAGNITE) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] } and: "Flush metrics" @@ -366,7 +366,7 @@ class SetUidSpec extends BaseSpec { def "PBS set uid should emit sizedout metric and remove most distant expiration bidder from uids cookie in prioritized bidder"() { given: "PBS config" - def pbsConfig = PBS_CONFIG + ["cookie-sync.pri": "$OPENX.value, $APPNEXUS.value, $RUBICON.value" as String] + def pbsConfig = PBS_CONFIG + ["cookie-sync.pri": "$OPENX.value, $APPNEXUS.value, $MAGNITE.value" as String] def prebidServerService = pbsServiceFactory.getService(pbsConfig) and: "Set uid request" @@ -376,7 +376,7 @@ class SetUidSpec extends BaseSpec { def uidsCookie = UidsCookie.defaultUidsCookie.tap { tempUIDs = [(APPNEXUS): getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY + 1), (OPENX) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY), - (RUBICON) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] + (MAGNITE) : getDefaultUidWithExpiry(RANDOM_EXPIRE_DAY)] } and: "Flush metrics" @@ -387,7 +387,7 @@ class SetUidSpec extends BaseSpec { then: "Response should contain pri bidder in uids cookies" assert response.uidsCookie.tempUIDs[OPENX] - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] and: "Response set cookie header size should be lowest or the same as max cookie config size" assert getSetUidsHeaders(response).first.split("Secure;")[0].length() <= MAX_COOKIE_SIZE @@ -459,21 +459,21 @@ class SetUidSpec extends BaseSpec { uid = UUID.randomUUID().toString() } def genericUidsCookie = UidsCookie.getDefaultUidsCookie(GENERIC) - def rubiconUidsCookie = UidsCookie.getDefaultUidsCookie(RUBICON) + def magniteUidsCookie = UidsCookie.getDefaultUidsCookie(MAGNITE) when: "PBS processes setuid request" - def response = multipleCookiesPbsService.sendSetUidRequest(request, [genericUidsCookie, rubiconUidsCookie]) + def response = multipleCookiesPbsService.sendSetUidRequest(request, [genericUidsCookie, magniteUidsCookie]) then: "Response should contain requested tempUIDs" assert response.uidsCookie.tempUIDs[GENERIC] - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] and: "Headers uids cookies should contain same cookie as response" def setUidsHeaders = getSetUidsHeaders(response) def uidsCookie = extractHeaderTempUIDs(setUidsHeaders.first) assert setUidsHeaders.size() == 1 assert uidsCookie.tempUIDs[GENERIC] - assert uidsCookie.tempUIDs[RUBICON] + assert uidsCookie.tempUIDs[MAGNITE] } def "PBS should send multiple uids cookies by priority and expiration timestamp"() { @@ -489,15 +489,15 @@ class SetUidSpec extends BaseSpec { def request = SetuidRequest.defaultSetuidRequest def genericUidsCookie = UidsCookie.getDefaultUidsCookie(GENERIC, RANDOM_EXPIRE_DAY + 1) - def rubiconUidsCookie = UidsCookie.getDefaultUidsCookie(RUBICON, RANDOM_EXPIRE_DAY + 2) + def magniteUidsCookie = UidsCookie.getDefaultUidsCookie(MAGNITE, RANDOM_EXPIRE_DAY + 2) def openxUidsCookie = UidsCookie.getDefaultUidsCookie(OPENX, RANDOM_EXPIRE_DAY + 3) def appnexusUidsCookie = UidsCookie.getDefaultUidsCookie(APPNEXUS, RANDOM_EXPIRE_DAY) when: "PBS processes setuid request" - def response = prebidServerService.sendSetUidRequest(request, [appnexusUidsCookie, genericUidsCookie, rubiconUidsCookie, openxUidsCookie]) + def response = prebidServerService.sendSetUidRequest(request, [appnexusUidsCookie, genericUidsCookie, magniteUidsCookie, openxUidsCookie]) then: "Response should contain requested tempUIDs" - assert response.uidsCookie.tempUIDs.keySet() == new LinkedHashSet([GENERIC, OPENX, APPNEXUS, RUBICON]) + assert response.uidsCookie.tempUIDs.keySet() == new LinkedHashSet([GENERIC, OPENX, APPNEXUS, MAGNITE]) cleanup: "Stop and remove pbs container" pbsServiceFactory.removeContainer(pbsConfig) @@ -545,14 +545,14 @@ class SetUidSpec extends BaseSpec { uid = UUID.randomUUID().toString() } def genericUidsCookie = UidsCookie.getDefaultUidsCookie(GENERIC) - def rubiconUidsCookie = UidsCookie.getDefaultUidsCookie(RUBICON) + def magniteUidsCookie = UidsCookie.getDefaultUidsCookie(MAGNITE) when: "PBS processes setuid request" - def response = multipleCookiesPbsService.sendSetUidRequest(request, [genericUidsCookie, rubiconUidsCookie]) + def response = multipleCookiesPbsService.sendSetUidRequest(request, [genericUidsCookie, magniteUidsCookie]) then: "Response should contain requested tempUIDs" assert response.uidsCookie.tempUIDs[GENERIC] - assert response.uidsCookie.tempUIDs[RUBICON] + assert response.uidsCookie.tempUIDs[MAGNITE] and: "Headers uids cookies should contain same cookie as response" assert getSetUidsHeaders(response).size() == 1 diff --git a/src/test/groovy/org/prebid/server/functional/tests/prometheus/PrometheusSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/prometheus/PrometheusSpec.groovy index 538705e3b68..a4ff6ed63d5 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/prometheus/PrometheusSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/prometheus/PrometheusSpec.groovy @@ -81,8 +81,8 @@ class PrometheusSpec extends BaseSpec { def "PBS should add namespace and subsystem parts to Prometheus metric names when those are config provided"() { given: "PBS config with set up Prometheus" - def namespace = "namespace_01_Rubicon" - def subsystem = "subsystem_01_Rubicon" + def namespace = "namespace_01_Magnite" + def subsystem = "subsystem_01_Magnite" def config = basePrometheusConfig + getNamespaceSubsystemConfig(namespace, subsystem) and: "PBS is started" @@ -105,8 +105,8 @@ class PrometheusSpec extends BaseSpec { def "PBS service fails to start when invalid symbols by namespace and subsystem in Prometheus config are present"() { given: "PBS config with invalid symbols in namespace, subsystem Prometheus config" - def namespace = "namespace_01_Rubi%con" - def subsystem = "sub@system_01_Rubicon" + def namespace = "namespace_01_Mag%nite" + def subsystem = "sub@system_01_Magnite" def config = basePrometheusConfig + getNamespaceSubsystemConfig(namespace, subsystem) and: "PBS container is prepared" diff --git a/src/test/groovy/org/prebid/server/functional/util/privacy/TcfConsent.groovy b/src/test/groovy/org/prebid/server/functional/util/privacy/TcfConsent.groovy index 363c7eca4bd..a2f085c9311 100644 --- a/src/test/groovy/org/prebid/server/functional/util/privacy/TcfConsent.groovy +++ b/src/test/groovy/org/prebid/server/functional/util/privacy/TcfConsent.groovy @@ -12,7 +12,7 @@ import static org.prebid.server.functional.util.privacy.TcfConsent.TcfPolicyVers class TcfConsent implements ConsentString { - public static final Integer RUBICON_VENDOR_ID = PBSUtils.getRandomNumber(1, 65534) + public static final Integer MAGNITE_VENDOR_ID = PBSUtils.getRandomNumber(1, 65534) public static final Integer GENERIC_VENDOR_ID = PBSUtils.getRandomNumber(1, 65534) public static final Integer VENDOR_LIST_VERSION = PBSUtils.getRandomNumber(1, 4095) diff --git a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java b/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java similarity index 91% rename from src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java rename to src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java index 5444bce997b..0012756a67c 100644 --- a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.rubicon; +package org.prebid.server.bidder.magnite; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -44,34 +44,34 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.prebid.server.VertxTest; +import org.prebid.server.bidder.magnite.proto.request.MagniteAppExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteBannerExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteBannerExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRpRtb; +import org.prebid.server.bidder.magnite.proto.request.MagniteImpExtRpTrack; +import org.prebid.server.bidder.magnite.proto.request.MagniteNative; +import org.prebid.server.bidder.magnite.proto.request.MagnitePubExt; +import org.prebid.server.bidder.magnite.proto.request.MagnitePubExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteSiteExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteSiteExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargeting; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargetingExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteTargetingExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteUserExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteUserExtRp; +import org.prebid.server.bidder.magnite.proto.request.MagniteVideoExt; +import org.prebid.server.bidder.magnite.proto.request.MagniteVideoExtRp; +import org.prebid.server.bidder.magnite.proto.response.MagniteBid; +import org.prebid.server.bidder.magnite.proto.response.MagniteBidResponse; +import org.prebid.server.bidder.magnite.proto.response.MagniteSeatBid; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; import org.prebid.server.bidder.model.BidderError; import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.HttpResponse; import org.prebid.server.bidder.model.Result; -import org.prebid.server.bidder.rubicon.proto.request.RubiconAppExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconBannerExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconBannerExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRpRtb; -import org.prebid.server.bidder.rubicon.proto.request.RubiconImpExtRpTrack; -import org.prebid.server.bidder.rubicon.proto.request.RubiconNative; -import org.prebid.server.bidder.rubicon.proto.request.RubiconPubExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconPubExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconSiteExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconSiteExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargeting; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargetingExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconTargetingExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconUserExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconUserExtRp; -import org.prebid.server.bidder.rubicon.proto.request.RubiconVideoExt; -import org.prebid.server.bidder.rubicon.proto.request.RubiconVideoExtRp; -import org.prebid.server.bidder.rubicon.proto.response.RubiconBid; -import org.prebid.server.bidder.rubicon.proto.response.RubiconBidResponse; -import org.prebid.server.bidder.rubicon.proto.response.RubiconSeatBid; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.exception.PreBidException; import org.prebid.server.floors.PriceFloorResolver; @@ -100,10 +100,10 @@ import org.prebid.server.proto.openrtb.ext.request.ExtSource; import org.prebid.server.proto.openrtb.ext.request.ExtUser; import org.prebid.server.proto.openrtb.ext.request.ImpMediaType; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubicon; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubicon.ExtImpRubiconBuilder; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubiconDebug; -import org.prebid.server.proto.openrtb.ext.request.rubicon.RubiconVideoParams; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagnite; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagnite.ExtImpMagniteBuilder; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagniteDebug; +import org.prebid.server.proto.openrtb.ext.request.magnite.MagniteVideoParams; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidMeta; import org.prebid.server.util.HttpUtil; @@ -143,7 +143,7 @@ import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative; @ExtendWith(MockitoExtension.class) -public class RubiconBidderTest extends VertxTest { +public class MagniteBidderTest extends VertxTest { private static final String BIDDER_NAME = "bidderName"; private static final String ENDPOINT_URL = "http://rubiconproject.com/exchange.json"; @@ -168,11 +168,11 @@ public class RubiconBidderTest extends VertxTest { @Mock(strictness = LENIENT) private IdGenerator idGenerator; - private RubiconBidder target; + private MagniteBidder target; @BeforeEach public void setUp() { - target = new RubiconBidder( + target = new MagniteBidder( BIDDER_NAME, ENDPOINT_URL, DEFAULT_TK_X_INT, @@ -195,7 +195,7 @@ public void setUp() { @Test public void creationShouldFailOnInvalidEndpointUrl() { assertThatIllegalArgumentException().isThrownBy( - () -> new RubiconBidder(BIDDER_NAME, + () -> new MagniteBidder(BIDDER_NAME, "invalid_url", EXTERNAL_URL, DEFAULT_TK_X_INT, @@ -270,7 +270,7 @@ public void makeHttpRequestsShouldFilterAllImpressionsAndReturnErrorMeessagesWit + " Allowed types are [banner, video, native]", BidderError.Type.bad_input), BidderError.of("Impression with id 2 rejected with invalid type `audio`." + " Allowed types are [banner, video, native]", BidderError.Type.bad_input), - BidderError.of("There are no valid impressions to create bid request to rubicon bidder", + BidderError.of("There are no valid impressions to create bid request to magnite bidder", BidderError.Type.bad_input)); assertThat(result.getValue()).isEmpty(); } @@ -282,7 +282,7 @@ public void makeHttpRequestsShouldCreateSeparateRequestForEachMediaTypeForMultiF .video(Video.builder().w(300).h(200).build()) .xNative(Native.builder().build()) .banner(Banner.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.bidOnMultiFormat(true)); + extImpMagniteBuilder -> extImpMagniteBuilder.bidOnMultiFormat(true)); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -313,7 +313,7 @@ public void makeHttpRequestsShouldSetImpExtRpRtbFormatsToImpExtFormats() { // given final BidRequest bidRequest = givenBidRequest( impBuilder -> impBuilder.banner(Banner.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.formats(Set.of(ImpMediaType.video, ImpMediaType.banner))); + extImpMagniteBuilder -> extImpMagniteBuilder.formats(Set.of(ImpMediaType.video, ImpMediaType.banner))); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -324,10 +324,10 @@ public void makeHttpRequestsShouldSetImpExtRpRtbFormatsToImpExtFormats() { .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getRtb) - .flatExtracting(RubiconImpExtRpRtb::getFormats) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getRtb) + .flatExtracting(MagniteImpExtRpRtb::getFormats) .containsExactlyInAnyOrder(ImpMediaType.video, ImpMediaType.banner); } @@ -337,7 +337,7 @@ public void makeHttpRequestsShouldNotSetImpExtRpRtbFormatsToImpFormatsWhenImpCon // given final BidRequest bidRequest = givenBidRequest( impBuilder -> impBuilder.banner(Banner.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.bidOnMultiFormat(true)); + extImpMagniteBuilder -> extImpMagniteBuilder.bidOnMultiFormat(true)); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -348,9 +348,9 @@ public void makeHttpRequestsShouldNotSetImpExtRpRtbFormatsToImpFormatsWhenImpCon .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getRtb) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getRtb) .containsOnlyNulls(); } @@ -361,7 +361,7 @@ public void makeHttpRequestsShouldSetImpExtRpRtbFormatsToSuppliedImpFormatsWhenB impBuilder -> impBuilder .banner(Banner.builder().w(300).h(200).build()) .video(Video.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.bidOnMultiFormat(true)); + extImpMagniteBuilder -> extImpMagniteBuilder.bidOnMultiFormat(true)); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -372,10 +372,10 @@ public void makeHttpRequestsShouldSetImpExtRpRtbFormatsToSuppliedImpFormatsWhenB .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getRtb) - .extracting(RubiconImpExtRpRtb::getFormats) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getRtb) + .extracting(MagniteImpExtRpRtb::getFormats) .containsExactlyInAnyOrder( Set.of(ImpMediaType.video, ImpMediaType.banner), Set.of(ImpMediaType.video, ImpMediaType.banner)); @@ -388,11 +388,11 @@ public void makeHttpRequestsShouldCreateSeparateRequestsOnlyForMultiformatImps() final Imp imp1 = givenImp(impBuilder -> impBuilder .video(Video.builder().w(300).h(200).build()) .banner(Banner.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.bidOnMultiFormat(true)); + extImpMagniteBuilder -> extImpMagniteBuilder.bidOnMultiFormat(true)); final Imp imp2 = givenImp(impBuilder -> impBuilder .video(Video.builder().w(300).h(200).build()) .banner(Banner.builder().w(300).h(200).build()), - extImpRubiconBuilder -> extImpRubiconBuilder.bidOnMultiFormat(false)); + extImpMagniteBuilder -> extImpMagniteBuilder.bidOnMultiFormat(false)); final BidRequest bidRequest = BidRequest.builder().imp(asList(imp1, imp2)).build(); // when @@ -428,7 +428,7 @@ public void makeHttpRequestsShouldAddMaxbidsAttributeFromExtPrebidMultibid() { // given final BidRequest bidRequest = givenBidRequest( builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() - .multibid(singletonList(ExtRequestPrebidMultiBid.of("rubicon", null, 5, "prefix"))) + .multibid(singletonList(ExtRequestPrebidMultiBid.of("magnite", null, 5, "prefix"))) .build())), impBuilder -> impBuilder.video(Video.builder().build()), identity()); @@ -442,8 +442,8 @@ public void makeHttpRequestsShouldAddMaxbidsAttributeFromExtPrebidMultibid() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getExt).doesNotContainNull() - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getMaxbids) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getMaxbids) .containsExactly(5); } @@ -513,7 +513,7 @@ public void makeHttpRequestsShouldPassBannerBtypeField() { .format(singletonList(Format.builder().w(300).h(250).build())) .btype(List.of(3, 4)) .build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpRubicon.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpMagnite.builder() .sizes(singletonList(15)).build()))) .build())) .build(); @@ -540,7 +540,7 @@ public void makeHttpRequestsShouldPassBannerBattrField() { .format(singletonList(Format.builder().w(300).h(250).build())) .battr(List.of(3, 4)) .build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpRubicon.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpMagnite.builder() .sizes(singletonList(15)).build()))) .build())) .build(); @@ -607,7 +607,7 @@ public void makeHttpRequestsShouldAddMaxbidsAttributeAsNullIfExtPrebidMultibidMa final BidRequest bidRequest = givenBidRequest( builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() .multibid(singletonList( - ExtRequestPrebidMultiBid.of("rubicon", null, null, "prefix"))) + ExtRequestPrebidMultiBid.of("magnite", null, null, "prefix"))) .build())), impBuilder -> impBuilder.video(Video.builder().build()), identity()); @@ -621,8 +621,8 @@ public void makeHttpRequestsShouldAddMaxbidsAttributeAsNullIfExtPrebidMultibidMa .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getExt).doesNotContainNull() - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getMaxbids) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getMaxbids) .containsOnlyNulls(); } @@ -653,12 +653,12 @@ public void makeHttpRequestsShouldFillImpExt() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getExt).doesNotContainNull() - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .containsExactly(RubiconImpExt.builder() - .rp(RubiconImpExtRp.of( + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .containsExactly(MagniteImpExt.builder() + .rp(MagniteImpExtRp.of( 4001, expectedTarget, - RubiconImpExtRpTrack.of("", ""), + MagniteImpExtRpTrack.of("", ""), null, "uuid_bid_id")) .skadn(givenSkadn) @@ -675,7 +675,7 @@ public void makeHttpRequestsShouldPassBannerFormat() { Format.builder().w(300).h(250).build(), Format.builder().w(300).h(600).build())) .build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpRubicon.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpMagnite.builder() .sizes(singletonList(15)).build()))) .build())) .build(); @@ -705,7 +705,7 @@ public void makeHttpRequestsShouldSetMobilePortrait67SizeIdFotInterstitialNotVal .format(singletonList( Format.builder().w(360).h(616).build())) .build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpRubicon.builder().build()))) + .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpMagnite.builder().build()))) .build())) .build(); @@ -721,7 +721,7 @@ public void makeHttpRequestsShouldSetMobilePortrait67SizeIdFotInterstitialNotVal .containsOnly(Banner.builder() .format(singletonList( Format.builder().w(360).h(616).build())) - .ext(mapper.valueToTree(RubiconBannerExt.of(RubiconBannerExtRp.of("text/html")))) + .ext(mapper.valueToTree(MagniteBannerExt.of(MagniteBannerExtRp.of("text/html")))) .build()); } @@ -747,7 +747,7 @@ public void makeHttpRequestsShouldCreateBannerRequestIfImpHasBannerAndVideoButNo Banner.builder() .format(singletonList(Format.builder().w(300).h(250).build())) .ext(mapper.valueToTree( - RubiconBannerExt.of(RubiconBannerExtRp.of("text/html")))) + MagniteBannerExt.of(MagniteBannerExtRp.of("text/html")))) .build(), null)); // video is removed } @@ -880,7 +880,7 @@ public void makeHttpRequestsShouldIgnoreBidRequestIfCurrencyServiceThrowsAnExcep @Test public void shouldNotSetSizeIfBidderParamsIsMissingSizeId() { // given - target = new RubiconBidder( + target = new MagniteBidder( BIDDER_NAME, ENDPOINT_URL, DEFAULT_TK_X_INT, @@ -897,7 +897,7 @@ public void shouldNotSetSizeIfBidderParamsIsMissingSizeId() { jacksonMapper); final BidRequest bidRequest = givenBidRequest( builder -> builder.instl(1).video(Video.builder().placement(1).build()), - builder -> builder.video(RubiconVideoParams.builder().sizeId(null).build())); + builder -> builder.video(MagniteVideoParams.builder().sizeId(null).build())); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -917,7 +917,7 @@ public void makeHttpRequestsShouldFillVideoExt() { // given final BidRequest bidRequest = givenBidRequest( builder -> builder.video(Video.builder().build()), - builder -> builder.video(RubiconVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build())); + builder -> builder.video(MagniteVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build())); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -929,18 +929,18 @@ public void makeHttpRequestsShouldFillVideoExt() { .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getVideo).doesNotContainNull() .extracting(Video::getExt).doesNotContainNull() - .extracting(ext -> mapper.treeToValue(ext, RubiconVideoExt.class)) - .containsOnly(RubiconVideoExt.of(5, 10, RubiconVideoExtRp.of(14), null)); + .extracting(ext -> mapper.treeToValue(ext, MagniteVideoExt.class)) + .containsOnly(MagniteVideoExt.of(5, 10, MagniteVideoExtRp.of(14), null)); } @Test public void makeHttpRequestsShouldTransferRewardedVideoFlagIntoRewardedVideoObject() { // given - final ExtImpRubicon rubicon = ExtImpRubicon.builder() - .video(RubiconVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) + final ExtImpMagnite magnite = ExtImpMagnite.builder() + .video(MagniteVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) .build(); - final ExtPrebid ext = ExtPrebid.of(null, rubicon); + final ExtPrebid ext = ExtPrebid.of(null, magnite); final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder .rwdd(1) @@ -957,19 +957,19 @@ public void makeHttpRequestsShouldTransferRewardedVideoFlagIntoRewardedVideoObje .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getVideo).doesNotContainNull() .extracting(Video::getExt).doesNotContainNull() - .extracting(ex -> mapper.treeToValue(ex, RubiconVideoExt.class)) - .containsOnly(RubiconVideoExt.of(5, 10, RubiconVideoExtRp.of(14), "rewarded")); + .extracting(ex -> mapper.treeToValue(ex, MagniteVideoExt.class)) + .containsOnly(MagniteVideoExt.of(5, 10, MagniteVideoExtRp.of(14), "rewarded")); } @Test public void makeHttpRequestsShouldIgnoreRewardedVideoLogic() { // given final ExtImpPrebid prebid = ExtImpPrebid.builder().build(); - final ExtImpRubicon rubicon = ExtImpRubicon.builder() - .video(RubiconVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) + final ExtImpMagnite magnite = ExtImpMagnite.builder() + .video(MagniteVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) .build(); - final ExtPrebid ext = ExtPrebid.of(prebid, rubicon); + final ExtPrebid ext = ExtPrebid.of(prebid, magnite); final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.video(Video.builder().build()) .ext(mapper.valueToTree(ext))); @@ -984,19 +984,19 @@ public void makeHttpRequestsShouldIgnoreRewardedVideoLogic() { .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getVideo).doesNotContainNull() .extracting(Video::getExt).doesNotContainNull() - .extracting(ex -> mapper.treeToValue(ex, RubiconVideoExt.class)) - .containsOnly(RubiconVideoExt.of(5, 10, RubiconVideoExtRp.of(14), null)); + .extracting(ex -> mapper.treeToValue(ex, MagniteVideoExt.class)) + .containsOnly(MagniteVideoExt.of(5, 10, MagniteVideoExtRp.of(14), null)); } @Test public void makeHttpRequestsShouldIgnoreRewardedVideoLogicIfRewardedInventoryIsNotOne() { // given final ExtImpPrebid prebid = ExtImpPrebid.builder().isRewardedInventory(2).build(); - final ExtImpRubicon rubicon = ExtImpRubicon.builder() - .video(RubiconVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) + final ExtImpMagnite magnite = ExtImpMagnite.builder() + .video(MagniteVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) .build(); - final ExtPrebid ext = ExtPrebid.of(prebid, rubicon); + final ExtPrebid ext = ExtPrebid.of(prebid, magnite); final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.video(Video.builder().build()) .ext(mapper.valueToTree(ext))); @@ -1011,8 +1011,8 @@ public void makeHttpRequestsShouldIgnoreRewardedVideoLogicIfRewardedInventoryIsN .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getVideo).doesNotContainNull() .extracting(Video::getExt).doesNotContainNull() - .extracting(ex -> mapper.treeToValue(ex, RubiconVideoExt.class)) - .containsOnly(RubiconVideoExt.of(5, 10, RubiconVideoExtRp.of(14), null)); + .extracting(ex -> mapper.treeToValue(ex, MagniteVideoExt.class)) + .containsOnly(MagniteVideoExt.of(5, 10, MagniteVideoExtRp.of(14), null)); } @Test @@ -1020,11 +1020,11 @@ public void makeHttpRequestsShouldNotFailIfVideoParamIsNull() { // given final ExtImpPrebid prebid = ExtImpPrebid .builder().build(); - final ExtImpRubicon rubicon = ExtImpRubicon.builder() + final ExtImpMagnite magnite = ExtImpMagnite.builder() .video(null) .build(); - final ExtPrebid ext = ExtPrebid.of(prebid, rubicon); + final ExtPrebid ext = ExtPrebid.of(prebid, magnite); final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.video(Video.builder().build()) .ext(mapper.valueToTree(ext))); @@ -1040,11 +1040,11 @@ public void makeHttpRequestsShouldNotFailIfVideoParamIsNull() { public void makeHttpRequestsShouldIgnoreRewardedVideoFlag() { // given final ExtImpPrebid prebid = ExtImpPrebid.builder().isRewardedInventory(0).build(); - final ExtImpRubicon rubicon = ExtImpRubicon.builder() - .video(RubiconVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) + final ExtImpMagnite magnite = ExtImpMagnite.builder() + .video(MagniteVideoParams.builder().skip(5).skipdelay(10).sizeId(14).build()) .build(); - final ExtPrebid ext = ExtPrebid.of(prebid, rubicon); + final ExtPrebid ext = ExtPrebid.of(prebid, magnite); final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.video(Video.builder().build()) .ext(mapper.valueToTree(ext))); @@ -1059,8 +1059,8 @@ public void makeHttpRequestsShouldIgnoreRewardedVideoFlag() { .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getVideo).doesNotContainNull() .extracting(Video::getExt).doesNotContainNull() - .extracting(ex -> mapper.treeToValue(ex, RubiconVideoExt.class)) - .containsOnly(RubiconVideoExt.of(5, 10, RubiconVideoExtRp.of(14), null)); + .extracting(ex -> mapper.treeToValue(ex, MagniteVideoExt.class)) + .containsOnly(MagniteVideoExt.of(5, 10, MagniteVideoExtRp.of(14), null)); } @Test @@ -1083,8 +1083,8 @@ public void makeHttpRequestsShouldFillUserExtIfUserAndVisitorPresent() { .containsOnly(User.builder() .ext(jacksonMapper.fillExtension( ExtUser.builder().build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(mapper.valueToTree( + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(mapper.valueToTree( Visitor.of(singletonList("new"), singletonList("iphone"))))) .build())) .build()); @@ -1116,8 +1116,8 @@ public void makeHttpRequestsShouldFillUserExtRpWithIabAttributeIfSegtaxEqualsFou .extracting(User::getExt) .containsOnly(jacksonMapper.fillExtension( ExtUser.builder().build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(expectedTarget)) + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(expectedTarget)) .build())); } @@ -1696,7 +1696,7 @@ public void makeHttpRequestsShouldPassValidNativeRequestToRequestNativeObjectIfV .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getXNative) - .containsExactly(RubiconNative.builder() + .containsExactly(MagniteNative.builder() .requestNative(expectedNativeRequest) .request(nativeRequest) .ver("1.2") @@ -1727,7 +1727,7 @@ public void makeHttpRequestsShouldPassValidNativeRequestToRequestNativeObjectIfV .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getXNative) - .containsExactly(RubiconNative.builder() + .containsExactly(MagniteNative.builder() .requestNative(expectedNativeRequest) .request(nativeRequest) .build()); @@ -1814,8 +1814,8 @@ public void makeHttpRequestsShouldMergeUserExtDataFieldsToUserExtRp() { .data(mapper.createObjectNode() .set("property", mapper.createArrayNode().add("valueFromExtData"))) .build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(mapper.createObjectNode() + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(mapper.createObjectNode() .set("property", mapper.createArrayNode().add("valueFromExtRpTarget")))) .build()); @@ -1835,8 +1835,8 @@ public void makeHttpRequestsShouldMergeUserExtDataFieldsToUserExtRp() { .extracting(User::getExt) .containsOnly(jacksonMapper.fillExtension( ExtUser.builder().build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(mapper.createObjectNode() + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(mapper.createObjectNode() .set("property", mapper.createArrayNode() .add("valueFromExtRpTarget") .add("valueFromExtData")))) @@ -1863,8 +1863,8 @@ public void makeHttpRequestsShouldCreateUserIfVisitorPresent() { .containsOnly(User.builder() .ext(jacksonMapper.fillExtension( ExtUser.builder().build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(mapper.valueToTree( + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(mapper.valueToTree( Visitor.of(singletonList("new"), singletonList("iphone"))))) .build())) .build()); @@ -1906,8 +1906,8 @@ public void makeHttpRequestsShouldNormalizeAndCopyUserExtDataFieldsToUserExtRp() .extracting(User::getExt) .containsOnly(jacksonMapper.fillExtension( ExtUser.builder().build(), - RubiconUserExt.builder() - .rp(RubiconUserExtRp.of(mapper.createObjectNode() + MagniteUserExt.builder() + .rp(MagniteUserExtRp.of(mapper.createObjectNode() .set("property1", mapper.createArrayNode() .add("value1") .add("value2")) @@ -2143,7 +2143,7 @@ public void makeHttpRequestsShouldCreateUserExtEidsWithAdServerEidSource() { .build())) .build())) .build(), - RubiconUserExt.builder().build())); + MagniteUserExt.builder().build())); } @Test @@ -2289,10 +2289,10 @@ public void makeHttpRequestsShouldFillSiteExtIfSitePresent() { .publisher(Publisher.builder() .ext(jacksonMapper.fillExtension( ExtPublisher.empty(), - RubiconPubExt.of(RubiconPubExtRp.of(2001)))) + MagnitePubExt.of(MagnitePubExtRp.of(2001)))) .build()) .ext(jacksonMapper.fillExtension( - ExtSite.of(null, null), RubiconSiteExt.of(RubiconSiteExtRp.of(3001, null)))) + ExtSite.of(null, null), MagniteSiteExt.of(MagniteSiteExtRp.of(3001, null)))) .build()); } @@ -2316,10 +2316,10 @@ public void makeHttpRequestsShouldPassSiteExtAmpIfPresent() { .publisher(Publisher.builder() .ext(jacksonMapper.fillExtension( ExtPublisher.empty(), - RubiconPubExt.of(RubiconPubExtRp.of(2001)))) + MagnitePubExt.of(MagnitePubExtRp.of(2001)))) .build()) .ext(jacksonMapper.fillExtension( - ExtSite.of(1, null), RubiconSiteExt.of(RubiconSiteExtRp.of(3001, null)))) + ExtSite.of(1, null), MagniteSiteExt.of(MagniteSiteExtRp.of(3001, null)))) .build()); } @@ -2341,7 +2341,7 @@ public void makeHttpRequestsShouldRemoveSiteExtData() { .extracting(Site::getExt) .containsOnly(jacksonMapper.fillExtension( ExtSite.of(null, null), - RubiconSiteExt.of(RubiconSiteExtRp.of(3001, null)))); + MagniteSiteExt.of(MagniteSiteExtRp.of(3001, null)))); } @Test @@ -2364,11 +2364,11 @@ public void makeHttpRequestsShouldFillAppExtIfAppPresent() { .publisher(Publisher.builder() .ext(jacksonMapper.fillExtension( ExtPublisher.empty(), - RubiconPubExt.of(RubiconPubExtRp.of(2001)))) + MagnitePubExt.of(MagnitePubExtRp.of(2001)))) .build()) .ext(jacksonMapper.fillExtension( ExtApp.of(null, null), - RubiconAppExt.of(RubiconSiteExtRp.of(3001, null)))) + MagniteAppExt.of(MagniteSiteExtRp.of(3001, null)))) .build()); } @@ -2390,7 +2390,7 @@ public void makeHttpRequestsShouldRemoveAppExtData() { .extracting(App::getExt) .containsOnly(jacksonMapper.fillExtension( ExtApp.of(null, null), - RubiconAppExt.of(RubiconSiteExtRp.of(3001, null)))); + MagniteAppExt.of(MagniteSiteExtRp.of(3001, null)))); } @Test @@ -2440,13 +2440,13 @@ public void makeHttpRequestsShouldCreateRequestPerImp() { final Result>> result = target.makeHttpRequests(bidRequest); // then - final RubiconImpExtRp expectedImpExtRp = RubiconImpExtRp.of( - null, givenImpExtRpTarget(), RubiconImpExtRpTrack.of("", ""), null, "uuid_bid_id"); + final MagniteImpExtRp expectedImpExtRp = MagniteImpExtRp.of( + null, givenImpExtRpTarget(), MagniteImpExtRpTrack.of("", ""), null, "uuid_bid_id"); final BidRequest expectedBidRequest1 = BidRequest.builder() .imp(singletonList(Imp.builder() .video(Video.builder().build()) - .ext(mapper.valueToTree(RubiconImpExt.builder() + .ext(mapper.valueToTree(MagniteImpExt.builder() .rp(expectedImpExtRp) .build())) .build())) @@ -2456,7 +2456,7 @@ public void makeHttpRequestsShouldCreateRequestPerImp() { .id("2") .video(Video.builder().build()) .ext(mapper.valueToTree( - RubiconImpExt.builder() + MagniteImpExt.builder() .rp(expectedImpExtRp) .build())) .build())) @@ -2469,7 +2469,7 @@ public void makeHttpRequestsShouldCreateRequestPerImp() { } @Test - public void makeHttpRequestsShouldCopyAndModifyDataFieldsToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldCopyAndModifyDataFieldsToMagniteImpExtRpTarget() { // given final BidRequest bidRequest = givenBidRequest( identity(), @@ -2489,9 +2489,9 @@ public void makeHttpRequestsShouldCopyAndModifyDataFieldsToRubiconImpExtRpTarget .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsExactly(givenImpExtRpTarget().set("property2", mapper.createArrayNode().add("value2"))); } @@ -2517,7 +2517,7 @@ public void makeHttpRequestsShouldPassThroughImpExtGpid() { } @Test - public void makeHttpRequestsShouldCopySiteExtDataFieldsToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldCopySiteExtDataFieldsToMagniteImpExtRpTarget() { // given final ObjectNode siteExtDataNode = mapper.createObjectNode() .set("property", mapper.createArrayNode().add("value")); @@ -2536,14 +2536,14 @@ public void makeHttpRequestsShouldCopySiteExtDataFieldsToRubiconImpExtRpTarget() .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsExactly(givenImpExtRpTarget().set("property", mapper.createArrayNode().add("value"))); } @Test - public void makeHttpRequestsShouldCopyAppExtDataFieldsToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldCopyAppExtDataFieldsToMagniteImpExtRpTarget() { // given final ObjectNode appExtDataNode = mapper.createObjectNode() .set("property", mapper.createArrayNode().add("value")); @@ -2562,14 +2562,14 @@ public void makeHttpRequestsShouldCopyAppExtDataFieldsToRubiconImpExtRpTarget() .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsOnly(givenImpExtRpTarget().set("property", mapper.createArrayNode().add("value"))); } @Test - public void makeHttpRequestsShouldSetXapiFieldsToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldSetXapiFieldsToMagniteImpExtRpTarget() { // given final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.video(Video.builder().build())); @@ -2582,14 +2582,14 @@ public void makeHttpRequestsShouldSetXapiFieldsToRubiconImpExtRpTarget() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsExactly(givenImpExtRpTarget()); } @Test - public void makeHttpRequestsShouldCopySiteExtDataFieldToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldCopySiteExtDataFieldToMagniteImpExtRpTarget() { // given final ObjectNode siteExtDataNode = mapper.createObjectNode() .set("site", mapper.createArrayNode().add("value1")); @@ -2616,15 +2616,15 @@ public void makeHttpRequestsShouldCopySiteExtDataFieldToRubiconImpExtRpTarget() .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .extracting(target -> target.get("site")) .containsExactly(siteNode); } @Test - public void makeHttpRequestsShouldCopyAppExtDataFieldToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldCopyAppExtDataFieldToMagniteImpExtRpTarget() { // given final ObjectNode appExtDataNode = mapper.createObjectNode() .set("app", mapper.createArrayNode().add("value1")); @@ -2646,15 +2646,15 @@ public void makeHttpRequestsShouldCopyAppExtDataFieldToRubiconImpExtRpTarget() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .extracting(target -> target.get("app")) .containsExactly(appNode); } @Test - public void makeHttpRequestsShouldMergeImpExtRubiconAndDataKeywordsToRubiconImpExtRpTargetKeywords() + public void makeHttpRequestsShouldMergeImpExtMagniteAndDataKeywordsToMagniteImpExtRpTargetKeywords() throws IOException { // given @@ -2668,8 +2668,8 @@ public void makeHttpRequestsShouldMergeImpExtRubiconAndDataKeywordsToRubiconImpE .put("keywords", "imp,ext,data,keywords")); impExt.set( "bidder", - mapper.valueToTree(ExtImpRubicon.builder() - .keywords(asList("imp", "ext", "rubicon", "keywords")) + mapper.valueToTree(ExtImpMagnite.builder() + .keywords(asList("imp", "ext", "magnite", "keywords")) .build())); // when @@ -2681,16 +2681,16 @@ public void makeHttpRequestsShouldMergeImpExtRubiconAndDataKeywordsToRubiconImpE .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .extracting(target -> target.get("keywords")) .containsOnly(mapper.readTree("[\"imp,ext,data,keywords\"," - + "\"imp\",\"ext\",\"data\",\"keywords\",\"rubicon\"]")); + + "\"imp\",\"ext\",\"data\",\"keywords\",\"magnite\"]")); } @Test - public void makeHttpRequestsShouldCopyDataSearchToRubiconImpExtRpTargetSearch() { + public void makeHttpRequestsShouldCopyDataSearchToMagniteImpExtRpTargetSearch() { // given final BidRequest bidRequest = givenBidRequest( identity(), @@ -2712,9 +2712,9 @@ public void makeHttpRequestsShouldCopyDataSearchToRubiconImpExtRpTargetSearch() .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsExactly(expectedTarget); } @@ -2723,7 +2723,7 @@ public void makeHttpRequestsShouldCopyImpExtVideoLanguageToSiteContentLanguage() // given final BidRequest bidRequest = givenBidRequest( imp -> imp.video(Video.builder().build()), - extImp -> extImp.video(RubiconVideoParams.builder().language("ua").build())); + extImp -> extImp.video(MagniteVideoParams.builder().language("ua").build())); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -2739,7 +2739,7 @@ public void makeHttpRequestsShouldCopyImpExtVideoLanguageToSiteContentLanguage() } @Test - public void makeHttpRequestsShouldMergeSiteAttributesAndCopyToRubiconImpExtRpTarget() { + public void makeHttpRequestsShouldMergeSiteAttributesAndCopyToMagniteImpExtRpTarget() { // given final BidRequest bidRequest = givenBidRequest( requestBuilder -> requestBuilder.site(Site.builder() @@ -2761,9 +2761,9 @@ public void makeHttpRequestsShouldMergeSiteAttributesAndCopyToRubiconImpExtRpTar .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) + .extracting(objectNode -> mapper.convertValue(objectNode, MagniteImpExt.class)) + .extracting(MagniteImpExt::getRp) + .extracting(MagniteImpExtRp::getTarget) .containsExactly(givenImpExtRpTarget().set("page", mapper.createArrayNode().add("site page"))); } @@ -2896,7 +2896,7 @@ public void makeHttpRequestsShouldReturnErrorIfNoImpFormatWidthAndHeight() { // then assertThat(result.getErrors()).hasSize(1); assertThat(result.getErrors()) - .containsOnly(BidderError.badInput("rubicon imps must have at least one size element [w, h, format]")); + .containsOnly(BidderError.badInput("magnite imps must have at least one size element [w, h, format]")); assertThat(result.getValue()).hasSize(1); } @@ -2930,8 +2930,8 @@ public void makeHttpRequestsShouldProcessMetricsAndFillViewabilityVendor() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp).doesNotContainNull() .extracting(Imp::getExt).doesNotContainNull() - .extracting(ext -> mapper.treeToValue(ext, RubiconImpExt.class)) - .extracting(RubiconImpExt::getViewabilityvendors) + .extracting(ext -> mapper.treeToValue(ext, MagniteImpExt.class)) + .extracting(MagniteImpExt::getViewabilityvendors) .containsExactly(asList("moat.com", "doubleclickbygoogle.com")); } @@ -2968,7 +2968,7 @@ public void makeHttpRequestsShouldReturnOnlyLineItemRequestsWithExpectedFieldsWh assertThat(result.getValue()) .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) - .extracting(imp -> mapper.treeToValue(imp.getExt(), RubiconImpExt.class).getRp().getTarget()) + .extracting(imp -> mapper.treeToValue(imp.getExt(), MagniteImpExt.class).getRp().getTarget()) .containsOnly( givenImpExtRpTarget().put("line_item", "123"), givenImpExtRpTarget().put("line_item", "234")); @@ -3114,10 +3114,10 @@ public void makeBidsShouldSetApexRendererUrlToMetaRendererUrlForOutputStreamVide final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3164,10 +3164,10 @@ public void makeBidsShouldSetApexRendererUrlToMetaRendererUrlWhenMetaMediaTypeIs final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE).ext(givenBidExt)))) .build())) .build())); @@ -3216,10 +3216,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenMetaMediaTyp final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE).ext(givenBidExt)))) .build())) .build())); @@ -3245,10 +3245,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenApexRenderer final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3280,10 +3280,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenApexRenderer final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3315,10 +3315,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenBidResponseI final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3350,10 +3350,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenVideoPlaceme final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3385,10 +3385,10 @@ public void makeBidsShouldNotSetApexRendererUrlToMetaRendererUrlWhenVideoPlcmtIs final BidderCall httpCall = givenHttpCall( givenBidRequest, - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.impid("impId").price(ONE)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.impid("impId").price(ONE)))) .build())) .build())); @@ -3408,11 +3408,11 @@ public void makeBidsShouldSetSeatToMetaSeat() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .seat("seat") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3439,10 +3439,10 @@ public void makeBidsShouldSetBidExtRpAdvidToMetaAdvertiserId() throws JsonProces final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.ext(givenBidExt)))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.ext(givenBidExt)))) .build())) .build())); @@ -3465,10 +3465,10 @@ public void makeBidsShouldSetBidAdomainToMetaAdvertiserDomains() throws JsonProc // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.adomain(List.of("A", "B"))))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.adomain(List.of("A", "B"))))) .build())) .build())); @@ -3492,11 +3492,11 @@ public void makeBidsShouldSetSeatBuyerToMetaNetworkId() throws JsonProcessingExc // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("123") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3520,11 +3520,11 @@ public void makeBidsShouldNotSetNegativeSeatBuyerToMetaNetworkId() throws JsonPr // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("-123") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3544,11 +3544,11 @@ public void makeBidsShouldNotSetZeroSeatBuyerToMetaNetworkId() throws JsonProces // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("0") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3568,11 +3568,11 @@ public void makeBidsShouldTolerateWithNotParsibleBuyerValue() throws JsonProcess // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("canNotBeParsed") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3592,11 +3592,11 @@ public void makeBidsShouldTolerateWithNotIntegerBuyerValue() throws JsonProcessi // given final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("123.2") - .bid(singletonList(givenRubiconBid(bid -> bid.price(ONE)))) + .bid(singletonList(givenMagniteBid(bid -> bid.price(ONE)))) .build())) .build())); @@ -3618,11 +3618,11 @@ public void makeBidsShouldRemoveBidsWithNotParsedExtAndAddError() throws JsonPro invalidBidExt.set("prebid", mapper.createArrayNode()); final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .buyer("123") - .bid(singletonList(givenRubiconBid(bid -> bid.id("789").price(ONE).ext(invalidBidExt)))) + .bid(singletonList(givenMagniteBid(bid -> bid.id("789").price(ONE).ext(invalidBidExt)))) .build())) .build())); @@ -3726,21 +3726,21 @@ public void makeBidsShouldReturnVideoBidIfRequestImpHasVideo() throws JsonProces @Test public void makeBidsShouldNotReduceBidderAmountForBidsWithSameImpId() throws JsonProcessingException { // given - final RubiconBid firstBid = RubiconBid.builder() + final MagniteBid firstBid = MagniteBid.builder() .id("firstBidId") .impid("impId") .price(ONE) .build(); - final RubiconBid secondBid = RubiconBid.builder() + final MagniteBid secondBid = MagniteBid.builder() .id("secondBidId") .impid("impId") .price(ONE) .build(); - final String bidResponse = mapper.writeValueAsString(RubiconBidResponse.builder() + final String bidResponse = mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() + .seatbid(singletonList(MagniteSeatBid.builder() .bid(Arrays.asList(firstBid, secondBid)) .build())) .build()); @@ -3749,8 +3749,8 @@ public void makeBidsShouldNotReduceBidderAmountForBidsWithSameImpId() throws Jso givenBidRequest(builder -> builder .id("impId") .video(Video.builder().build()) - .ext(mapper.valueToTree(RubiconImpExt.builder() - .rp(RubiconImpExtRp.of(null, null, null, null, "pbBidId")) + .ext(mapper.valueToTree(MagniteImpExt.builder() + .rp(MagniteImpExtRp.of(null, null, null, null, "pbBidId")) .build()))), bidResponse); final BidRequest bidRequest = givenBidRequest( @@ -3805,10 +3805,10 @@ public void makeBidsShouldReturnBidWithOverriddenCpmFromImp() throws JsonProcess mapper.createObjectNode().put("cpmoverride", 5.55))))) // will be ignored .build()); - final ExtPrebid extImp = ExtPrebid.of( + final ExtPrebid extImp = ExtPrebid.of( null, - ExtImpRubicon.builder() - .debug(ExtImpRubiconDebug.of(4.44f)) + ExtImpMagnite.builder() + .debug(ExtImpMagniteDebug.of(4.44f)) .build()); // when @@ -3830,13 +3830,13 @@ public void makeBidsShouldReturnBidWithBidIdFieldFromImpExtRpPbBidId() throws Js // given final BidderCall httpCall = givenHttpCall(givenBidRequest(imp -> imp .id("impId") - .ext(mapper.valueToTree(RubiconImpExt.builder() - .rp(RubiconImpExtRp.of(null, null, null, null, "pbBidId")) + .ext(mapper.valueToTree(MagniteImpExt.builder() + .rp(MagniteImpExtRp.of(null, null, null, null, "pbBidId")) .build()))), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .bidid("bidid1") // returned bidid from XAPI - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(RubiconBid.builder().id("0").impid("impId").price(ONE).build())) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(MagniteBid.builder().id("0").impid("impId").price(ONE).build())) .build())) .build())); @@ -3857,13 +3857,13 @@ public void makeBidsShouldReturnBidWithBidIdReturnedFromXAPIWhenImpCanNotBeMatch // given final BidderCall httpCall = givenHttpCall(givenBidRequest(imp -> imp .id("impId") - .ext(mapper.valueToTree(RubiconImpExt.builder() - .rp(RubiconImpExtRp.of(null, null, null, null, "pbBidId")) + .ext(mapper.valueToTree(MagniteImpExt.builder() + .rp(MagniteImpExtRp.of(null, null, null, null, "pbBidId")) .build()))), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .bidid("bid_response_bidId") // returned bidid from XAPI - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(RubiconBid.builder().id("bidId").impid("impId2").price(ONE).build())) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(MagniteBid.builder().id("bidId").impid("impId2").price(ONE).build())) .build())) .build())); @@ -3883,10 +3883,10 @@ public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessi // given final BidderCall httpCall = givenHttpCall( givenBidRequest(bidRequestBuilder -> bidRequestBuilder.xNative(Native.builder().build())), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .bidid("bidid1") // returned bidid from XAPI - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(RubiconBid.builder().id("non-zero").price(ONE).build())) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(MagniteBid.builder().id("non-zero").price(ONE).build())) .build())) .build())); @@ -3903,7 +3903,7 @@ public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessi @Test public void makeBidsShouldReturnBidWithCurrencyFromBidResponse() throws JsonProcessingException { // given - target = new RubiconBidder( + target = new MagniteBidder( BIDDER_NAME, ENDPOINT_URL, DEFAULT_TK_X_INT, @@ -3920,10 +3920,10 @@ public void makeBidsShouldReturnBidWithCurrencyFromBidResponse() throws JsonProc jacksonMapper); final BidderCall httpCall = givenHttpCall(givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() + mapper.writeValueAsString(MagniteBidResponse.builder() .cur("EUR") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(RubiconBid.builder().id("bidid1").price(ONE).build())) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(MagniteBid.builder().id("bidid1").price(ONE).build())) .build())) .build())); @@ -3951,9 +3951,9 @@ public void makeBidsShouldReturnBidMetaFromRequest() throws JsonProcessingExcept final BidderCall httpCall = givenHttpCall( givenBidRequest(identity()), - mapper.writeValueAsString(RubiconBidResponse.builder() - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bid -> bid.ext(requestNode).price(ONE)))) + mapper.writeValueAsString(MagniteBidResponse.builder() + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bid -> bid.ext(requestNode).price(ONE)))) .build())) .build())); @@ -3998,8 +3998,8 @@ public void extractTargetingShouldReturnEmptyMapForNullTargeting() { @Test public void extractTargetingShouldIgnoreEmptyTargetingValuesList() { // given - final ObjectNode extBidBidder = mapper.valueToTree(RubiconTargetingExt.of( - RubiconTargetingExtRp.of(singletonList(RubiconTargeting.of("rpfl_1001", emptyList()))))); + final ObjectNode extBidBidder = mapper.valueToTree(MagniteTargetingExt.of( + MagniteTargetingExtRp.of(singletonList(MagniteTargeting.of("rpfl_1001", emptyList()))))); // when and then assertThat(target.extractTargeting(extBidBidder)).isEmpty(); @@ -4008,9 +4008,9 @@ public void extractTargetingShouldIgnoreEmptyTargetingValuesList() { @Test public void extractTargetingShouldReturnNotEmptyTargetingMap() { // given - final ObjectNode extBidBidder = mapper.valueToTree(RubiconTargetingExt.of( - RubiconTargetingExtRp.of(singletonList( - RubiconTargeting.of("rpfl_1001", asList("2_tier0100", "3_tier0100")))))); + final ObjectNode extBidBidder = mapper.valueToTree(MagniteTargetingExt.of( + MagniteTargetingExtRp.of(singletonList( + MagniteTargeting.of("rpfl_1001", asList("2_tier0100", "3_tier0100")))))); // when and then assertThat(target.extractTargeting(extBidBidder)).containsOnly(entry("rpfl_1001", "2_tier0100")); @@ -4018,7 +4018,7 @@ public void extractTargetingShouldReturnNotEmptyTargetingMap() { private static BidRequest givenBidRequest(Function bidRequestCustomizer, Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return bidRequestCustomizer.apply(BidRequest.builder() .imp(singletonList(givenImp(impCustomizer, extCustomizer)))) .build(); @@ -4029,15 +4029,15 @@ private static BidRequest givenBidRequest(Function impCu } private static BidRequest givenBidRequest(Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return givenBidRequest(identity(), impCustomizer, extCustomizer); } private static Imp givenImp(Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return impCustomizer.apply(Imp.builder() .ext(mapper.valueToTree(ExtPrebid.of( - null, extCustomizer.apply(ExtImpRubicon.builder()).build())))) + null, extCustomizer.apply(ExtImpMagnite.builder()).build())))) .build(); } @@ -4089,12 +4089,12 @@ private static BidderCall givenHttpCall(BidRequest bidRequest, Strin null); } - private static String givenBidResponse(UnaryOperator bidCustomizer) + private static String givenBidResponse(UnaryOperator bidCustomizer) throws JsonProcessingException { - return mapper.writeValueAsString(RubiconBidResponse.builder() + return mapper.writeValueAsString(MagniteBidResponse.builder() .cur("USD") - .seatbid(singletonList(RubiconSeatBid.builder() - .bid(singletonList(givenRubiconBid(bidCustomizer))) + .seatbid(singletonList(MagniteSeatBid.builder() + .bid(singletonList(givenMagniteBid(bidCustomizer))) .build())) .build()); } @@ -4103,8 +4103,8 @@ private static String givenBidResponse(BigDecimal price) throws JsonProcessingEx return givenBidResponse(bidBuilder -> bidBuilder.price(price)); } - private static RubiconBid givenRubiconBid(UnaryOperator bidCustomizer) { - return bidCustomizer.apply(RubiconBid.builder()).build(); + private static MagniteBid givenMagniteBid(UnaryOperator bidCustomizer) { + return bidCustomizer.apply(MagniteBid.builder()).build(); } private static ObjectNode givenImpExtRpTarget() { diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java index 54e550e93f7..001737f9fba 100644 --- a/src/test/java/org/prebid/server/it/ApplicationTest.java +++ b/src/test/java/org/prebid/server/it/ApplicationTest.java @@ -518,7 +518,7 @@ public void infoBiddersShouldReturnBaseAdaptersBidderNames() throws IOException public void infoBidderDetailsShouldReturnMetadataForBidder() throws IOException { given(SPEC) .when() - .get("/info/bidders/rubicon") + .get("/info/bidders/magnite") .then() .assertThat() .body(Matchers.equalTo(jsonFrom("info-bidders/test-info-bidder-details-response.json"))); diff --git a/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java b/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java index 9c207aa17bf..cc47c8a376b 100644 --- a/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java +++ b/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java @@ -16,7 +16,7 @@ import org.prebid.server.proto.openrtb.ext.request.beachfront.ExtImpBeachfront; import org.prebid.server.proto.openrtb.ext.request.eplanning.ExtImpEplanning; import org.prebid.server.proto.openrtb.ext.request.openx.ExtImpOpenx; -import org.prebid.server.proto.openrtb.ext.request.rubicon.ExtImpRubicon; +import org.prebid.server.proto.openrtb.ext.request.magnite.ExtImpMagnite; import org.prebid.server.proto.openrtb.ext.request.sovrn.ExtImpSovrn; import org.prebid.server.spring.config.bidder.model.CompressionType; import org.prebid.server.spring.config.bidder.model.Ortb; @@ -39,7 +39,7 @@ @ExtendWith(MockitoExtension.class) public class BidderParamValidatorTest extends VertxTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; private static final String APPNEXUS = "appnexus"; private static final String APPNEXUS_ALIAS = "appnexusAlias"; private static final String SOVRN = "sovrn"; @@ -59,7 +59,7 @@ public class BidderParamValidatorTest extends VertxTest { @BeforeEach public void setUp() { given(bidderCatalog.names()).willReturn(new HashSet<>(asList( - RUBICON, + MAGNITE, APPNEXUS, APPNEXUS_ALIAS, SOVRN, @@ -97,26 +97,26 @@ public void createShouldFailOnInvalidSchemaFile() { } @Test - public void validateShouldNotReturnValidationMessagesWhenRubiconImpExtIsOkIgnoringCase() { + public void validateShouldNotReturnValidationMessagesWhenMagniteImpExtIsOkIgnoringCase() { // given - final ExtImpRubicon ext = ExtImpRubicon.builder().accountId(1).siteId(2).zoneId(3).build(); + final ExtImpMagnite ext = ExtImpMagnite.builder().accountId(1).siteId(2).zoneId(3).build(); final JsonNode node = mapper.convertValue(ext, JsonNode.class); // when - final Set messages = bidderParamValidator.validate("rUBIcon", node); + final Set messages = bidderParamValidator.validate("MAGnite", node); // then assertThat(messages).isEmpty(); } @Test - public void validateShouldReturnValidationMessagesWhenRubiconImpExtNotValid() { + public void validateShouldReturnValidationMessagesWhenMagniteImpExtNotValid() { // given - final ExtImpRubicon ext = ExtImpRubicon.builder().siteId(2).zoneId(3).build(); + final ExtImpMagnite ext = ExtImpMagnite.builder().siteId(2).zoneId(3).build(); final JsonNode node = mapper.convertValue(ext, JsonNode.class); - final Set messages = bidderParamValidator.validate(RUBICON, node); + final Set messages = bidderParamValidator.validate(MAGNITE, node); // then assertThat(messages.size()).isEqualTo(1); @@ -345,7 +345,7 @@ public void validateShouldReturnValidationMessagesWhenBeachfrontExtNotValid() { @Test public void schemaShouldReturnSchemasString() throws IOException { // given - given(bidderCatalog.names()).willReturn(new HashSet<>(asList("test-rubicon", "test-appnexus"))); + given(bidderCatalog.names()).willReturn(new HashSet<>(asList("test-magnite", "test-appnexus"))); bidderParamValidator = BidderParamValidator.create( bidderCatalog, "org/prebid/server/validation/schema/valid", jacksonMapper); diff --git a/src/test/resources/org/prebid/server/it/info-bidders/test-info-bidder-details-response.json b/src/test/resources/org/prebid/server/it/info-bidders/test-info-bidder-details-response.json index a9434806156..b682ccc253d 100644 --- a/src/test/resources/org/prebid/server/it/info-bidders/test-info-bidder-details-response.json +++ b/src/test/resources/org/prebid/server/it/info-bidders/test-info-bidder-details-response.json @@ -2,7 +2,7 @@ "status":"ACTIVE", "usesHttps": false, "maintainer": { - "email": "header-bidding@rubiconproject.com" + "email": "header-bidding@magnite.com" }, "capabilities": { "app": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-magnite-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-magnite-bid-request.json index 37492413f7b..9c6f756a5c9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-magnite-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/magnite/test-magnite-bid-request.json @@ -20,7 +20,7 @@ "http://www.example.com" ], "pbs_version": "{{ pbs.java.version }}", - "pbs_login": "rubicon_user", + "pbs_login": "magnite_user", "pbs_url": "http://localhost:8080" }, "track": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json index 37492413f7b..9c6f756a5c9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json @@ -20,7 +20,7 @@ "http://www.example.com" ], "pbs_version": "{{ pbs.java.version }}", - "pbs_login": "rubicon_user", + "pbs_login": "magnite_user", "pbs_url": "http://localhost:8080" }, "track": { diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties index 8c73beb8da8..780fa391f0f 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -490,14 +490,14 @@ adapters.roulax.enabled=true adapters.roulax.endpoint=http://localhost:8090/roulax-exchange adapters.rtbhouse.enabled=true adapters.rtbhouse.endpoint=http://localhost:8090/rtbhouse-exchange -adapters.rubicon.enabled=true -adapters.rubicon.endpoint=http://localhost:8090/rubicon-exchange -adapters.rubicon.aliases.magnite.enabled=true -adapters.rubicon.aliases.magnite.endpoint=http://localhost:8090/magnite-exchange -adapters.rubicon.XAPI.Username=rubicon_user -adapters.rubicon.XAPI.Password=rubicon_password -adapters.rubicon.usersync.redirect.url=http://localhost:8090/rubicon-usersync?gdpr={gdpr}&gdpr_consent={gdpr_consent} -adapters.rubicon.usersync.redirect.uid-macro=rubicon-macro +adapters.magnite.enabled=true +adapters.magnite.endpoint=http://localhost:8090/magnite-exchange +adapters.magnite.aliases.rubicon.enabled=true +adapters.magnite.aliases.rubicon.endpoint=http://localhost:8090/rubicon-exchange +adapters.magnite.XAPI.Username=magnite_user +adapters.magnite.XAPI.Password=magnite_password +adapters.magnite.usersync.redirect.url=http://localhost:8090/rubicon-usersync?gdpr={gdpr}&gdpr_consent={gdpr_consent} +adapters.magnite.usersync.redirect.uid-macro=magnite-macro adapters.salunamedia.enabled=true adapters.salunamedia.endpoint=http://localhost:8090/salunamedia-exchange adapters.screencore.enabled=true diff --git a/src/test/resources/org/prebid/server/validation/schema/empty/rubicon.json b/src/test/resources/org/prebid/server/validation/schema/empty/magnite.json similarity index 100% rename from src/test/resources/org/prebid/server/validation/schema/empty/rubicon.json rename to src/test/resources/org/prebid/server/validation/schema/empty/magnite.json diff --git a/src/test/resources/org/prebid/server/validation/schema/invalid/rubicon.json b/src/test/resources/org/prebid/server/validation/schema/invalid/magnite.json similarity index 100% rename from src/test/resources/org/prebid/server/validation/schema/invalid/rubicon.json rename to src/test/resources/org/prebid/server/validation/schema/invalid/magnite.json diff --git a/src/test/resources/org/prebid/server/validation/schema/valid/test-magnite.json b/src/test/resources/org/prebid/server/validation/schema/valid/test-magnite.json new file mode 100644 index 00000000000..6af364deb08 --- /dev/null +++ b/src/test/resources/org/prebid/server/validation/schema/valid/test-magnite.json @@ -0,0 +1,3 @@ +{ + "magnite": "test" +} diff --git a/src/test/resources/org/prebid/server/validation/schema/valid/test-rubicon.json b/src/test/resources/org/prebid/server/validation/schema/valid/test-rubicon.json deleted file mode 100644 index 24f0e40b497..00000000000 --- a/src/test/resources/org/prebid/server/validation/schema/valid/test-rubicon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rubicon": "test" -} \ No newline at end of file diff --git a/src/test/resources/org/prebid/server/validation/schema/valid/test-schemas.json b/src/test/resources/org/prebid/server/validation/schema/valid/test-schemas.json index 8389baecb56..c0f6563279a 100644 --- a/src/test/resources/org/prebid/server/validation/schema/valid/test-schemas.json +++ b/src/test/resources/org/prebid/server/validation/schema/valid/test-schemas.json @@ -1 +1 @@ -{"test-appnexus":{"appnexus":"test"},"test-rubicon":{"rubicon":"test"}} \ No newline at end of file +{"test-appnexus":{"appnexus":"test"},"test-magnite":{"magnite":"test"}}