From 83bf7be6422538ae9c1c5617a48ea4600be30b80 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 25 Mar 2025 17:27:21 +0100 Subject: [PATCH 1/6] Zeta Global SSP: Add sid parameter and audio support, no longer generic --- .../zeta_global_ssp/ZetaGlobalSspBidder.java | 152 ++++++++++++ .../zeta_global_ssp/ExtImpZetaGlobalSSP.java | 11 + .../bidder/ZetaGlobalSspConfiguration.java | 43 ++++ src/main/resources/bidder-config/generic.yaml | 21 -- .../bidder-config/zeta_global_ssp.yaml | 25 ++ .../static/bidder-params/zeta_global_ssp.json | 9 +- .../ZetaGlobalSspBidderTest.java | 233 ++++++++++++++++++ .../test-auction-zeta_global_ssp-request.json | 4 +- .../test-zeta_global_ssp-bid-request.json | 6 +- .../test-zeta_global_ssp-bid-response.json | 10 +- .../server/it/test-application.properties | 4 +- 11 files changed, 484 insertions(+), 34 deletions(-) create mode 100644 src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/ZetaGlobalSspConfiguration.java create mode 100644 src/main/resources/bidder-config/zeta_global_ssp.yaml create mode 100644 src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java diff --git a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java new file mode 100644 index 00000000000..87eee4b9936 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java @@ -0,0 +1,152 @@ +package org.prebid.server.bidder.zeta_global_ssp; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import io.vertx.core.http.HttpMethod; +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.zeta_global_ssp.ExtImpZetaGlobalSSP; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; +import org.prebid.server.util.HttpUtil; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +public class ZetaGlobalSspBidder implements Bidder { + + private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { + }; + + private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = + new TypeReference<>() { + }; + private static final String SID_MACRO = "{{AccountID}}"; + + private final String endpointUrl; + private final JacksonMapper mapper; + + public ZetaGlobalSspBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = endpointUrl; + this.mapper = mapper; + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List errors = new ArrayList<>(); + + if (request.getImp().isEmpty()) { + return Result.withError(BidderError.badInput("No impressions in request")); + } + + final Imp firstImp = request.getImp().getFirst(); + final ExtImpZetaGlobalSSP extImp; + + try { + extImp = parseImpExt(firstImp); + } catch (PreBidException e) { + return Result.withError(BidderError.badInput(e.getMessage())); + } + + final BidRequest cleanedRequest = removeImpsExt(request); + + return Result.of(Collections.singletonList(createHttpRequest(cleanedRequest, extImp)), errors); + } + + private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { + try { + return mapper.mapper().convertValue(imp.getExt(), TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException("Missing bidder ext in impression with id: " + imp.getId()); + } + } + + private HttpRequest createHttpRequest(BidRequest request, ExtImpZetaGlobalSSP extImpZetaGlobalSSP) { + return HttpRequest.builder() + .method(HttpMethod.POST) + .uri(resolveEndpoint(extImpZetaGlobalSSP)) + .body(mapper.encodeToBytes(request)) + .payload(request) + .headers(HttpUtil.headers()) + .build(); + } + + private String resolveEndpoint(ExtImpZetaGlobalSSP extImpZetaGlobalSSP) { + return endpointUrl + .replace(SID_MACRO, StringUtils.defaultString(String.valueOf(extImpZetaGlobalSSP.getSid()))); + } + + private BidRequest removeImpsExt(BidRequest request) { + return request.toBuilder() + .imp(request.getImp().stream() + .map(imp -> imp.toBuilder().ext(null).build()) + .toList()) + .build(); + } + + @Override + public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + final List errors = new ArrayList<>(); + return Result.of(extractBids(bidResponse, errors), errors); + } catch (DecodeException | PreBidException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private List extractBids(BidResponse bidResponse, List errors) { + if (bidResponse == null || bidResponse.getSeatbid() == null) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse, errors); + } + + private List bidsFromResponse(BidResponse bidResponse, List errors) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> makeBid(bid, bidResponse.getCur(), errors)) + .filter(Objects::nonNull) + .toList(); + } + + private BidderBid makeBid(Bid bid, String currency, List errors) { + final BidType mediaType = getMediaType(bid, errors); + return mediaType == null ? null : BidderBid.of(bid, mediaType, currency); + } + + private BidType getMediaType(Bid bid, List errors) { + try { + return Optional.ofNullable(bid.getExt()) + .map(ext -> mapper.mapper().convertValue(ext, EXT_PREBID_TYPE_REFERENCE)) + .map(ExtPrebid::getPrebid) + .map(ExtBidPrebid::getType) + .orElseThrow(IllegalArgumentException::new); + } catch (IllegalArgumentException e) { + errors.add(BidderError.badServerResponse( + "Failed to parse impression \"%s\" mediatype".formatted(bid.getImpid()))); + return null; + } + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java new file mode 100644 index 00000000000..288d68de005 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java @@ -0,0 +1,11 @@ +package org.prebid.server.proto.openrtb.ext.request.zeta_global_ssp; + +import lombok.AllArgsConstructor; +import lombok.Value; + +@AllArgsConstructor(staticName = "of") +@Value +public class ExtImpZetaGlobalSSP { + + Integer sid; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ZetaGlobalSspConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ZetaGlobalSspConfiguration.java new file mode 100644 index 00000000000..aa98e645aa0 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/ZetaGlobalSspConfiguration.java @@ -0,0 +1,43 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.zeta_global_ssp.ZetaGlobalSspBidder; +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.Qualifier; +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/zeta_global_ssp.yaml", factory = YamlPropertySourceFactory.class) +public class ZetaGlobalSspConfiguration { + + private static final String BIDDER_NAME = "zeta_global_ssp"; + + @Bean("zetaglobalsspConfigurationProperties") + @ConfigurationProperties("adapters.zetaglobalssp") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps zetaGlobalSspBidderDeps(@Qualifier("zetaglobalsspConfigurationProperties") + BidderConfigurationProperties zetaGlobalSspConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(zetaGlobalSspConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new ZetaGlobalSspBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/generic.yaml b/src/main/resources/bidder-config/generic.yaml index 4aa01b82bbb..a6522be1122 100644 --- a/src/main/resources/bidder-config/generic.yaml +++ b/src/main/resources/bidder-config/generic.yaml @@ -41,27 +41,6 @@ adapters: - video supported-vendors: vendor-id: 0 - zeta_global_ssp: - enabled: false - endpoint: https://ssp.disqus.com/bid/prebid-server?sid=GET_SID_FROM_ZETA - endpoint-compression: gzip - meta-info: - maintainer-email: DL-Zeta-SSP@zetaglobal.com - app-media-types: - - banner - - video - site-media-types: - - banner - - video - supported-vendors: - vendor-id: 833 - usersync: - enabled: true - cookie-family-name: zeta_global_ssp - redirect: - url: https://ssp.disqus.com/redirectuser?sid=GET_SID_FROM_ZETA&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&r={{redirect_url}} - uid-macro: 'BUYERUID' - support-cors: false blue: enabled: false endpoint: https://prebid-us-east-1.getblue.io/?src=prebid diff --git a/src/main/resources/bidder-config/zeta_global_ssp.yaml b/src/main/resources/bidder-config/zeta_global_ssp.yaml new file mode 100644 index 00000000000..65e1ad0f833 --- /dev/null +++ b/src/main/resources/bidder-config/zeta_global_ssp.yaml @@ -0,0 +1,25 @@ +adapters: + zeta_global_ssp: + endpoint: https://ssp.disqus.com/bid/prebid-server?sid={{AccountID}} + endpoint-compression: gzip + disabled: true + geoscope: + - global + modifyingVastXmlAllowed: true + meta-info: + maintainer-email: DL-Zeta-SSP@zetaglobal.com + app-media-types: + - banner + - video + - audio + site-media-types: + - banner + - video + - audio + vendor-id: 833 + usersync: + cookie-family-name: zeta_global_ssp + redirect: + url: https://ssp.disqus.com/redirectuser?gdpr={{GDPR}}&gdpr_consent={{GDPRConsent}}&us_privacy={{USPrivacy}}&r={{RedirectURL}} + support-cors: false + userMacro: 'BUYERUID' diff --git a/src/main/resources/static/bidder-params/zeta_global_ssp.json b/src/main/resources/static/bidder-params/zeta_global_ssp.json index 91ff05ed089..3c997eef3a0 100644 --- a/src/main/resources/static/bidder-params/zeta_global_ssp.json +++ b/src/main/resources/static/bidder-params/zeta_global_ssp.json @@ -3,8 +3,11 @@ "title": "Zeta Global SSP Adapter Params", "description": "A schema which validates params accepted by the Zeta SSP adapter", "type": "object", - - "properties": {}, - + "properties": { + "sid": { + "type": "integer", + "description": "An ID which identifies the publisher" + } + }, "required": [] } diff --git a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java new file mode 100644 index 00000000000..3ed3d7bfb6b --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java @@ -0,0 +1,233 @@ +package org.prebid.server.bidder.zeta_global_ssp; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +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.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.theadx.TheadxBidder; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.zeta_global_ssp.ExtImpZetaGlobalSSP; +import org.prebid.server.proto.openrtb.ext.response.BidType; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.function.UnaryOperator; + +import static java.util.Collections.singletonList; +import static java.util.function.UnaryOperator.identity; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.prebid.server.bidder.model.BidderError.Type.bad_server_response; +import static org.prebid.server.util.HttpUtil.ACCEPT_HEADER; +import static org.prebid.server.util.HttpUtil.APPLICATION_JSON_CONTENT_TYPE; +import static org.prebid.server.util.HttpUtil.CONTENT_TYPE_HEADER; +import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE; + +public class ZetaGlobalSspBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "https://test-url.com/{{AccountID}}"; + + private final ZetaGlobalSspBidder target = new ZetaGlobalSspBidder(ENDPOINT_URL, jacksonMapper); + + @Test + public void shouldFailOnBidderCreation() { + assertThatIllegalArgumentException().isThrownBy(() -> new TheadxBidder("invalid_url", jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldReturnErrorIfNoImps() { + // given + final BidRequest bidRequest = BidRequest.builder().imp(Collections.emptyList()).build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> assertThat(error.getMessage()).contains("No impressions in request")); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldReturnErrorIfImpExtMissing() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(Imp.builder() + .id("imp1") + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build())) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).contains("Missing bidder ext in impression with id: imp1"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { + // given + final Imp imp1 = givenImp(imp -> imp.id("imp1").ext(givenImpExt(11))); + final Imp imp2 = givenImp(imp -> imp.id("imp2").ext(givenImpExt(44))); + final BidRequest bidRequest = BidRequest.builder().imp(List.of(imp1, imp2)).build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getValue()).hasSize(1); + final HttpRequest httpRequest = result.getValue().getFirst(); + + assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); + + final BidRequest payload = httpRequest.getPayload(); + assertThat(payload.getImp()) + .extracting(Imp::getExt) + .containsExactly(null, null); + assertThat(result.getErrors()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldReturnExpectedHeaders2() { + // given + final BidRequest bidRequest = givenBidRequest(identity()).toBuilder() + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getValue()).hasSize(1).first() + .extracting(HttpRequest::getHeaders) + .satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER)) + .isEqualTo(APPLICATION_JSON_CONTENT_TYPE)) + .satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER)) + .isEqualTo(APPLICATION_JSON_VALUE)); + assertThat(result.getErrors()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorIfResponseBodyInvalid() { + // given + final BidderCall httpCall = givenHttpCall("invalid-response-body"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).contains("Failed to decode:"); + assertThat(error.getType()).isEqualTo(bad_server_response); + }); + } + + @Test + public void makeBidsShouldReturnEmptyListIfSeatBidIsNullOrEmpty() throws JsonProcessingException { + // given + final BidderCall httpCall = + givenHttpCall(mapper.writeValueAsString(BidResponse.builder().cur("USD").build())); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorIfCannotResolveBidType() throws JsonProcessingException { + // given + final Bid bid = Bid.builder().impid("imp1").ext(mapper.createObjectNode()).build(); + final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder().bid(List.of(bid)).build())) + .build())); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).contains("Failed to parse impression \"imp1\" mediatype"); + assertThat(error.getType()).isEqualTo(bad_server_response); + }); + } + + @Test + public void makeBidsShouldReturnBannerBidIfTypeParsedProperly() throws JsonProcessingException { + // given + final ObjectNode extWithPrebidType = mapper.createObjectNode(); + extWithPrebidType.putObject("prebid").put("type", "banner"); + final Bid validBid = Bid.builder().impid("imp1").ext(extWithPrebidType).build(); + + final BidResponse bidResponse = BidResponse.builder() + .cur("USD") + .seatbid(List.of(SeatBid.builder().bid(List.of(validBid)).build())) + .build(); + + final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(bidResponse)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1); + final BidderBid bidderBid = result.getValue().getFirst(); + assertThat(bidderBid.getBid().getImpid()).isEqualTo("imp1"); + assertThat(bidderBid.getType()).isEqualTo(BidType.banner); + assertThat(bidderBid.getBidCurrency()).isEqualTo("USD"); + } + + private static BidRequest givenBidRequest(UnaryOperator... impCustomizers) { + return BidRequest.builder() + .imp(Arrays.stream(impCustomizers).map(ZetaGlobalSspBidderTest::givenImp).toList()) + .build(); + } + + private static Imp givenImp(UnaryOperator impCustomizer) { + return impCustomizer.apply(Imp.builder().id("imp_id").ext(givenImpExt(11))).build(); + } + + private static ObjectNode givenImpExt(Integer sid) { + return mapper.valueToTree(ExtPrebid.of(null, ExtImpZetaGlobalSSP.of(sid))); + } + + 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().payload(null).build(), + HttpResponse.of(200, null, body), + null); + } + +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-auction-zeta_global_ssp-request.json b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-auction-zeta_global_ssp-request.json index 0a3824d6e31..e68be13ed77 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-auction-zeta_global_ssp-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-auction-zeta_global_ssp-request.json @@ -12,7 +12,9 @@ ] }, "ext": { - "zeta_global_ssp": {} + "zeta_global_ssp": { + "sid": 11 + } } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-request.json index 2608812c09e..d982ec42345 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-request.json @@ -11,11 +11,7 @@ } ] }, - "secure": 1, - "ext": { - "tid": "${json-unit.any-string}", - "bidder": {} - } + "secure": 1 } ], "site": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-response.json index c31fabcb822..39d74ae42cd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeta_global_ssp/test-zeta_global_ssp-bid-response.json @@ -12,9 +12,15 @@ "cid": "cid001", "adm": "adm001", "h": 250, - "w": 300 + "w": 300, + "ext": { + "prebid": { + "type": "banner" + } + } } - ] + ], + "seat": "zeta_global_ssp" } ] } 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 860aec4ac8c..a5b99318fdd 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -14,8 +14,6 @@ adapters.generic.aliases.cwire.enabled=true adapters.generic.aliases.cwire.endpoint=http://localhost:8090/cwire-exchange adapters.generic.aliases.infytv.enabled=true adapters.generic.aliases.infytv.endpoint=http://localhost:8090/infytv-exchange -adapters.generic.aliases.zeta_global_ssp.enabled=true -adapters.generic.aliases.zeta_global_ssp.endpoint=http://localhost:8090/zeta_global_ssp-exchange adapters.aceex.enabled=true adapters.aceex.endpoint=http://localhost:8090/aceex-exchange adapters.acuityads.enabled=true @@ -546,6 +544,8 @@ adapters.yieldone.enabled=true adapters.yieldone.endpoint=http://localhost:8090/yieldone-exchange adapters.zeroclickfraud.enabled=true adapters.zeroclickfraud.endpoint=http://{{Host}}/zeroclickfraud-exchange?sid={{SourceId}} +adapters.zeta_global_ssp.enabled=true +adapters.zeta_global_ssp.endpoint=http://localhost:8090/zeta_global_ssp-exchange adapters.aax.enabled=true adapters.aax.endpoint=http://localhost:8090/aax-exchange adapters.zmaticoo.enabled=true From de15a7f94581b9eeea5815e8616e1c3902b17856 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 28 Mar 2025 09:17:43 +0100 Subject: [PATCH 2/6] fix comments --- .../zeta_global_ssp/ZetaGlobalSspBidder.java | 34 +++++++------------ .../zeta_global_ssp/ExtImpZetaGlobalSSP.java | 4 +-- .../bidder-config/zeta_global_ssp.yaml | 7 ++-- .../static/bidder-params/zeta_global_ssp.json | 6 ++-- .../ZetaGlobalSspBidderTest.java | 24 +------------ 5 files changed, 20 insertions(+), 55 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java index 87eee4b9936..db548c06cd3 100644 --- a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java +++ b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java @@ -7,7 +7,6 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -import io.vertx.core.http.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; @@ -22,6 +21,7 @@ import org.prebid.server.proto.openrtb.ext.request.zeta_global_ssp.ExtImpZetaGlobalSSP; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; +import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; import java.util.ArrayList; @@ -45,18 +45,13 @@ public class ZetaGlobalSspBidder implements Bidder { private final JacksonMapper mapper; public ZetaGlobalSspBidder(String endpointUrl, JacksonMapper mapper) { - this.endpointUrl = endpointUrl; - this.mapper = mapper; + this.endpointUrl = HttpUtil.validateUrl(endpointUrl); + this.mapper = Objects.requireNonNull(mapper); } @Override public Result>> makeHttpRequests(BidRequest request) { final List errors = new ArrayList<>(); - - if (request.getImp().isEmpty()) { - return Result.withError(BidderError.badInput("No impressions in request")); - } - final Imp firstImp = request.getImp().getFirst(); final ExtImpZetaGlobalSSP extImp; @@ -68,7 +63,10 @@ public Result>> makeHttpRequests(BidRequest request final BidRequest cleanedRequest = removeImpsExt(request); - return Result.of(Collections.singletonList(createHttpRequest(cleanedRequest, extImp)), errors); + final HttpRequest httpRequest = + BidderUtil.defaultRequest(cleanedRequest, resolveEndpoint(extImp), mapper); + + return Result.of(Collections.singletonList(httpRequest), errors); } private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { @@ -79,26 +77,18 @@ private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { } } - private HttpRequest createHttpRequest(BidRequest request, ExtImpZetaGlobalSSP extImpZetaGlobalSSP) { - return HttpRequest.builder() - .method(HttpMethod.POST) - .uri(resolveEndpoint(extImpZetaGlobalSSP)) - .body(mapper.encodeToBytes(request)) - .payload(request) - .headers(HttpUtil.headers()) - .build(); - } - private String resolveEndpoint(ExtImpZetaGlobalSSP extImpZetaGlobalSSP) { return endpointUrl .replace(SID_MACRO, StringUtils.defaultString(String.valueOf(extImpZetaGlobalSSP.getSid()))); } private BidRequest removeImpsExt(BidRequest request) { + final List imps = new ArrayList<>(request.getImp()); + final Imp firstImp = imps.getFirst().toBuilder().ext(null).build(); + imps.set(0, firstImp); + return request.toBuilder() - .imp(request.getImp().stream() - .map(imp -> imp.toBuilder().ext(null).build()) - .toList()) + .imp(imps) .build(); } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java index 288d68de005..b904d2e677a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeta_global_ssp/ExtImpZetaGlobalSSP.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.zeta_global_ssp; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpZetaGlobalSSP { Integer sid; diff --git a/src/main/resources/bidder-config/zeta_global_ssp.yaml b/src/main/resources/bidder-config/zeta_global_ssp.yaml index 65e1ad0f833..4c050049d2e 100644 --- a/src/main/resources/bidder-config/zeta_global_ssp.yaml +++ b/src/main/resources/bidder-config/zeta_global_ssp.yaml @@ -2,10 +2,9 @@ adapters: zeta_global_ssp: endpoint: https://ssp.disqus.com/bid/prebid-server?sid={{AccountID}} endpoint-compression: gzip - disabled: true geoscope: - global - modifyingVastXmlAllowed: true + modifying-vast-xml-allowed: true meta-info: maintainer-email: DL-Zeta-SSP@zetaglobal.com app-media-types: @@ -20,6 +19,6 @@ adapters: usersync: cookie-family-name: zeta_global_ssp redirect: - url: https://ssp.disqus.com/redirectuser?gdpr={{GDPR}}&gdpr_consent={{GDPRConsent}}&us_privacy={{USPrivacy}}&r={{RedirectURL}} + url: https://ssp.disqus.com/redirectuser?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&r={{redirect_url}} support-cors: false - userMacro: 'BUYERUID' + uid-macro: 'BUYERUID' diff --git a/src/main/resources/static/bidder-params/zeta_global_ssp.json b/src/main/resources/static/bidder-params/zeta_global_ssp.json index 3c997eef3a0..8a6d1d0a060 100644 --- a/src/main/resources/static/bidder-params/zeta_global_ssp.json +++ b/src/main/resources/static/bidder-params/zeta_global_ssp.json @@ -1,13 +1,13 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "title": "Zeta Global SSP Adapter Params", - "description": "A schema which validates params accepted by the Zeta SSP adapter", + "description": "A schema which validates params accepted by the Zeta Global SSP adapter", + "type": "object", "properties": { "sid": { "type": "integer", "description": "An ID which identifies the publisher" } - }, - "required": [] + } } diff --git a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java index 3ed3d7bfb6b..f69762f5041 100644 --- a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java @@ -21,7 +21,6 @@ import org.prebid.server.proto.openrtb.ext.response.BidType; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.function.UnaryOperator; @@ -46,20 +45,6 @@ public void shouldFailOnBidderCreation() { assertThatIllegalArgumentException().isThrownBy(() -> new TheadxBidder("invalid_url", jacksonMapper)); } - @Test - public void makeHttpRequestsShouldReturnErrorIfNoImps() { - // given - final BidRequest bidRequest = BidRequest.builder().imp(Collections.emptyList()).build(); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).hasSize(1) - .allSatisfy(error -> assertThat(error.getMessage()).contains("No impressions in request")); - assertThat(result.getValue()).isEmpty(); - } - @Test public void makeHttpRequestsShouldReturnErrorIfImpExtMissing() { // given @@ -101,7 +86,7 @@ public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { final BidRequest payload = httpRequest.getPayload(); assertThat(payload.getImp()) .extracting(Imp::getExt) - .containsExactly(null, null); + .containsExactly(null, givenImpExt(44)); assertThat(result.getErrors()).isEmpty(); } @@ -216,13 +201,6 @@ private static ObjectNode givenImpExt(Integer sid) { return mapper.valueToTree(ExtPrebid.of(null, ExtImpZetaGlobalSSP.of(sid))); } - 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().payload(null).build(), From 32661f347e22ba09f84bcbaf33fcca8ae3dda538 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Mon, 14 Apr 2025 14:40:43 +0200 Subject: [PATCH 3/6] fix comments: --- .../server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java index db548c06cd3..50e7c8c9c1d 100644 --- a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java +++ b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java @@ -51,7 +51,6 @@ public ZetaGlobalSspBidder(String endpointUrl, JacksonMapper mapper) { @Override public Result>> makeHttpRequests(BidRequest request) { - final List errors = new ArrayList<>(); final Imp firstImp = request.getImp().getFirst(); final ExtImpZetaGlobalSSP extImp; @@ -66,7 +65,7 @@ public Result>> makeHttpRequests(BidRequest request final HttpRequest httpRequest = BidderUtil.defaultRequest(cleanedRequest, resolveEndpoint(extImp), mapper); - return Result.of(Collections.singletonList(httpRequest), errors); + return Result.of(Collections.singletonList(httpRequest), Collections.emptyList()); } private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { From cd54324d17f588873b456010c5e7f25fd307dbab Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 25 Apr 2025 11:13:36 +0200 Subject: [PATCH 4/6] fix comments --- .../zeta_global_ssp/ZetaGlobalSspBidder.java | 26 +++---- .../ZetaGlobalSspBidderTest.java | 70 ++++++++++++------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java index 50e7c8c9c1d..85454c43f2d 100644 --- a/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java +++ b/src/main/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidder.java @@ -1,13 +1,11 @@ package org.prebid.server.bidder.zeta_global_ssp; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -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; @@ -33,10 +31,11 @@ public class ZetaGlobalSspBidder implements Bidder { - private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { - }; + private static final TypeReference> ZETA_GLOBAL_EXT_TYPE_REFERENCE = + new TypeReference<>() { + }; - private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = + private static final TypeReference> EXT_BID_TYPE_REFERENCE = new TypeReference<>() { }; private static final String SID_MACRO = "{{AccountID}}"; @@ -60,17 +59,17 @@ public Result>> makeHttpRequests(BidRequest request return Result.withError(BidderError.badInput(e.getMessage())); } - final BidRequest cleanedRequest = removeImpsExt(request); + final HttpRequest httpRequest = BidderUtil.defaultRequest( + removeImpsExt(request), + resolveEndpoint(extImp), + mapper); - final HttpRequest httpRequest = - BidderUtil.defaultRequest(cleanedRequest, resolveEndpoint(extImp), mapper); - - return Result.of(Collections.singletonList(httpRequest), Collections.emptyList()); + return Result.withValues(Collections.singletonList(httpRequest)); } private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { try { - return mapper.mapper().convertValue(imp.getExt(), TYPE_REFERENCE).getBidder(); + return mapper.mapper().convertValue(imp.getExt(), ZETA_GLOBAL_EXT_TYPE_REFERENCE).getBidder(); } catch (IllegalArgumentException e) { throw new PreBidException("Missing bidder ext in impression with id: " + imp.getId()); } @@ -78,7 +77,7 @@ private ExtImpZetaGlobalSSP parseImpExt(Imp imp) { private String resolveEndpoint(ExtImpZetaGlobalSSP extImpZetaGlobalSSP) { return endpointUrl - .replace(SID_MACRO, StringUtils.defaultString(String.valueOf(extImpZetaGlobalSSP.getSid()))); + .replace(SID_MACRO, Objects.toString(extImpZetaGlobalSSP.getSid(), "0")); } private BidRequest removeImpsExt(BidRequest request) { @@ -115,6 +114,7 @@ private List bidsFromResponse(BidResponse bidResponse, List makeBid(bid, bidResponse.getCur(), errors)) .filter(Objects::nonNull) .toList(); @@ -128,7 +128,7 @@ private BidderBid makeBid(Bid bid, String currency, List errors) { private BidType getMediaType(Bid bid, List errors) { try { return Optional.ofNullable(bid.getExt()) - .map(ext -> mapper.mapper().convertValue(ext, EXT_PREBID_TYPE_REFERENCE)) + .map(ext -> mapper.mapper().convertValue(ext, EXT_BID_TYPE_REFERENCE)) .map(ExtPrebid::getPrebid) .map(ExtBidPrebid::getType) .orElseThrow(IllegalArgumentException::new); diff --git a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java index f69762f5041..6e74dcd4876 100644 --- a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java @@ -20,7 +20,6 @@ import org.prebid.server.proto.openrtb.ext.request.zeta_global_ssp.ExtImpZetaGlobalSSP; import org.prebid.server.proto.openrtb.ext.response.BidType; -import java.util.Arrays; import java.util.List; import java.util.function.UnaryOperator; @@ -48,12 +47,10 @@ public void shouldFailOnBidderCreation() { @Test public void makeHttpRequestsShouldReturnErrorIfImpExtMissing() { // given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(Imp.builder() - .id("imp1") - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build())) - .build(); + final BidRequest bidRequest = givenBidRequest(Imp.builder() + .id("imp1") + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build()); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -72,7 +69,7 @@ public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { // given final Imp imp1 = givenImp(imp -> imp.id("imp1").ext(givenImpExt(11))); final Imp imp2 = givenImp(imp -> imp.id("imp2").ext(givenImpExt(44))); - final BidRequest bidRequest = BidRequest.builder().imp(List.of(imp1, imp2)).build(); + final BidRequest bidRequest = givenBidRequest(imp1, imp2); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -83,18 +80,18 @@ public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); - final BidRequest payload = httpRequest.getPayload(); - assertThat(payload.getImp()) + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) .containsExactly(null, givenImpExt(44)); assertThat(result.getErrors()).isEmpty(); } @Test - public void makeHttpRequestsShouldReturnExpectedHeaders2() { + public void makeHttpRequestsShouldReturnExpectedHeaders() { // given - final BidRequest bidRequest = givenBidRequest(identity()).toBuilder() - .build(); + final BidRequest bidRequest = givenBidRequest(givenImp(identity())); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -102,13 +99,27 @@ public void makeHttpRequestsShouldReturnExpectedHeaders2() { // then assertThat(result.getValue()).hasSize(1).first() .extracting(HttpRequest::getHeaders) - .satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER)) - .isEqualTo(APPLICATION_JSON_CONTENT_TYPE)) - .satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER)) - .isEqualTo(APPLICATION_JSON_VALUE)); + .satisfies(headers -> { + assertThat(headers.get(CONTENT_TYPE_HEADER)).isEqualTo(APPLICATION_JSON_CONTENT_TYPE); + assertThat(headers.get(ACCEPT_HEADER)).isEqualTo(APPLICATION_JSON_VALUE); + }); assertThat(result.getErrors()).isEmpty(); } + @Test + public void shouldResolveMacroInEndpointUrl() { + // given + final Imp imp1 = givenImp(imp -> imp.id("imp1").ext(givenImpExt(11))); + final BidRequest bidRequest = givenBidRequest(imp1); + + final Result>> result = target.makeHttpRequests(bidRequest); + final HttpRequest httpRequest = result.getValue().getFirst(); + + // then + assertThat(result.getValue()).hasSize(1); + assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); + } + @Test public void makeBidsShouldReturnErrorIfResponseBodyInvalid() { // given @@ -166,13 +177,9 @@ public void makeBidsShouldReturnBannerBidIfTypeParsedProperly() throws JsonProce // given final ObjectNode extWithPrebidType = mapper.createObjectNode(); extWithPrebidType.putObject("prebid").put("type", "banner"); - final Bid validBid = Bid.builder().impid("imp1").ext(extWithPrebidType).build(); - - final BidResponse bidResponse = BidResponse.builder() - .cur("USD") - .seatbid(List.of(SeatBid.builder().bid(List.of(validBid)).build())) - .build(); + final Bid validBid = givenBid("imp1", extWithPrebidType); + final BidResponse bidResponse = givenBidResponse(List.of(validBid)); final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(bidResponse)); // when @@ -187,10 +194,8 @@ public void makeBidsShouldReturnBannerBidIfTypeParsedProperly() throws JsonProce assertThat(bidderBid.getBidCurrency()).isEqualTo("USD"); } - private static BidRequest givenBidRequest(UnaryOperator... impCustomizers) { - return BidRequest.builder() - .imp(Arrays.stream(impCustomizers).map(ZetaGlobalSspBidderTest::givenImp).toList()) - .build(); + private static BidRequest givenBidRequest(Imp... imps) { + return BidRequest.builder().imp(List.of(imps)).build(); } private static Imp givenImp(UnaryOperator impCustomizer) { @@ -208,4 +213,15 @@ private static BidderCall givenHttpCall(String body) { null); } + private static Bid givenBid(String impId, ObjectNode ext) { + return Bid.builder().impid(impId).ext(ext).build(); + } + + private static BidResponse givenBidResponse(List bids) { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder().bid(bids).build())) + .build(); + } + } From d7616cea562a063b1e72332ddccba75c6f997fc8 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 25 Apr 2025 16:08:03 +0200 Subject: [PATCH 5/6] fix comments --- .../ZetaGlobalSspBidderTest.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java index 6e74dcd4876..857074692e0 100644 --- a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java @@ -47,10 +47,9 @@ public void shouldFailOnBidderCreation() { @Test public void makeHttpRequestsShouldReturnErrorIfImpExtMissing() { // given - final BidRequest bidRequest = givenBidRequest(Imp.builder() - .id("imp1") - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build()); + final BidRequest bidRequest = givenBidRequest( + givenImp(imp -> imp.id("imp1") + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))))); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -73,13 +72,11 @@ public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { // when final Result>> result = target.makeHttpRequests(bidRequest); + final HttpRequest httpRequest = result.getValue().getFirst(); // then assertThat(result.getValue()).hasSize(1); - final HttpRequest httpRequest = result.getValue().getFirst(); - assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); - assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) @@ -107,11 +104,12 @@ public void makeHttpRequestsShouldReturnExpectedHeaders() { } @Test - public void shouldResolveMacroInEndpointUrl() { + public void makeHttpRequestsShouldResolveMacroInEndpointUrl() { // given final Imp imp1 = givenImp(imp -> imp.id("imp1").ext(givenImpExt(11))); final BidRequest bidRequest = givenBidRequest(imp1); + // when final Result>> result = target.makeHttpRequests(bidRequest); final HttpRequest httpRequest = result.getValue().getFirst(); @@ -154,11 +152,9 @@ public void makeBidsShouldReturnEmptyListIfSeatBidIsNullOrEmpty() throws JsonPro @Test public void makeBidsShouldReturnErrorIfCannotResolveBidType() throws JsonProcessingException { // given - final Bid bid = Bid.builder().impid("imp1").ext(mapper.createObjectNode()).build(); - final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(BidResponse.builder() - .cur("USD") - .seatbid(singletonList(SeatBid.builder().bid(List.of(bid)).build())) - .build())); + final Bid bid = givenBid("imp1", mapper.createObjectNode()); + final BidderCall httpCall = + givenHttpCall(mapper.writeValueAsString(givenBidResponse(List.of(bid)))); // when final Result> result = target.makeBids(httpCall, null); From 407580ab7fdb53d2c96dea84f05e86d3b96d038a Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 16 May 2025 10:32:57 +0200 Subject: [PATCH 6/6] fix comments --- .../bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java index 857074692e0..886af999d74 100644 --- a/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/zeta_global_ssp/ZetaGlobalSspBidderTest.java @@ -75,8 +75,6 @@ public void makeHttpRequestsShouldCreateSingleRequestAndRemoveImpExt() { final HttpRequest httpRequest = result.getValue().getFirst(); // then - assertThat(result.getValue()).hasSize(1); - assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) @@ -111,11 +109,11 @@ public void makeHttpRequestsShouldResolveMacroInEndpointUrl() { // when final Result>> result = target.makeHttpRequests(bidRequest); - final HttpRequest httpRequest = result.getValue().getFirst(); // then - assertThat(result.getValue()).hasSize(1); - assertThat(httpRequest.getUri()).isEqualTo("https://test-url.com/11"); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly("https://test-url.com/11"); } @Test