From bea3a94e081284c6383f55e7e4ca6c8436e51ee4 Mon Sep 17 00:00:00 2001 From: antonbabak Date: Thu, 24 Jul 2025 15:28:17 +0200 Subject: [PATCH 1/2] New Rediads Adapter --- .../server/bidder/rediads/RediadsBidder.java | 181 ++++++++++++ .../ext/request/rediads/ExtImpRediads.java | 13 + .../config/bidder/RediadsConfiguration.java | 41 +++ src/main/resources/bidder-config/rediads.yaml | 19 ++ .../static/bidder-params/rediads.json | 20 ++ .../bidder/rediads/RediadsBidderTest.java | 275 ++++++++++++++++++ .../org/prebid/server/it/RediadsTest.java | 32 ++ .../rediads/test-auction-rediads-request.json | 21 ++ .../test-auction-rediads-response.json | 38 +++ .../rediads/test-rediads-bid-request.json | 52 ++++ .../rediads/test-rediads-bid-response.json | 21 ++ .../server/it/test-application.properties | 2 + 12 files changed, 715 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/rediads/ExtImpRediads.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java create mode 100644 src/main/resources/bidder-config/rediads.yaml create mode 100644 src/main/resources/static/bidder-params/rediads.json create mode 100644 src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java create mode 100644 src/test/java/org/prebid/server/it/RediadsTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-response.json diff --git a/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java b/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java new file mode 100644 index 00000000000..8b7e9203739 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java @@ -0,0 +1,181 @@ +package org.prebid.server.bidder.rediads; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.App; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Publisher; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.prebid.server.bidder.Bidder; +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.Result; +import org.prebid.server.exception.PreBidException; +import org.prebid.server.json.DecodeException; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.rediads.ExtImpRediads; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.BidderUtil; +import org.prebid.server.util.HttpUtil; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class RediadsBidder implements Bidder { + + private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { + }; + + private final String endpointUrl; + private final JacksonMapper mapper; + + public RediadsBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List modifiedImps = new ArrayList<>(); + final List errors = new ArrayList<>(); + + String accountId = null; + String endpoint = null; + + for (Imp imp : request.getImp()) { + try { + final ExtImpRediads extImp = parseImpExt(imp); + modifiedImps.add(modifyImp(imp, extImp)); + accountId = extImp.getAccountId(); + endpoint = extImp.getEndpoint(); + } catch (PreBidException e) { + errors.add(BidderError.badInput(e.getMessage())); + } + } + + if (modifiedImps.isEmpty()) { + return Result.withErrors(errors); + } + + final BidRequest outgoingRequest = modifyRequest(request, modifiedImps, accountId); + final String endpointUrl = resolveEndpointUrl(endpoint); + final HttpRequest httpRequest = BidderUtil.defaultRequest(outgoingRequest, endpointUrl, mapper); + + return Result.of(Collections.singletonList(httpRequest), errors); + } + + private ExtImpRediads parseImpExt(Imp imp) { + try { + return mapper.mapper().convertValue(imp.getExt(), TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException("Invalid imp.ext for impression " + imp.getId()); + } + } + + private Imp modifyImp(Imp imp, ExtImpRediads extImp) { + final ObjectNode modifiedExt = imp.getExt().deepCopy(); + modifiedExt.remove("bidder"); + modifiedExt.remove("prebid"); + return imp.toBuilder() + .tagid(StringUtils.defaultIfBlank(extImp.getSlot(), imp.getTagid())) + .ext(modifiedExt) + .build(); + } + + private BidRequest modifyRequest(BidRequest request, List imps, String accountId) { + final Site site = request.getSite(); + final App app = request.getApp(); + return request.toBuilder() + .site(site != null ? modifySite(site, accountId) : null) + .app(site == null && app != null ? modifyApp(app, accountId) : app) + .imp(imps) + .build(); + } + + private static Site modifySite(Site site, String accountId) { + final Publisher originalPublisher = site.getPublisher(); + final Publisher newPublisher = originalPublisher != null + ? originalPublisher.toBuilder().id(accountId).build() + : Publisher.builder().id(accountId).build(); + return site.toBuilder().publisher(newPublisher).build(); + } + + private static App modifyApp(App app, String accountId) { + final Publisher originalPublisher = app.getPublisher(); + final Publisher newPublisher = originalPublisher != null + ? originalPublisher.toBuilder().id(accountId).build() + : Publisher.builder().id(accountId).build(); + return app.toBuilder().publisher(newPublisher).build(); + } + + private String resolveEndpointUrl(String endpoint) { + if (StringUtils.isBlank(endpoint)) { + return endpointUrl; + } + + try { + final URL originalUrl = new URL(endpointUrl); + final String originalHost = originalUrl.getHost(); + final String[] hostParts = originalHost.split("\\."); + hostParts[0] = endpoint; + final String newHost = String.join(".", hostParts); + return endpointUrl.replace(originalHost, newHost); + } catch (MalformedURLException e) { + throw new PreBidException("Failed to parse endpoint URL: " + endpointUrl); + } + } + + @Override + public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + return Result.withValues(extractBids(bidResponse)); + } catch (DecodeException | PreBidException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private static List extractBids(BidResponse bidResponse) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse); + } + + private static List bidsFromResponse(BidResponse bidResponse) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .filter(Objects::nonNull) + .map(bid -> BidderBid.of(bid, getBidType(bid), bidResponse.getCur())) + .collect(Collectors.toList()); + } + + private static BidType getBidType(Bid bid) { + return switch (bid.getMtype()) { + case 1 -> BidType.banner; + case 2 -> BidType.video; + case 3 -> BidType.audio; + case 4 -> BidType.xNative; + case null, default -> throw new PreBidException( + "could not define media type for impression: " + bid.getImpid()); + }; + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rediads/ExtImpRediads.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/rediads/ExtImpRediads.java new file mode 100644 index 00000000000..e876780fac8 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/rediads/ExtImpRediads.java @@ -0,0 +1,13 @@ +package org.prebid.server.proto.openrtb.ext.request.rediads; + +import lombok.Value; + +@Value(staticConstructor = "of") +public class ExtImpRediads { + + String accountId; + + String slot; + + String endpoint; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java new file mode 100644 index 00000000000..af549584198 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java @@ -0,0 +1,41 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.rediads.RediadsBidder; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; +import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; +import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; +import org.prebid.server.spring.env.YamlPropertySourceFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +import jakarta.validation.constraints.NotBlank; + +@Configuration +@PropertySource(value = "classpath:/bidder-config/rediads.yaml", factory = YamlPropertySourceFactory.class) +public class RediadsConfiguration { + + private static final String BIDDER_NAME = "rediads"; + + @Bean("rediadsConfigurationProperties") + @ConfigurationProperties("adapters.rediads") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps rediadsBidderDeps(BidderConfigurationProperties rediadsConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(rediadsConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new RediadsBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/rediads.yaml b/src/main/resources/bidder-config/rediads.yaml new file mode 100644 index 00000000000..c7c642e829a --- /dev/null +++ b/src/main/resources/bidder-config/rediads.yaml @@ -0,0 +1,19 @@ +adapters: + rediads: + endpoint: https://bidding.rediads.com/openrtb2/auction + ortb-version: "2.6" + modifying-vast-xml-allowed: true + meta-info: + maintainer-email: support@rediads.com + app-media-types: + - banner + - video + - audio + - native + site-media-types: + - banner + - video + - audio + - native + supported-vendors: + vendor-id: 0 diff --git a/src/main/resources/static/bidder-params/rediads.json b/src/main/resources/static/bidder-params/rediads.json new file mode 100644 index 00000000000..13a8f9b4cbe --- /dev/null +++ b/src/main/resources/static/bidder-params/rediads.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "RediAds Adapter Params", + "description": "A schema which validates params accepted by the Rediads adapter", + "type": "object", + "properties": { + "account_id": { + "type": "string" + }, + "slot": { + "type": "string" + }, + "endpoint": { + "type": "string" + } + }, + "required": [ + "account_id" + ] +} diff --git a/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java b/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java new file mode 100644 index 00000000000..c85a9345f83 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java @@ -0,0 +1,275 @@ +package org.prebid.server.bidder.rediads; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.App; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Publisher; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import org.junit.jupiter.api.Test; +import org.prebid.server.VertxTest; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderCall; +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.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.rediads.ExtImpRediads; +import org.prebid.server.proto.openrtb.ext.response.BidType; + +import java.math.BigDecimal; +import java.util.List; +import java.util.function.UnaryOperator; + +import static java.util.Collections.singletonList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.groups.Tuple.tuple; +import static org.prebid.server.bidder.model.BidderError.Type; +import static org.prebid.server.bidder.model.BidderError.badInput; +import static org.prebid.server.bidder.model.BidderError.badServerResponse; + +public class RediadsBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "http://sub.domain.com/path"; + + private final RediadsBidder target = new RediadsBidder(ENDPOINT_URL, jacksonMapper); + + @Test + public void creationShouldFailOnInvalidEndpointUrl() { + assertThatIllegalArgumentException().isThrownBy(() -> new RediadsBidder("invalid_url", jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldReturnErrorIfImpExtCouldNotBeParsed() { + // given + final BidRequest bidRequest = givenBidRequest(imp -> imp + .id("impId") + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).hasSize(1) + .containsOnly(badInput("Invalid imp.ext for impression impId")); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldModifyImpCorrectly() { + // given + final ObjectNode impExt = givenImpExt("accId", "slotId", "endpointId"); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(impExt).tagid("tagId")); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getTagid, Imp::getExt) + .containsOnly(tuple("slotId", mapper.createObjectNode())); + } + + @Test + public void makeHttpRequestsShouldModifySiteCorrectly() { + // given + final ObjectNode impExt = givenImpExt("accId", "slotId", "endpointId"); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(impExt).tagid("tagId")) + .toBuilder() + .site(Site.builder().publisher(Publisher.builder().id("pubId1").build()).build()) + .app(App.builder().publisher(Publisher.builder().id("pubId2").build()).build()) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getSite, BidRequest::getApp) + .containsOnly(tuple( + Site.builder().publisher(Publisher.builder().id("accId").build()).build(), + bidRequest.getApp())); + } + + @Test + public void makeHttpRequestsShouldModifyAppCorrectlyWhenSiteIsNull() { + // given + final ObjectNode impExt = givenImpExt("accId", "slotId", "endpointId"); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(impExt).tagid("tagId")) + .toBuilder() + .app(App.builder().publisher(Publisher.builder().id("pubId2").build()).build()) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getApp) + .containsOnly(App.builder().publisher(Publisher.builder().id("accId").build()).build()); + } + + @Test + public void makeHttpRequestsShouldResolveEndpointUrlCorrectly() { + // given + final ObjectNode impExt = givenImpExt("accId", "slotId", "newsub"); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(impExt)); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly("http://newsub.domain.com/path"); + } + + @Test + public void makeHttpRequestsShouldUseOriginalEndpointWhenEndpointInExtIsBlank() { + // given + final ObjectNode impExt = givenImpExt("accId", "slotId", null); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(impExt)); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly(ENDPOINT_URL); + } + + @Test + public void makeBidsShouldReturnErrorWhenResponseBodyCouldNotBeParsed() { + // given + final BidderCall httpCall = givenHttpCall("invalid_json"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getType()).isEqualTo(Type.bad_server_response); + assertThat(error.getMessage()).startsWith("Failed to decode: Unrecognized token 'invalid_json'"); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorWhenMtypeIsUnsupported() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().impid("impId").mtype(5).build(); + final BidderCall httpCall = givenHttpCall(givenBidResponse(bid)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1) + .containsExactly(badServerResponse("could not define media type for impression: impId")); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().mtype(1).price(BigDecimal.ONE).build(); + final BidderCall httpCall = givenHttpCall(givenBidResponse(bid)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(bid, BidType.banner, "USD")); + } + + @Test + public void makeBidsShouldReturnVideoBid() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().mtype(2).price(BigDecimal.TEN).build(); + final BidderCall httpCall = givenHttpCall(givenBidResponse(bid)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(bid, BidType.video, "USD")); + } + + @Test + public void makeBidsShouldReturnAudioBid() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().mtype(3).price(BigDecimal.TEN).build(); + final BidderCall httpCall = givenHttpCall(givenBidResponse(bid)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(bid, BidType.audio, "USD")); + } + + @Test + public void makeBidsShouldReturnNativeBid() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().mtype(4).price(BigDecimal.TEN).build(); + final BidderCall httpCall = givenHttpCall(givenBidResponse(bid)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(bid, BidType.xNative, "USD")); + } + + private static BidRequest givenBidRequest(UnaryOperator impCustomizer) { + return BidRequest.builder() + .imp(singletonList(givenImp(impCustomizer))) + .build(); + } + + private static Imp givenImp(UnaryOperator impCustomizer) { + return impCustomizer.apply(Imp.builder().id("impId")).build(); + } + + private static ObjectNode givenImpExt(String accountId, String slot, String endpoint) { + return mapper.valueToTree(ExtPrebid.of(null, ExtImpRediads.of(accountId, slot, endpoint))); + } + + private static String givenBidResponse(Bid... bids) throws JsonProcessingException { + return mapper.writeValueAsString(BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder().bid(List.of(bids)).build())) + .build()); + } + + private static BidderCall givenHttpCall(String body) { + return BidderCall.succeededHttp( + HttpRequest.builder().build(), + HttpResponse.of(200, null, body), + null); + } +} diff --git a/src/test/java/org/prebid/server/it/RediadsTest.java b/src/test/java/org/prebid/server/it/RediadsTest.java new file mode 100644 index 00000000000..6ff3335973c --- /dev/null +++ b/src/test/java/org/prebid/server/it/RediadsTest.java @@ -0,0 +1,32 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.prebid.server.model.Endpoint; + +import java.io.IOException; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Collections.singletonList; + +public class RediadsTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromRediads() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/rediads-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/rediads/test-rediads-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/rediads/test-rediads-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/rediads/test-auction-rediads-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/rediads/test-auction-rediads-response.json", response, singletonList("rediads")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-request.json new file mode 100644 index 00000000000..8692b2e22b0 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-request.json @@ -0,0 +1,21 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "rediads": { + "account_id": "publisherId" + } + } + } + ], + "tmax": 5000, + "regs": { + "gdpr": 0 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-response.json new file mode 100644 index 00000000000..121de1185c8 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-auction-rediads-response.json @@ -0,0 +1,38 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 3.33, + "crid": "creativeId", + "mtype": 1, + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "rediads" + } + }, + "origbidcpm": 3.33 + } + } + ], + "seat": "rediads", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "rediads": "{{ rediads.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-request.json new file mode 100644 index 00000000000..743d5a7ca27 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-request.json @@ -0,0 +1,52 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "secure": 1, + "ext": { + "tid": "${json-unit.any-string}" + } + } + ], + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "id": "publisherId", + "domain" : "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": [ + "USD" + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "regs": { + "gdpr": 0 + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-response.json new file mode 100644 index 00000000000..180173549d8 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/rediads/test-rediads-bid-response.json @@ -0,0 +1,21 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 3.33, + "crid": "creativeId", + "mtype": 1, + "ext": { + "prebid": { + "type": "banner" + } + } + } + ] + } + ] +} 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 747b9a2fc6a..c098329e263 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -426,6 +426,8 @@ adapters.qt.enabled=true adapters.qt.endpoint=http://localhost:8090/qt-exchange adapters.readpeak.enabled=true adapters.readpeak.endpoint=http://localhost:8090/readpeak-exchange +adapters.rediads.enabled=true +adapters.rediads.endpoint=http://localhost:8090/rediads-exchange adapters.relevantdigital.enabled=true adapters.relevantdigital.endpoint=http://localhost:8090/relevantdigital-exchange?pbsHost={{Host}} adapters.resetdigital.enabled=true From dbb694e8fa12939120b2aeb140828ad049e17fcc Mon Sep 17 00:00:00 2001 From: antonbabak Date: Mon, 28 Jul 2025 14:45:14 +0200 Subject: [PATCH 2/2] fix comments --- .../server/bidder/rediads/RediadsBidder.java | 24 +++++------------- .../config/bidder/RediadsConfiguration.java | 25 +++++++++++++++---- src/main/resources/bidder-config/rediads.yaml | 3 ++- .../bidder/rediads/RediadsBidderTest.java | 9 ++++--- .../server/it/test-application.properties | 3 ++- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java b/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java index 8b7e9203739..c0dad6f8760 100644 --- a/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/rediads/RediadsBidder.java @@ -27,8 +27,6 @@ import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -40,13 +38,16 @@ public class RediadsBidder implements Bidder { private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { }; + private static final String SUBDOMAIN_MACRO = "{{SUBDOMAIN}}"; private final String endpointUrl; + private final String defaultSubdomain; private final JacksonMapper mapper; - public RediadsBidder(String endpointUrl, JacksonMapper mapper) { + public RediadsBidder(String endpointUrl, JacksonMapper mapper, String defaultSubdomain) { this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); this.mapper = Objects.requireNonNull(mapper); + this.defaultSubdomain = Objects.requireNonNull(defaultSubdomain); } @Override @@ -123,21 +124,8 @@ private static App modifyApp(App app, String accountId) { return app.toBuilder().publisher(newPublisher).build(); } - private String resolveEndpointUrl(String endpoint) { - if (StringUtils.isBlank(endpoint)) { - return endpointUrl; - } - - try { - final URL originalUrl = new URL(endpointUrl); - final String originalHost = originalUrl.getHost(); - final String[] hostParts = originalHost.split("\\."); - hostParts[0] = endpoint; - final String newHost = String.join(".", hostParts); - return endpointUrl.replace(originalHost, newHost); - } catch (MalformedURLException e) { - throw new PreBidException("Failed to parse endpoint URL: " + endpointUrl); - } + private String resolveEndpointUrl(String subdomain) { + return endpointUrl.replace(SUBDOMAIN_MACRO, StringUtils.defaultIfBlank(subdomain, defaultSubdomain)); } @Override diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java index af549584198..8339e77c199 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java @@ -1,5 +1,8 @@ package org.prebid.server.spring.config.bidder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.prebid.server.bidder.BidderDeps; import org.prebid.server.bidder.rediads.RediadsBidder; import org.prebid.server.json.JacksonMapper; @@ -23,19 +26,31 @@ public class RediadsConfiguration { @Bean("rediadsConfigurationProperties") @ConfigurationProperties("adapters.rediads") - BidderConfigurationProperties configurationProperties() { - return new BidderConfigurationProperties(); + RediadsConfigurationProperties configurationProperties() { + return new RediadsConfigurationProperties(); } @Bean - BidderDeps rediadsBidderDeps(BidderConfigurationProperties rediadsConfigurationProperties, + BidderDeps rediadsBidderDeps(RediadsConfigurationProperties rediadsConfigurationProperties, @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { - return BidderDepsAssembler.forBidder(BIDDER_NAME) + return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(rediadsConfigurationProperties) .usersyncerCreator(UsersyncerCreator.create(externalUrl)) - .bidderCreator(config -> new RediadsBidder(config.getEndpoint(), mapper)) + .bidderCreator(config -> new RediadsBidder( + config.getEndpoint(), + mapper, + config.getDefaultSubdomain())) .assemble(); } + + @Data + @EqualsAndHashCode(callSuper = true) + @NoArgsConstructor + private static class RediadsConfigurationProperties extends BidderConfigurationProperties { + + @NotBlank + private String defaultSubdomain; + } } diff --git a/src/main/resources/bidder-config/rediads.yaml b/src/main/resources/bidder-config/rediads.yaml index c7c642e829a..c885129acba 100644 --- a/src/main/resources/bidder-config/rediads.yaml +++ b/src/main/resources/bidder-config/rediads.yaml @@ -1,6 +1,7 @@ adapters: rediads: - endpoint: https://bidding.rediads.com/openrtb2/auction + endpoint: https://{{SUBDOMAIN}}.rediads.com/openrtb2/auction + default-subdomain: bidding ortb-version: "2.6" modifying-vast-xml-allowed: true meta-info: diff --git a/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java b/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java index c85a9345f83..4d294c78856 100644 --- a/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/rediads/RediadsBidderTest.java @@ -35,13 +35,14 @@ public class RediadsBidderTest extends VertxTest { - private static final String ENDPOINT_URL = "http://sub.domain.com/path"; + private static final String ENDPOINT_URL = "http://{{SUBDOMAIN}}.domain.com/path"; - private final RediadsBidder target = new RediadsBidder(ENDPOINT_URL, jacksonMapper); + private final RediadsBidder target = new RediadsBidder(ENDPOINT_URL, jacksonMapper, "subdomain"); @Test public void creationShouldFailOnInvalidEndpointUrl() { - assertThatIllegalArgumentException().isThrownBy(() -> new RediadsBidder("invalid_url", jacksonMapper)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new RediadsBidder("invalid_url", jacksonMapper, "subdomain")); } @Test @@ -150,7 +151,7 @@ public void makeHttpRequestsShouldUseOriginalEndpointWhenEndpointInExtIsBlank() assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()).hasSize(1) .extracting(HttpRequest::getUri) - .containsExactly(ENDPOINT_URL); + .containsExactly("http://subdomain.domain.com/path"); } @Test 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 c098329e263..09a9e412c11 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -427,7 +427,8 @@ adapters.qt.endpoint=http://localhost:8090/qt-exchange adapters.readpeak.enabled=true adapters.readpeak.endpoint=http://localhost:8090/readpeak-exchange adapters.rediads.enabled=true -adapters.rediads.endpoint=http://localhost:8090/rediads-exchange +adapters.rediads.endpoint=http://{{SUBDOMAIN}}:8090/rediads-exchange +adapters.rediads.default-subdomain=localhost adapters.relevantdigital.enabled=true adapters.relevantdigital.endpoint=http://localhost:8090/relevantdigital-exchange?pbsHost={{Host}} adapters.resetdigital.enabled=true