From 3b1abb952adafbb44cff777737e15fb490540046 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 30 Sep 2025 17:00:38 +0200 Subject: [PATCH 01/11] New Adapter: Nativery --- .../bidder/nativery/NativeryBidder.java | 271 ++++++++++ .../ext/request/nativery/ExtImpNativery.java | 11 + .../bidder/NativeryBidderConfiguration.java | 41 ++ .../resources/bidder-config/nativery.yaml | 12 + .../static/bidder-params/nativery.json | 15 + .../bidder/nativery/NativeryBidderTest.java | 478 ++++++++++++++++++ .../org/prebid/server/it/NativeryTest.java | 32 ++ .../test-auction-nativery-request.json | 54 ++ .../test-auction-nativery-response.json | 43 ++ .../nativery/test-nativery-bid-request.json | 61 +++ .../nativery/test-nativery-bid-response.json | 29 ++ .../server/it/test-application.properties | 2 + 12 files changed, 1049 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/ExtImpNativery.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java create mode 100644 src/main/resources/bidder-config/nativery.yaml create mode 100644 src/main/resources/static/bidder-params/nativery.json create mode 100644 src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java create mode 100644 src/test/java/org/prebid/server/it/NativeryTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-response.json diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java new file mode 100644 index 00000000000..ca12478be17 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -0,0 +1,271 @@ +package org.prebid.server.bidder.nativery; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +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.MultiMap; +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.ExtRequest; +import org.prebid.server.proto.openrtb.ext.request.ExtSite; +import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; +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; +import org.prebid.server.util.BidderUtil; +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; + +public class NativeryBidder implements Bidder { + + private static final TypeReference> NATIVERY_EXT_TYPE_REFERENCE = + new TypeReference<>() { + }; + + private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = + new TypeReference<>() { + }; + + private static final String DEFAULT_CURRENCY = "EUR"; + private static final String NATIVERY_ERROR_HEADER = "X-Nativery-Error"; + + private final String endpointUrl; + private final JacksonMapper mapper; + + public NativeryBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List> httpRequests = new ArrayList<>(); + final List errors = new ArrayList<>(); + + final boolean isAmp = isAmpRequest(request); + + final List validImps = new ArrayList<>(); + String widgetId = null; + + for (Imp imp : request.getImp()) { + try { + final ExtImpNativery extImp = parseImpExt(imp); + if (widgetId == null && extImp != null && StringUtils.isNotBlank(extImp.getWidgetId())) { + widgetId = extImp.getWidgetId(); + } + validImps.add(imp); + } catch (PreBidException e) { + errors.add(BidderError.badInput(e.getMessage())); + } + } + + if (validImps.isEmpty()) { + return Result.of(Collections.emptyList(), errors); + } + + final ExtRequest updatedExt = buildRequestExtWithNativery(request.getExt(), isAmp, widgetId); + + for (Imp imp : validImps) { + final BidRequest singleImpRequest = request.toBuilder() + .imp(Collections.singletonList(imp)) + .ext(updatedExt) + .cur(Collections.singletonList(DEFAULT_CURRENCY)) + .build(); + + httpRequests.add(BidderUtil.defaultRequest(singleImpRequest, endpointUrl, mapper)); + } + + return Result.of(httpRequests, errors); + } + + private ExtImpNativery parseImpExt(Imp imp) { + try { + final ExtPrebid ext = + mapper.mapper().convertValue(imp.getExt(), NATIVERY_EXT_TYPE_REFERENCE); + return ext != null ? ext.getBidder() : null; + } catch (IllegalArgumentException e) { + throw new PreBidException(e.getMessage()); + } + } + + private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean isAmp, String widgetId) { + final ObjectNode extNode = mapper.mapper().convertValue(originalExt, ObjectNode.class); + final ObjectNode root = extNode != null ? extNode : mapper.mapper().createObjectNode(); + + final ObjectNode nativeryNode = root.with("nativery"); + nativeryNode.put("isAmp", isAmp); + if (widgetId != null) { + nativeryNode.put("widgetId", widgetId); + } + + return mapper.mapper().convertValue(root, ExtRequest.class); + } + + private boolean isAmpRequest(BidRequest request) { + if (request.getSite() == null || request.getSite().getExt() == null) { + return false; + } + try { + final ExtSite extSite = mapper.mapper().convertValue(request.getSite().getExt(), ExtSite.class); + final Integer amp = extSite != null ? extSite.getAmp() : null; + return amp != null && amp == 1; + } catch (Exception e) { + return false; + } + } + + @Override + public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + final List errors = new ArrayList<>(); + + if (httpCall.getResponse() != null && httpCall.getResponse().getStatusCode() == 204) { + final MultiMap headers = httpCall.getResponse().getHeaders(); + final String nativeryErr = headers != null ? headers.get(NATIVERY_ERROR_HEADER) : null; + if (StringUtils.isNotBlank(nativeryErr)) { + return Result.withError(BidderError.badInput("Nativery Error: " + nativeryErr + ".")); + } + return Result.withError(BidderError.badServerResponse("No Content")); + } + + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + final List bidderBids = extractBids(bidResponse, errors); + return Result.of(bidderBids, errors); + } catch (DecodeException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private List extractBids(BidResponse bidResponse, List errors) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + + final String currency = StringUtils.defaultIfBlank(bidResponse.getCur(), DEFAULT_CURRENCY); + + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .filter(Objects::nonNull) + .map(bid -> resolveBidderBid(bid, currency, errors)) + .filter(Objects::nonNull) + .toList(); + } + + private BidderBid resolveBidderBid(Bid bid, String currency, List errors) { + try { + final ObjectNode nativeryExt = extractNativeryExt(bid.getExt()); + final String mediaTypeRaw = getText(nativeryExt, "bid_ad_media_type"); + final BidType bidType = mapMediaType(mediaTypeRaw); + + final List advDomains = readStringArray(nativeryExt, "bid_adv_domains"); + final Bid updatedBid = addBidMeta(bid, mediaTypeString(bidType), advDomains); + + return BidderBid.of(updatedBid, bidType, currency); + } catch (PreBidException e) { + errors.add(BidderError.badInput(e.getMessage())); + return null; + } + } + + private ObjectNode extractNativeryExt(ObjectNode bidExt) { + if (bidExt == null) { + throw new PreBidException("missing bid.ext"); + } + final JsonNode node = bidExt.get("nativery"); + if (!(node instanceof ObjectNode nativeryNode)) { + throw new PreBidException("missing bid.ext.nativery"); + } + return nativeryNode; + } + + private static String getText(ObjectNode node, String field) { + final JsonNode v = node.get(field); + return v != null && v.isTextual() ? v.asText() : null; + } + + private static List readStringArray(ObjectNode node, String field) { + final JsonNode arr = node.get(field); + if (arr == null || !arr.isArray()) { + return Collections.emptyList(); + } + final List out = new ArrayList<>(); + arr.forEach(e -> { + if (e != null && e.isTextual()) { + out.add(e.asText()); + } + }); + return out; + } + + private static BidType mapMediaType(String mediaType) { + final String mt = StringUtils.defaultString(mediaType).toLowerCase(); + return switch (mt) { + case "native" -> BidType.xNative; + case "display", "banner", "rich_media" -> BidType.banner; + case "video" -> BidType.video; + default -> throw new PreBidException( + "unrecognized bid_ad_media_type in response from nativery: " + mediaType); + }; + } + + private static String mediaTypeString(BidType type) { + return switch (type) { + case banner -> "banner"; + case video -> "video"; + case xNative -> "native"; + default -> throw new IllegalStateException("Unexpected value: " + type); + }; + } + + private Bid addBidMeta(Bid bid, String mediaType, List advDomains) { + final ExtBidPrebid prebid = parseExtBidPrebid(bid); + + final ExtBidPrebidMeta modifiedMeta = (prebid != null && prebid.getMeta() != null + ? prebid.getMeta().toBuilder() + : ExtBidPrebidMeta.builder()) + .mediaType(mediaType) + .advertiserDomains(advDomains) + .build(); + + final ExtBidPrebid modifiedPrebid = (prebid != null ? prebid.toBuilder() : ExtBidPrebid.builder()) + .meta(modifiedMeta) + .build(); + + return bid.toBuilder() + .ext(mapper.mapper().valueToTree(ExtPrebid.of(modifiedPrebid, null))) + .build(); + } + + private ExtBidPrebid parseExtBidPrebid(Bid bid) { + try { + return mapper.mapper() + .convertValue(bid.getExt(), EXT_PREBID_TYPE_REFERENCE) + .getPrebid(); + } catch (IllegalArgumentException e) { + return null; + } + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/ExtImpNativery.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/ExtImpNativery.java new file mode 100644 index 00000000000..cd1554111e0 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/ExtImpNativery.java @@ -0,0 +1,11 @@ +package org.prebid.server.proto.openrtb.ext.request.nativery; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Value; + +@Value(staticConstructor = "of") +public class ExtImpNativery { + + @JsonProperty("widgetId") + String widgetId; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java new file mode 100644 index 00000000000..dd21eb4909a --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java @@ -0,0 +1,41 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.nativery.NativeryBidder; +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/nativery.yaml", factory = YamlPropertySourceFactory.class) +public class NativeryBidderConfiguration { + + private static final String BIDDER_NAME = "nativery"; + + @Bean("nativeryConfigurationProperties") + @ConfigurationProperties("adapters.nativery") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps nativeryBidderDeps(BidderConfigurationProperties nativeryConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(nativeryConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new NativeryBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/nativery.yaml b/src/main/resources/bidder-config/nativery.yaml new file mode 100644 index 00000000000..4c24d560ca5 --- /dev/null +++ b/src/main/resources/bidder-config/nativery.yaml @@ -0,0 +1,12 @@ +adapters: + nativery: + endpoint: "https://hb.nativery.com/openrtb2/auction" + ortb-version: "2.6" + meta-info: + maintainer-email: "developer@nativery.com" + site-media-types: + - banner + - video + - native + supported-vendors: [] + vendor-id: 0 diff --git a/src/main/resources/static/bidder-params/nativery.json b/src/main/resources/static/bidder-params/nativery.json new file mode 100644 index 00000000000..9f8dc02c274 --- /dev/null +++ b/src/main/resources/static/bidder-params/nativery.json @@ -0,0 +1,15 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Nativery Adapter Params", + "description": "A schema which validates params accepted by the Nativery adapter", + + "type": "object", + "properties": { + "widgetId": { + "type": "string", + "description": "An ID which identifies this Nativery widget" + } + }, + + "required": ["widgetId"] +} diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java new file mode 100644 index 00000000000..815f553db92 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -0,0 +1,478 @@ +package org.prebid.server.bidder.nativery; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +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 io.vertx.core.MultiMap; +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.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.ExtSite; +import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; + +import java.util.List; +import java.util.Map; +import java.util.function.UnaryOperator; + +import static java.util.Arrays.asList; +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.prebid.server.proto.openrtb.ext.response.BidType.audio; +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 NativeryBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "https://test.com/test"; + private static final String DEFAULT_CURRENCY = "EUR"; + private static final String NATIVERY_ERROR_HEADER = "X-Nativery-Error"; + + private final NativeryBidder target = new NativeryBidder(ENDPOINT_URL, jacksonMapper); + + @Test + public void creationShouldFailOnInvalidEndpointUrl() { + assertThatIllegalArgumentException().isThrownBy(() -> new NativeryBidder("invalid_url", jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldMakeOneRequestPerImp() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(asList( + givenImp(UnaryOperator.identity()), + givenImp(imp -> imp.id("321").ext(mapper.valueToTree(ExtPrebid + .of(null, ExtImpNativery.of("widget2"))))))) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(2) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getImp) + .extracting(List::size) + .containsOnly(1); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getId) + .containsExactlyInAnyOrder("123", "321"); + } + + @Test + public void makeHttpRequestsShouldIncludeImpIds() { + // given + final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.id("imp1")); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getId) + .containsExactly("imp1"); + } + + @Test + public void makeHttpRequestsShouldUseCorrectUri() { + // given + final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getUri) + .containsExactly(ENDPOINT_URL); + } + + @Test + public void makeHttpRequestsShouldSetExtWithWidgetId() { + // given + final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getExt) + .extracting(ext -> mapper.convertValue(ext, ObjectNode.class) + .path("nativery").path("widgetId").asText()) + .containsOnly("widget1"); + } + + @Test + public void makeHttpRequestsShouldSetExtWithAmpTrue() { + // given + final ExtSite extSite = ExtSite.of(1, null); + final BidRequest bidRequest = givenBidRequest( + requestBuilder -> requestBuilder.site(Site.builder().ext(extSite).build()), + UnaryOperator.identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getExt) + .extracting(ext -> mapper.convertValue(ext, ObjectNode.class) + .path("nativery").path("isAmp").asBoolean()) + .containsOnly(true); + } + + @Test + public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() { + // given + final BidRequest bidRequest = givenBidRequest(impBuilder -> + impBuilder.ext(mapper.createObjectNode().set("bidder", mapper.createArrayNode()))); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()) + .hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).startsWith("Cannot deserialize"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldSetDefaultCurrency() { + // given + final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getCur) + .extracting(currencies -> currencies.get(0)) + .containsOnly(DEFAULT_CURRENCY); + } + + @Test + public void makeHttpRequestsShouldReturnExpectedHeaders() { + // given + final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); + + // 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 makeBidsShouldReturnErrorWhenStatusIs204WithErrorHeader() { + // given + final BidderCall httpCall = + givenHttpCallWithHeaders(204, Map.of(NATIVERY_ERROR_HEADER, "test error")); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).isEqualTo("Nativery Error: test error."); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + } + + @Test + public void makeBidsShouldReturnErrorWhenStatusIs204WithoutErrorHeader() { + // given + final BidderCall httpCall = givenHttpCallWithHeaders(204, null); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).isEqualTo("No Content"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); + }); + } + + @Test + public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(null)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { + // given + final BidderCall httpCall = givenHttpCall("invalid"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).startsWith("Failed to decode:"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); + }); + } + + @Test + public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + mapper.writeValueAsString(BidResponse.builder().build())); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "banner")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.banner); + } + + @Test + public void makeBidsShouldReturnVideoBid() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "video")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.video); + } + + @Test + public void makeBidsShouldReturnNativeBid() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "native")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.xNative); + } + + @Test + public void makeBidsShouldHandleUnsupportedBidType() throws JsonProcessingException { + // given + final ObjectNode bidExtNativery = mapper.createObjectNode().put("bid_ad_media_type", "audio"); + final ObjectNode bidExt = mapper.createObjectNode() + .putPOJO("prebid", ExtBidPrebid.builder().type(audio).build()) + .set("nativery", bidExtNativery); + + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder.ext(bidExt).impid("123"))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()) + .hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()) + .contains("unrecognized bid_ad_media_type in response from nativery: audio"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + } + + @Test + public void makeBidsShouldAddMetadataFromNativeryExt() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", + Map.of("bid_ad_media_type", "native", "bid_adv_domains", List.of("domain.com"))))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .hasSize(1); + + final BidderBid bidderBid = result.getValue().get(0); + final JsonNode extNode = bidderBid.getBid().getExt(); + final JsonNode metaNode = extNode.path("prebid").path("meta"); + + assertThat(metaNode.path("mediaType").asText()).isEqualTo("native"); + assertThat(metaNode.path("advertiserDomains").isArray()).isTrue(); + assertThat(metaNode.path("advertiserDomains").get(0).asText()).isEqualTo("domain.com"); + } + + @Test + public void makeBidsShouldReturnErrorForInvalidMediaType() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .id("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "invalid")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()) + .hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).startsWith("unrecognized bid_ad_media_type"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + } + + @Test + public void makeBidsShouldReturnErrorForMissingNativeryExt() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder.id("123").ext(mapper.createObjectNode()))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getValue()).isEmpty(); + assertThat(result.getErrors()) + .hasSize(1) + .allSatisfy(error -> { + assertThat(error.getMessage()).isEqualTo("missing bid.ext.nativery"); + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + }); + } + + private static BidRequest givenBidRequest( + UnaryOperator requestCustomizer, + UnaryOperator impCustomizer) { + + return requestCustomizer.apply(BidRequest.builder() + .imp(singletonList(givenImp(impCustomizer)))) + .build(); + } + + private static BidRequest givenBidRequest(UnaryOperator impCustomizer) { + return givenBidRequest(UnaryOperator.identity(), impCustomizer); + } + + private static Imp givenImp(UnaryOperator impCustomizer) { + return impCustomizer.apply(Imp.builder() + .id("123") + .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpNativery.of("widget1"))))) + .build(); + } + + private static String givenBidResponse(UnaryOperator bidCustomizer) throws JsonProcessingException { + final BidResponse bidResponse = BidResponse.builder() + .cur(DEFAULT_CURRENCY) + .seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .build())) + .build(); + return mapper.writeValueAsString(bidResponse); + } + + private static BidderCall givenHttpCall(String body) { + return BidderCall.succeededHttp( + HttpRequest.builder().payload(null).build(), + HttpResponse.of(200, null, body), + null); + } + + private static BidderCall givenHttpCallWithHeaders(int statusCode, Map headers) { + final MultiMap multiMap = MultiMap.caseInsensitiveMultiMap(); + if (headers != null) { + headers.forEach(multiMap::add); + } + + return BidderCall.succeededHttp( + HttpRequest.builder().payload(null).build(), + HttpResponse.of(statusCode, multiMap, null), + null); + } +} + diff --git a/src/test/java/org/prebid/server/it/NativeryTest.java b/src/test/java/org/prebid/server/it/NativeryTest.java new file mode 100644 index 00000000000..b4df3c59702 --- /dev/null +++ b/src/test/java/org/prebid/server/it/NativeryTest.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 NativeryTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromNativery() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/nativery-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/nativery/test-nativery-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/nativery/test-nativery-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/nativery/test-auction-nativery-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/nativery/test-auction-nativery-response.json", response, singletonList("nativery")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-request.json b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-request.json new file mode 100644 index 00000000000..46fa1b2e2e8 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-request.json @@ -0,0 +1,54 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "nativery": { + "widgetId": "1" + } + } + } + ], + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": 5000, + "cur": [ + "USD" + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "regs": { + "ext": { + "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/nativery/test-auction-nativery-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-response.json new file mode 100644 index 00000000000..97b4616fe92 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-auction-nativery-response.json @@ -0,0 +1,43 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 3.33, + "adm": "
ad
", + "adomain": ["example.com"], + "crid": "creativeId", + "mtype": 1, + "ext": { + "origbidcpm": 3.33, + "origbidcur": "USD", + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "nativery", + "mediaType": "banner", + "advertiserDomains": ["example.com"] + } + } + } + } + ], + "seat": "nativery", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "nativery": "{{ nativery.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json new file mode 100644 index 00000000000..c412a8198ce --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json @@ -0,0 +1,61 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "secure": 1, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "widgetId": "1" + } + } + } + ], + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": [ + "EUR" + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "regs": { + "gdpr": 0 + }, + "ext": { + "prebid": { + "channel": { + "name": "web" + }, + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + }, + "nativery": { + "isAmp": false, + "widgetId": "1" + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-response.json new file mode 100644 index 00000000000..1b2e894477e --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-response.json @@ -0,0 +1,29 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 3.33, + "adm": "
ad
", + "adomain": [ + "example.com" + ], + "crid": "creativeId", + "mtype": 1, + "ext": { + "nativery": { + "bid_ad_media_type": "display", + "bid_adv_domains": [ + "example.com" + ] + } + } + } + ] + } + ], + "cur": "USD" +} 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 3d57277ff9d..63e1a41c32a 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -394,6 +394,8 @@ adapters.mobkoi.enabled=true adapters.mobkoi.endpoint=http://localhost:8090/mobkoi-exchange adapters.motorik.enabled=true adapters.motorik.endpoint=http://localhost:8090/motorik-exchange?k={{AccountID}}&name={{SourceId}} +adapters.nativery.enabled=true +adapters.nativery.endpoint=http://localhost:8090/nativery-exchange adapters.nextmillennium.enabled=true adapters.nextmillennium.endpoint=http://localhost:8090/nextmillennium-exchange adapters.nextmillennium.extra-info.nmmFlags=1 From c9ceec1042880e2cb8692fe7a9e5c8170507174d Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Sat, 11 Oct 2025 11:40:46 +0200 Subject: [PATCH 02/11] fix comments --- .../bidder/nativery/NativeryBidder.java | 45 ++++++++++--------- .../bidder/NativeryBidderConfiguration.java | 4 +- .../resources/bidder-config/nativery.yaml | 4 +- .../bidder/nativery/NativeryBidderTest.java | 37 +++++++++++++-- 4 files changed, 62 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index ca12478be17..c07e5ea8815 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -22,7 +22,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.ExtRequest; -import org.prebid.server.proto.openrtb.ext.request.ExtSite; import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; @@ -70,7 +69,7 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { try { final ExtImpNativery extImp = parseImpExt(imp); - if (widgetId == null && extImp != null && StringUtils.isNotBlank(extImp.getWidgetId())) { + if (widgetId == null && StringUtils.isNotBlank(extImp.getWidgetId())) { widgetId = extImp.getWidgetId(); } validImps.add(imp); @@ -83,13 +82,16 @@ public Result>> makeHttpRequests(BidRequest request return Result.of(Collections.emptyList(), errors); } - final ExtRequest updatedExt = buildRequestExtWithNativery(request.getExt(), isAmp, widgetId); + // 🟢 Zmienione — zamieniamy ExtRequest na ObjectNode + final ObjectNode originalExt = request.getExt() != null + ? mapper.mapper().convertValue(request.getExt(), ObjectNode.class) + : null; + final ExtRequest updatedExt = buildRequestExtWithNativery(originalExt, isAmp, widgetId); for (Imp imp : validImps) { final BidRequest singleImpRequest = request.toBuilder() .imp(Collections.singletonList(imp)) - .ext(updatedExt) - .cur(Collections.singletonList(DEFAULT_CURRENCY)) + .ext(updatedExt) // ✅ teraz typ się zgadza .build(); httpRequests.add(BidderUtil.defaultRequest(singleImpRequest, endpointUrl, mapper)); @@ -98,6 +100,18 @@ public Result>> makeHttpRequests(BidRequest request return Result.of(httpRequests, errors); } + private boolean isAmpRequest(BidRequest request) { + if (request.getSite() != null && request.getSite().getExt() != null) { + final JsonNode siteExt = mapper.mapper().valueToTree(request.getSite().getExt()); + final JsonNode ampNode = siteExt.get("amp"); + if (ampNode != null && ampNode.asInt(0) == 1) { + return true; + } + } + + return false; + } + private ExtImpNativery parseImpExt(Imp imp) { try { final ExtPrebid ext = @@ -108,11 +122,13 @@ private ExtImpNativery parseImpExt(Imp imp) { } } - private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean isAmp, String widgetId) { - final ObjectNode extNode = mapper.mapper().convertValue(originalExt, ObjectNode.class); - final ObjectNode root = extNode != null ? extNode : mapper.mapper().createObjectNode(); + private ExtRequest buildRequestExtWithNativery(ObjectNode originalExt, boolean isAmp, String widgetId) { + final ObjectNode root = originalExt != null + ? originalExt.deepCopy() + : mapper.mapper().createObjectNode(); final ObjectNode nativeryNode = root.with("nativery"); + nativeryNode.put("isAmp", isAmp); if (widgetId != null) { nativeryNode.put("widgetId", widgetId); @@ -121,19 +137,6 @@ private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean i return mapper.mapper().convertValue(root, ExtRequest.class); } - private boolean isAmpRequest(BidRequest request) { - if (request.getSite() == null || request.getSite().getExt() == null) { - return false; - } - try { - final ExtSite extSite = mapper.mapper().convertValue(request.getSite().getExt(), ExtSite.class); - final Integer amp = extSite != null ? extSite.getAmp() : null; - return amp != null && amp == 1; - } catch (Exception e) { - return false; - } - } - @Override public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { final List errors = new ArrayList<>(); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java index dd21eb4909a..0dc07f48e94 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java @@ -29,8 +29,8 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps nativeryBidderDeps(BidderConfigurationProperties nativeryConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, - JacksonMapper mapper) { + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nativeryConfigurationProperties) diff --git a/src/main/resources/bidder-config/nativery.yaml b/src/main/resources/bidder-config/nativery.yaml index 4c24d560ca5..e37bc8dcd4d 100644 --- a/src/main/resources/bidder-config/nativery.yaml +++ b/src/main/resources/bidder-config/nativery.yaml @@ -8,5 +8,5 @@ adapters: - banner - video - native - supported-vendors: [] - vendor-id: 0 + supported-vendors: + vendor-id: 1133 diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 815f553db92..065d3de3caf 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -19,6 +19,7 @@ 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.ExtRequest; import org.prebid.server.proto.openrtb.ext.request.ExtSite; import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; import org.prebid.server.proto.openrtb.ext.response.BidType; @@ -128,6 +129,37 @@ public void makeHttpRequestsShouldSetExtWithWidgetId() { .containsOnly("widget1"); } + @Test + public void makeHttpRequestsShouldPreserveOriginalExtFields() { + // given + final ObjectNode extNode = mapper.createObjectNode(); + extNode.put("accountId", "acc-123"); + + final BidRequest bidRequest = givenBidRequest( + requestBuilder -> { + try { + return requestBuilder.ext( + mapper.readValue(mapper.writeValueAsString(extNode), ExtRequest.class) + ); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + }, + UnaryOperator.identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + + final ObjectNode resultingExt = mapper.convertValue( + result.getValue().get(0).getPayload().getExt(), ObjectNode.class); + + assertThat(resultingExt.path("accountId").asText()).isEqualTo("acc-123"); + assertThat(resultingExt.path("nativery").path("widgetId").asText()).isEqualTo("widget1"); + } + @Test public void makeHttpRequestsShouldSetExtWithAmpTrue() { // given @@ -169,7 +201,7 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() { } @Test - public void makeHttpRequestsShouldSetDefaultCurrency() { + public void makeHttpRequestsShouldNotSetCurrencyIfNotProvided() { // given final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); @@ -181,8 +213,7 @@ public void makeHttpRequestsShouldSetDefaultCurrency() { assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .extracting(BidRequest::getCur) - .extracting(currencies -> currencies.get(0)) - .containsOnly(DEFAULT_CURRENCY); + .allSatisfy(cur -> assertThat(cur).isNull()); } @Test From f92d15ffb268752769485b99d29f155e870f6928 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Sat, 11 Oct 2025 12:01:49 +0200 Subject: [PATCH 03/11] fix test --- .../server/it/openrtb2/nativery/test-nativery-bid-request.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json index c412a8198ce..1a5e555fc90 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nativery/test-nativery-bid-request.json @@ -33,7 +33,7 @@ "at": 1, "tmax": "${json-unit.any-number}", "cur": [ - "EUR" + "USD" ], "source": { "tid": "${json-unit.any-string}" From a9e734fd4eead9cc0d1f3059c0dbdda492009319 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Wed, 22 Oct 2025 15:27:12 +0200 Subject: [PATCH 04/11] fix comments --- .../bidder/nativery/NativeryBidder.java | 90 ++++++++----------- .../ext/request/nativery/BidExtNativery.java | 16 ++++ .../bidder/nativery/NativeryBidderTest.java | 29 ++++-- 3 files changed, 71 insertions(+), 64 deletions(-) create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index c07e5ea8815..e18f41015bb 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -11,6 +11,7 @@ import io.vertx.core.MultiMap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.prebid.server.auction.model.Endpoint; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; @@ -22,6 +23,9 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.ExtRequest; +import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid; +import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidServer; +import org.prebid.server.proto.openrtb.ext.request.nativery.BidExtNativery; import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; @@ -61,7 +65,8 @@ public Result>> makeHttpRequests(BidRequest request final List> httpRequests = new ArrayList<>(); final List errors = new ArrayList<>(); - final boolean isAmp = isAmpRequest(request); + final String requestEndpointName = extractEndpointName(request); + final boolean isAmp = StringUtils.equals(requestEndpointName, Endpoint.openrtb2_amp.value()); final List validImps = new ArrayList<>(); String widgetId = null; @@ -79,19 +84,15 @@ public Result>> makeHttpRequests(BidRequest request } if (validImps.isEmpty()) { - return Result.of(Collections.emptyList(), errors); + return Result.withErrors(errors); } - // 🟢 Zmienione — zamieniamy ExtRequest na ObjectNode - final ObjectNode originalExt = request.getExt() != null - ? mapper.mapper().convertValue(request.getExt(), ObjectNode.class) - : null; - final ExtRequest updatedExt = buildRequestExtWithNativery(originalExt, isAmp, widgetId); + final ExtRequest updatedExt = buildRequestExtWithNativery(request.getExt(), isAmp, widgetId); for (Imp imp : validImps) { final BidRequest singleImpRequest = request.toBuilder() .imp(Collections.singletonList(imp)) - .ext(updatedExt) // ✅ teraz typ się zgadza + .ext(updatedExt) .build(); httpRequests.add(BidderUtil.defaultRequest(singleImpRequest, endpointUrl, mapper)); @@ -100,41 +101,32 @@ public Result>> makeHttpRequests(BidRequest request return Result.of(httpRequests, errors); } - private boolean isAmpRequest(BidRequest request) { - if (request.getSite() != null && request.getSite().getExt() != null) { - final JsonNode siteExt = mapper.mapper().valueToTree(request.getSite().getExt()); - final JsonNode ampNode = siteExt.get("amp"); - if (ampNode != null && ampNode.asInt(0) == 1) { - return true; - } - } - - return false; + private static String extractEndpointName(BidRequest bidRequest) { + final ExtRequest requestExt = bidRequest.getExt(); + final ExtRequestPrebid prebid = requestExt != null ? requestExt.getPrebid() : null; + final ExtRequestPrebidServer server = prebid != null ? prebid.getServer() : null; + return server != null ? server.getEndpoint() : null; } private ExtImpNativery parseImpExt(Imp imp) { try { - final ExtPrebid ext = - mapper.mapper().convertValue(imp.getExt(), NATIVERY_EXT_TYPE_REFERENCE); - return ext != null ? ext.getBidder() : null; + return mapper.mapper().convertValue(imp.getExt(), NATIVERY_EXT_TYPE_REFERENCE).getBidder(); } catch (IllegalArgumentException e) { - throw new PreBidException(e.getMessage()); + throw new PreBidException("Failed to deserialize Nativery extension: " + e.getMessage()); } } - private ExtRequest buildRequestExtWithNativery(ObjectNode originalExt, boolean isAmp, String widgetId) { - final ObjectNode root = originalExt != null - ? originalExt.deepCopy() - : mapper.mapper().createObjectNode(); - - final ObjectNode nativeryNode = root.with("nativery"); + private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean isAmp, String widgetId) { + final ExtRequest ext = originalExt != null ? originalExt : ExtRequest.empty(); + final ObjectNode nativeryNode = mapper.mapper().createObjectNode(); nativeryNode.put("isAmp", isAmp); - if (widgetId != null) { + if (StringUtils.isNotBlank(widgetId)) { nativeryNode.put("widgetId", widgetId); } - return mapper.mapper().convertValue(root, ExtRequest.class); + ext.addProperty("nativery", nativeryNode); + return ext; } @Override @@ -179,11 +171,14 @@ private List extractBids(BidResponse bidResponse, List e private BidderBid resolveBidderBid(Bid bid, String currency, List errors) { try { - final ObjectNode nativeryExt = extractNativeryExt(bid.getExt()); - final String mediaTypeRaw = getText(nativeryExt, "bid_ad_media_type"); + final BidExtNativery nativeryExt = parseNativeryExt(bid.getExt()); + final String mediaTypeRaw = nativeryExt != null ? nativeryExt.getBidAdMediaType() : null; final BidType bidType = mapMediaType(mediaTypeRaw); - final List advDomains = readStringArray(nativeryExt, "bid_adv_domains"); + final List advDomains = nativeryExt != null && nativeryExt.getBidAdvDomains() != null + ? nativeryExt.getBidAdvDomains() + : Collections.emptyList(); + final Bid updatedBid = addBidMeta(bid, mediaTypeString(bidType), advDomains); return BidderBid.of(updatedBid, bidType, currency); @@ -193,7 +188,7 @@ private BidderBid resolveBidderBid(Bid bid, String currency, List e } } - private ObjectNode extractNativeryExt(ObjectNode bidExt) { + private BidExtNativery parseNativeryExt(ObjectNode bidExt) { if (bidExt == null) { throw new PreBidException("missing bid.ext"); } @@ -201,26 +196,11 @@ private ObjectNode extractNativeryExt(ObjectNode bidExt) { if (!(node instanceof ObjectNode nativeryNode)) { throw new PreBidException("missing bid.ext.nativery"); } - return nativeryNode; - } - - private static String getText(ObjectNode node, String field) { - final JsonNode v = node.get(field); - return v != null && v.isTextual() ? v.asText() : null; - } - - private static List readStringArray(ObjectNode node, String field) { - final JsonNode arr = node.get(field); - if (arr == null || !arr.isArray()) { - return Collections.emptyList(); + try { + return mapper.mapper().convertValue(nativeryNode, BidExtNativery.class); + } catch (IllegalArgumentException e) { + throw new PreBidException("invalid bid.ext.nativery: " + e.getMessage()); } - final List out = new ArrayList<>(); - arr.forEach(e -> { - if (e != null && e.isTextual()) { - out.add(e.asText()); - } - }); - return out; } private static BidType mapMediaType(String mediaType) { @@ -239,7 +219,7 @@ private static String mediaTypeString(BidType type) { case banner -> "banner"; case video -> "video"; case xNative -> "native"; - default -> throw new IllegalStateException("Unexpected value: " + type); + default -> throw new IllegalStateException("Unexpected value: " + type.getName()); }; } @@ -268,7 +248,7 @@ private ExtBidPrebid parseExtBidPrebid(Bid bid) { .convertValue(bid.getExt(), EXT_PREBID_TYPE_REFERENCE) .getPrebid(); } catch (IllegalArgumentException e) { - return null; + throw new PreBidException("Failed to deserialize Prebid extension: " + e.getMessage()); } } } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java new file mode 100644 index 00000000000..842853c2730 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java @@ -0,0 +1,16 @@ +package org.prebid.server.proto.openrtb.ext.request.nativery; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Value; + +import java.util.List; + +@Value(staticConstructor = "of") +public class BidExtNativery { + + @JsonProperty("bid_ad_media_type") + String bidAdMediaType; + + @JsonProperty("bid_adv_domains") + List bidAdvDomains; +} diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 065d3de3caf..68800132ef5 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -5,13 +5,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; -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 io.vertx.core.MultiMap; import org.junit.jupiter.api.Test; import org.prebid.server.VertxTest; +import org.prebid.server.auction.model.Endpoint; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; import org.prebid.server.bidder.model.BidderError; @@ -20,7 +20,6 @@ import org.prebid.server.bidder.model.Result; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.ExtRequest; -import org.prebid.server.proto.openrtb.ext.request.ExtSite; import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; @@ -124,8 +123,7 @@ public void makeHttpRequestsShouldSetExtWithWidgetId() { assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .extracting(BidRequest::getExt) - .extracting(ext -> mapper.convertValue(ext, ObjectNode.class) - .path("nativery").path("widgetId").asText()) + .extracting(ext -> ext.getProperty("nativery").path("widgetId").asText()) .containsOnly("widget1"); } @@ -163,9 +161,22 @@ public void makeHttpRequestsShouldPreserveOriginalExtFields() { @Test public void makeHttpRequestsShouldSetExtWithAmpTrue() { // given - final ExtSite extSite = ExtSite.of(1, null); + final ObjectNode extNode = mapper.createObjectNode(); + final ObjectNode prebidNode = mapper.createObjectNode(); + final ObjectNode serverNode = mapper.createObjectNode(); + serverNode.put("endpoint", Endpoint.openrtb2_amp.value()); + prebidNode.set("server", serverNode); + extNode.set("prebid", prebidNode); final BidRequest bidRequest = givenBidRequest( - requestBuilder -> requestBuilder.site(Site.builder().ext(extSite).build()), + requestBuilder -> { + try { + return requestBuilder.ext( + mapper.readValue(mapper.writeValueAsString(extNode), ExtRequest.class) + ); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + }, UnaryOperator.identity()); // when @@ -176,8 +187,7 @@ public void makeHttpRequestsShouldSetExtWithAmpTrue() { assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .extracting(BidRequest::getExt) - .extracting(ext -> mapper.convertValue(ext, ObjectNode.class) - .path("nativery").path("isAmp").asBoolean()) + .extracting(ext -> ext.getProperty("nativery").path("isAmp").asBoolean()) .containsOnly(true); } @@ -194,7 +204,8 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() { assertThat(result.getErrors()) .hasSize(1) .allSatisfy(error -> { - assertThat(error.getMessage()).startsWith("Cannot deserialize"); + assertThat(error.getMessage()) + .startsWith("Failed to deserialize Nativery extension:"); assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); }); assertThat(result.getValue()).isEmpty(); From 3a979e6977adf00a1e76206371741aa602d8a881 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 28 Oct 2025 16:37:37 +0100 Subject: [PATCH 05/11] fix comments --- .../bidder/nativery/NativeryBidder.java | 52 ++++++++++--------- .../bidder/nativery/NativeryBidderTest.java | 51 ------------------ 2 files changed, 28 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index e18f41015bb..6739efe8f02 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -8,8 +8,8 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -import io.vertx.core.MultiMap; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.prebid.server.auction.model.Endpoint; import org.prebid.server.bidder.Bidder; @@ -38,6 +38,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.Optional; public class NativeryBidder implements Bidder { @@ -119,7 +120,11 @@ private ExtImpNativery parseImpExt(Imp imp) { private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean isAmp, String widgetId) { final ExtRequest ext = originalExt != null ? originalExt : ExtRequest.empty(); - final ObjectNode nativeryNode = mapper.mapper().createObjectNode(); + final JsonNode existing = ext.getProperty("nativery"); + final ObjectNode nativeryNode = existing != null && existing.isObject() + ? (ObjectNode) existing + : mapper.mapper().createObjectNode(); + nativeryNode.put("isAmp", isAmp); if (StringUtils.isNotBlank(widgetId)) { nativeryNode.put("widgetId", widgetId); @@ -133,17 +138,13 @@ private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean i public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { final List errors = new ArrayList<>(); - if (httpCall.getResponse() != null && httpCall.getResponse().getStatusCode() == 204) { - final MultiMap headers = httpCall.getResponse().getHeaders(); - final String nativeryErr = headers != null ? headers.get(NATIVERY_ERROR_HEADER) : null; - if (StringUtils.isNotBlank(nativeryErr)) { - return Result.withError(BidderError.badInput("Nativery Error: " + nativeryErr + ".")); - } - return Result.withError(BidderError.badServerResponse("No Content")); + final var response = httpCall.getResponse(); + if (response == null || StringUtils.isBlank(response.getBody())) { + return Result.withError(BidderError.badServerResponse("Empty response")); } try { - final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + final BidResponse bidResponse = mapper.decodeValue(response.getBody(), BidResponse.class); final List bidderBids = extractBids(bidResponse, errors); return Result.of(bidderBids, errors); } catch (DecodeException e) { @@ -172,15 +173,12 @@ private List extractBids(BidResponse bidResponse, List e private BidderBid resolveBidderBid(Bid bid, String currency, List errors) { try { final BidExtNativery nativeryExt = parseNativeryExt(bid.getExt()); - final String mediaTypeRaw = nativeryExt != null ? nativeryExt.getBidAdMediaType() : null; - final BidType bidType = mapMediaType(mediaTypeRaw); - final List advDomains = nativeryExt != null && nativeryExt.getBidAdvDomains() != null - ? nativeryExt.getBidAdvDomains() - : Collections.emptyList(); + final BidType bidType = mapMediaType(nativeryExt.getBidAdMediaType()); + final List advDomains = ListUtils.defaultIfNull( + nativeryExt.getBidAdvDomains(), Collections.emptyList()); final Bid updatedBid = addBidMeta(bid, mediaTypeString(bidType), advDomains); - return BidderBid.of(updatedBid, bidType, currency); } catch (PreBidException e) { errors.add(BidderError.badInput(e.getMessage())); @@ -216,9 +214,9 @@ private static BidType mapMediaType(String mediaType) { private static String mediaTypeString(BidType type) { return switch (type) { - case banner -> "banner"; - case video -> "video"; - case xNative -> "native"; + case banner -> type.getName(); + case video -> type.getName(); + case xNative -> type.getName(); default -> throw new IllegalStateException("Unexpected value: " + type.getName()); }; } @@ -226,14 +224,20 @@ private static String mediaTypeString(BidType type) { private Bid addBidMeta(Bid bid, String mediaType, List advDomains) { final ExtBidPrebid prebid = parseExtBidPrebid(bid); - final ExtBidPrebidMeta modifiedMeta = (prebid != null && prebid.getMeta() != null - ? prebid.getMeta().toBuilder() - : ExtBidPrebidMeta.builder()) + final List safeAdvDomains = Optional.ofNullable(advDomains) + .orElse(Collections.emptyList()); + + final ExtBidPrebidMeta modifiedMeta = Optional.ofNullable(prebid) + .map(ExtBidPrebid::getMeta) + .map(ExtBidPrebidMeta::toBuilder) + .orElseGet(ExtBidPrebidMeta::builder) .mediaType(mediaType) - .advertiserDomains(advDomains) + .advertiserDomains(safeAdvDomains) .build(); - final ExtBidPrebid modifiedPrebid = (prebid != null ? prebid.toBuilder() : ExtBidPrebid.builder()) + final ExtBidPrebid modifiedPrebid = Optional.ofNullable(prebid) + .map(ExtBidPrebid::toBuilder) + .orElseGet(ExtBidPrebid::builder) .meta(modifiedMeta) .build(); diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 68800132ef5..fde9f50aab5 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -211,22 +211,6 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() { assertThat(result.getValue()).isEmpty(); } - @Test - public void makeHttpRequestsShouldNotSetCurrencyIfNotProvided() { - // given - final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity()); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(HttpRequest::getPayload) - .extracting(BidRequest::getCur) - .allSatisfy(cur -> assertThat(cur).isNull()); - } - @Test public void makeHttpRequestsShouldReturnExpectedHeaders() { // given @@ -245,41 +229,6 @@ public void makeHttpRequestsShouldReturnExpectedHeaders() { assertThat(result.getErrors()).isEmpty(); } - @Test - public void makeBidsShouldReturnErrorWhenStatusIs204WithErrorHeader() { - // given - final BidderCall httpCall = - givenHttpCallWithHeaders(204, Map.of(NATIVERY_ERROR_HEADER, "test error")); - - // when - final Result> result = target.makeBids(httpCall, null); - - // then - assertThat(result.getValue()).isEmpty(); - assertThat(result.getErrors()).hasSize(1) - .allSatisfy(error -> { - assertThat(error.getMessage()).isEqualTo("Nativery Error: test error."); - assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); - }); - } - - @Test - public void makeBidsShouldReturnErrorWhenStatusIs204WithoutErrorHeader() { - // given - final BidderCall httpCall = givenHttpCallWithHeaders(204, null); - - // when - final Result> result = target.makeBids(httpCall, null); - - // then - assertThat(result.getValue()).isEmpty(); - assertThat(result.getErrors()).hasSize(1) - .allSatisfy(error -> { - assertThat(error.getMessage()).isEqualTo("No Content"); - assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); - }); - } - @Test public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { // given From 94a24ca2de1deeafd9cb60b975d8d74fc5b0a989 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Mon, 3 Nov 2025 15:47:20 +0100 Subject: [PATCH 06/11] fix comments --- .../bidder/nativery/NativeryBidder.java | 24 ++-------- .../ext/request/nativery/BidExtNativery.java | 3 -- .../bidder/nativery/NativeryBidderTest.java | 47 ++++--------------- 3 files changed, 14 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index 6739efe8f02..dea708981a5 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -51,7 +51,6 @@ public class NativeryBidder implements Bidder { }; private static final String DEFAULT_CURRENCY = "EUR"; - private static final String NATIVERY_ERROR_HEADER = "X-Nativery-Error"; private final String endpointUrl; private final JacksonMapper mapper; @@ -139,9 +138,6 @@ public Result> makeBids(BidderCall httpCall, BidRequ final List errors = new ArrayList<>(); final var response = httpCall.getResponse(); - if (response == null || StringUtils.isBlank(response.getBody())) { - return Result.withError(BidderError.badServerResponse("Empty response")); - } try { final BidResponse bidResponse = mapper.decodeValue(response.getBody(), BidResponse.class); @@ -175,10 +171,10 @@ private BidderBid resolveBidderBid(Bid bid, String currency, List e final BidExtNativery nativeryExt = parseNativeryExt(bid.getExt()); final BidType bidType = mapMediaType(nativeryExt.getBidAdMediaType()); - final List advDomains = ListUtils.defaultIfNull( - nativeryExt.getBidAdvDomains(), Collections.emptyList()); + final List advDomains = ListUtils.emptyIfNull( + nativeryExt.getBidAdvDomains()); - final Bid updatedBid = addBidMeta(bid, mediaTypeString(bidType), advDomains); + final Bid updatedBid = addBidMeta(bid, bidType.getName(), advDomains); return BidderBid.of(updatedBid, bidType, currency); } catch (PreBidException e) { errors.add(BidderError.badInput(e.getMessage())); @@ -212,27 +208,15 @@ private static BidType mapMediaType(String mediaType) { }; } - private static String mediaTypeString(BidType type) { - return switch (type) { - case banner -> type.getName(); - case video -> type.getName(); - case xNative -> type.getName(); - default -> throw new IllegalStateException("Unexpected value: " + type.getName()); - }; - } - private Bid addBidMeta(Bid bid, String mediaType, List advDomains) { final ExtBidPrebid prebid = parseExtBidPrebid(bid); - final List safeAdvDomains = Optional.ofNullable(advDomains) - .orElse(Collections.emptyList()); - final ExtBidPrebidMeta modifiedMeta = Optional.ofNullable(prebid) .map(ExtBidPrebid::getMeta) .map(ExtBidPrebidMeta::toBuilder) .orElseGet(ExtBidPrebidMeta::builder) .mediaType(mediaType) - .advertiserDomains(safeAdvDomains) + .advertiserDomains(advDomains) .build(); final ExtBidPrebid modifiedPrebid = Optional.ofNullable(prebid) diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java index 842853c2730..3c7ee391327 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nativery/BidExtNativery.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request.nativery; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Value; import java.util.List; @@ -8,9 +7,7 @@ @Value(staticConstructor = "of") public class BidExtNativery { - @JsonProperty("bid_ad_media_type") String bidAdMediaType; - @JsonProperty("bid_adv_domains") List bidAdvDomains; } diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index fde9f50aab5..6e32a55b18c 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -8,7 +8,6 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -import io.vertx.core.MultiMap; import org.junit.jupiter.api.Test; import org.prebid.server.VertxTest; import org.prebid.server.auction.model.Endpoint; @@ -42,7 +41,6 @@ public class NativeryBidderTest extends VertxTest { private static final String ENDPOINT_URL = "https://test.com/test"; private static final String DEFAULT_CURRENCY = "EUR"; - private static final String NATIVERY_ERROR_HEADER = "X-Nativery-Error"; private final NativeryBidder target = new NativeryBidder(ENDPOINT_URL, jacksonMapper); @@ -130,19 +128,11 @@ public void makeHttpRequestsShouldSetExtWithWidgetId() { @Test public void makeHttpRequestsShouldPreserveOriginalExtFields() { // given - final ObjectNode extNode = mapper.createObjectNode(); - extNode.put("accountId", "acc-123"); + final ExtRequest extRequest = ExtRequest.empty(); + extRequest.addProperty("accountId", mapper.convertValue("acc-123", JsonNode.class)); final BidRequest bidRequest = givenBidRequest( - requestBuilder -> { - try { - return requestBuilder.ext( - mapper.readValue(mapper.writeValueAsString(extNode), ExtRequest.class) - ); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - }, + requestBuilder -> requestBuilder.ext(extRequest), UnaryOperator.identity()); // when @@ -161,22 +151,17 @@ public void makeHttpRequestsShouldPreserveOriginalExtFields() { @Test public void makeHttpRequestsShouldSetExtWithAmpTrue() { // given - final ObjectNode extNode = mapper.createObjectNode(); - final ObjectNode prebidNode = mapper.createObjectNode(); + final ExtRequest extRequest = ExtRequest.empty(); + final ObjectNode serverNode = mapper.createObjectNode(); serverNode.put("endpoint", Endpoint.openrtb2_amp.value()); + + final ObjectNode prebidNode = mapper.createObjectNode(); prebidNode.set("server", serverNode); - extNode.set("prebid", prebidNode); + + extRequest.addProperty("prebid", prebidNode); final BidRequest bidRequest = givenBidRequest( - requestBuilder -> { - try { - return requestBuilder.ext( - mapper.readValue(mapper.writeValueAsString(extNode), ExtRequest.class) - ); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - }, + requestBuilder -> requestBuilder.ext(extRequest), UnaryOperator.identity()); // when @@ -453,17 +438,5 @@ private static BidderCall givenHttpCall(String body) { HttpResponse.of(200, null, body), null); } - - private static BidderCall givenHttpCallWithHeaders(int statusCode, Map headers) { - final MultiMap multiMap = MultiMap.caseInsensitiveMultiMap(); - if (headers != null) { - headers.forEach(multiMap::add); - } - - return BidderCall.succeededHttp( - HttpRequest.builder().payload(null).build(), - HttpResponse.of(statusCode, multiMap, null), - null); - } } From 1165db7f799bc507306ef48c08b6114b3855b196 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 4 Nov 2025 11:25:17 +0100 Subject: [PATCH 07/11] fix test makeHttpRequestsShouldSetExtWithAmpTrue --- .../prebid/server/bidder/nativery/NativeryBidderTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 6e32a55b18c..5dc9752e698 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -151,15 +151,17 @@ public void makeHttpRequestsShouldPreserveOriginalExtFields() { @Test public void makeHttpRequestsShouldSetExtWithAmpTrue() { // given - final ExtRequest extRequest = ExtRequest.empty(); - final ObjectNode serverNode = mapper.createObjectNode(); serverNode.put("endpoint", Endpoint.openrtb2_amp.value()); final ObjectNode prebidNode = mapper.createObjectNode(); prebidNode.set("server", serverNode); - extRequest.addProperty("prebid", prebidNode); + final ObjectNode extNode = mapper.createObjectNode(); + extNode.set("prebid", prebidNode); + + final ExtRequest extRequest = mapper.convertValue(extNode, ExtRequest.class); + final BidRequest bidRequest = givenBidRequest( requestBuilder -> requestBuilder.ext(extRequest), UnaryOperator.identity()); From 869eca1a050e2ee25a18b95787894dbe253b5d70 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Thu, 6 Nov 2025 17:12:19 +0100 Subject: [PATCH 08/11] fix comments --- .../bidder/nativery/NativeryBidder.java | 36 +++--- .../bidder/nativery/NativeryBidderTest.java | 118 +++++++++++------- 2 files changed, 93 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index dea708981a5..71cda9d5211 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -17,6 +17,7 @@ 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.exception.PreBidException; import org.prebid.server.json.DecodeException; @@ -102,10 +103,12 @@ public Result>> makeHttpRequests(BidRequest request } private static String extractEndpointName(BidRequest bidRequest) { - final ExtRequest requestExt = bidRequest.getExt(); - final ExtRequestPrebid prebid = requestExt != null ? requestExt.getPrebid() : null; - final ExtRequestPrebidServer server = prebid != null ? prebid.getServer() : null; - return server != null ? server.getEndpoint() : null; + return Optional.ofNullable(bidRequest) + .map(BidRequest::getExt) + .map(ExtRequest::getPrebid) + .map(ExtRequestPrebid::getServer) + .map(ExtRequestPrebidServer::getEndpoint) + .orElse(null); } private ExtImpNativery parseImpExt(Imp imp) { @@ -137,7 +140,7 @@ private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean i public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { final List errors = new ArrayList<>(); - final var response = httpCall.getResponse(); + final HttpResponse response = httpCall.getResponse(); try { final BidResponse bidResponse = mapper.decodeValue(response.getBody(), BidResponse.class); @@ -183,18 +186,17 @@ private BidderBid resolveBidderBid(Bid bid, String currency, List e } private BidExtNativery parseNativeryExt(ObjectNode bidExt) { - if (bidExt == null) { - throw new PreBidException("missing bid.ext"); - } - final JsonNode node = bidExt.get("nativery"); - if (!(node instanceof ObjectNode nativeryNode)) { - throw new PreBidException("missing bid.ext.nativery"); - } - try { - return mapper.mapper().convertValue(nativeryNode, BidExtNativery.class); - } catch (IllegalArgumentException e) { - throw new PreBidException("invalid bid.ext.nativery: " + e.getMessage()); - } + return Optional.of(bidExt) + .map(ext -> ext.get("nativery")) + .filter(JsonNode::isObject) + .map(node -> { + try { + return mapper.mapper().convertValue(node, BidExtNativery.class); + } catch (IllegalArgumentException e) { + throw new PreBidException("invalid bid.ext.nativery: " + e.getMessage()); + } + }) + .orElseThrow(() -> new PreBidException("missing bid.ext.nativery")); } private static BidType mapMediaType(String mediaType) { diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 5dc9752e698..23a6dad241c 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import com.iab.openrtb.response.Bid; @@ -19,6 +19,8 @@ import org.prebid.server.bidder.model.Result; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.ExtRequest; +import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid; +import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidServer; import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; @@ -76,23 +78,6 @@ public void makeHttpRequestsShouldMakeOneRequestPerImp() { .containsExactlyInAnyOrder("123", "321"); } - @Test - public void makeHttpRequestsShouldIncludeImpIds() { - // given - final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder.id("imp1")); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(HttpRequest::getPayload) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getId) - .containsExactly("imp1"); - } - @Test public void makeHttpRequestsShouldUseCorrectUri() { // given @@ -129,8 +114,7 @@ public void makeHttpRequestsShouldSetExtWithWidgetId() { public void makeHttpRequestsShouldPreserveOriginalExtFields() { // given final ExtRequest extRequest = ExtRequest.empty(); - extRequest.addProperty("accountId", mapper.convertValue("acc-123", JsonNode.class)); - + extRequest.addProperty("accountId", TextNode.valueOf("acc-123")); final BidRequest bidRequest = givenBidRequest( requestBuilder -> requestBuilder.ext(extRequest), UnaryOperator.identity()); @@ -141,26 +125,22 @@ public void makeHttpRequestsShouldPreserveOriginalExtFields() { // then assertThat(result.getErrors()).isEmpty(); - final ObjectNode resultingExt = mapper.convertValue( - result.getValue().get(0).getPayload().getExt(), ObjectNode.class); + final ExtRequest resultingExt = result.getValue().get(0).getPayload().getExt(); - assertThat(resultingExt.path("accountId").asText()).isEqualTo("acc-123"); - assertThat(resultingExt.path("nativery").path("widgetId").asText()).isEqualTo("widget1"); + assertThat(resultingExt.getProperty("accountId").asText()).isEqualTo("acc-123"); + assertThat(resultingExt.getProperty("nativery").path("widgetId").asText()).isEqualTo("widget1"); } @Test public void makeHttpRequestsShouldSetExtWithAmpTrue() { // given - final ObjectNode serverNode = mapper.createObjectNode(); - serverNode.put("endpoint", Endpoint.openrtb2_amp.value()); - - final ObjectNode prebidNode = mapper.createObjectNode(); - prebidNode.set("server", serverNode); - - final ObjectNode extNode = mapper.createObjectNode(); - extNode.set("prebid", prebidNode); + final ExtRequestPrebidServer server = ExtRequestPrebidServer.of( + null, null, null, Endpoint.openrtb2_amp.value()); + final ExtRequestPrebid prebid = ExtRequestPrebid.builder() + .server(server) + .build(); - final ExtRequest extRequest = mapper.convertValue(extNode, ExtRequest.class); + final ExtRequest extRequest = ExtRequest.of(prebid); final BidRequest bidRequest = givenBidRequest( requestBuilder -> requestBuilder.ext(extRequest), @@ -278,6 +258,42 @@ public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { .containsExactly(BidType.banner); } + @Test + public void makeBidsShouldReturnBannerBidForDisplayType() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "display")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.banner); + } + + @Test + public void makeBidsShouldReturnBannerBidForRichMediaType() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + givenBidResponse(bidBuilder -> bidBuilder + .impid("123") + .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "rich_media")))))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.banner); + } + @Test public void makeBidsShouldReturnVideoBid() throws JsonProcessingException { // given @@ -302,28 +318,42 @@ public void makeBidsShouldReturnNativeBid() throws JsonProcessingException { final BidderCall httpCall = givenHttpCall( givenBidResponse(bidBuilder -> bidBuilder .impid("123") - .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "native")))))); + .ext(mapper.valueToTree(Map.of( + "nativery", Map.of("bid_ad_media_type", "native")))))); // when final Result> result = target.makeBids(httpCall, null); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(BidderBid::getType) - .containsExactly(BidType.xNative); + assertThat(result.getValue()).hasSize(1); + + final BidderBid bidderBid = result.getValue().get(0); + assertThat(bidderBid.getType()).isEqualTo(BidType.xNative); + assertThat(bidderBid.getBidCurrency()).isEqualTo("EUR"); + + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("native"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").size()).isEqualTo(0); + + assertThat(bid.getExt().has("nativery")).isFalse(); } @Test public void makeBidsShouldHandleUnsupportedBidType() throws JsonProcessingException { // given - final ObjectNode bidExtNativery = mapper.createObjectNode().put("bid_ad_media_type", "audio"); - final ObjectNode bidExt = mapper.createObjectNode() - .putPOJO("prebid", ExtBidPrebid.builder().type(audio).build()) - .set("nativery", bidExtNativery); - final BidderCall httpCall = givenHttpCall( - givenBidResponse(bidBuilder -> bidBuilder.ext(bidExt).impid("123"))); + givenBidResponse(b -> b + .ext(mapper.valueToTree(Map.of( + "prebid", ExtBidPrebid.builder().type(audio).build(), + "nativery", Map.of("bid_ad_media_type", "audio") + ))) + .impid("123")) + ); // when final Result> result = target.makeBids(httpCall, null); @@ -334,7 +364,7 @@ public void makeBidsShouldHandleUnsupportedBidType() throws JsonProcessingExcept .hasSize(1) .allSatisfy(error -> { assertThat(error.getMessage()) - .contains("unrecognized bid_ad_media_type in response from nativery: audio"); + .isEqualTo("unrecognized bid_ad_media_type in response from nativery: audio"); assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); }); } From b99820d51c55d2e44eca9a5b1e777aab7a4e9be4 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Sat, 8 Nov 2025 13:27:33 +0100 Subject: [PATCH 09/11] fix tests --- .../bidder/nativery/NativeryBidder.java | 18 ++++++++------- .../bidder/nativery/NativeryBidderTest.java | 23 ++++++++++++++++--- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java index 71cda9d5211..ef333e4d95c 100644 --- a/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java +++ b/src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java @@ -186,19 +186,21 @@ private BidderBid resolveBidderBid(Bid bid, String currency, List e } private BidExtNativery parseNativeryExt(ObjectNode bidExt) { - return Optional.of(bidExt) + return Optional.ofNullable(bidExt) .map(ext -> ext.get("nativery")) .filter(JsonNode::isObject) - .map(node -> { - try { - return mapper.mapper().convertValue(node, BidExtNativery.class); - } catch (IllegalArgumentException e) { - throw new PreBidException("invalid bid.ext.nativery: " + e.getMessage()); - } - }) + .map(this::toBidExtNativery) .orElseThrow(() -> new PreBidException("missing bid.ext.nativery")); } + private BidExtNativery toBidExtNativery(JsonNode node) { + try { + return mapper.mapper().convertValue(node, BidExtNativery.class); + } catch (IllegalArgumentException e) { + throw new PreBidException("invalid bid.ext.nativery: " + e.getMessage()); + } + } + private static BidType mapMediaType(String mediaType) { final String mt = StringUtils.defaultString(mediaType).toLowerCase(); return switch (mt) { diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 23a6dad241c..cd0f89d63ad 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.UnaryOperator; import static java.util.Arrays.asList; @@ -34,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; +import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.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; @@ -76,6 +78,9 @@ public void makeHttpRequestsShouldMakeOneRequestPerImp() { .flatExtracting(BidRequest::getImp) .extracting(Imp::getId) .containsExactlyInAnyOrder("123", "321"); + assertThat(result.getValue()).hasSize(2) + .extracting(HttpRequest::getImpIds) + .containsExactly(Set.of("123"), Set.of("321")); } @Test @@ -288,10 +293,22 @@ public void makeBidsShouldReturnBannerBidForRichMediaType() throws JsonProcessin final Result> result = target.makeBids(httpCall, null); // then + final Bid expectedBid = Bid.builder() + .impid("123") + .ext(mapper.valueToTree(ExtPrebid.of( + ExtBidPrebid.builder() + .meta(org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidMeta.builder() + .mediaType("banner") + .advertiserDomains(List.of()) + .build()) + .build(), + null))) + .build(); + + final BidderBid expected = BidderBid.of(expectedBid, banner, DEFAULT_CURRENCY); + assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(BidderBid::getType) - .containsExactly(BidType.banner); + assertThat(result.getValue()).containsExactly(expected); } @Test From b98d69afe696798bcac60889d2eb2a2f77366400 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Sat, 15 Nov 2025 09:49:45 +0100 Subject: [PATCH 10/11] fix comments --- .../bidder/nativery/NativeryBidderTest.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index cd0f89d63ad..2720d88925e 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -293,22 +293,20 @@ public void makeBidsShouldReturnBannerBidForRichMediaType() throws JsonProcessin final Result> result = target.makeBids(httpCall, null); // then - final Bid expectedBid = Bid.builder() - .impid("123") - .ext(mapper.valueToTree(ExtPrebid.of( - ExtBidPrebid.builder() - .meta(org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidMeta.builder() - .mediaType("banner") - .advertiserDomains(List.of()) - .build()) - .build(), - null))) - .build(); + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1); - final BidderBid expected = BidderBid.of(expectedBid, banner, DEFAULT_CURRENCY); + final BidderBid bidderBid = result.getValue().get(0); + assertThat(bidderBid.getType()).isEqualTo(banner); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()).containsExactly(expected); + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("banner"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").size()).isEqualTo(0); } @Test @@ -347,7 +345,7 @@ public void makeBidsShouldReturnNativeBid() throws JsonProcessingException { final BidderBid bidderBid = result.getValue().get(0); assertThat(bidderBid.getType()).isEqualTo(BidType.xNative); - assertThat(bidderBid.getBidCurrency()).isEqualTo("EUR"); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); final Bid bid = bidderBid.getBid(); assertThat(bid.getImpid()).isEqualTo("123"); From 0fd6721ca79f3fd99b110fbc5ccbbdf20f9a3cd3 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Mon, 17 Nov 2025 17:37:08 +0100 Subject: [PATCH 11/11] fix comments --- .../bidder/nativery/NativeryBidderTest.java | 82 ++++++++++++++----- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java index 2720d88925e..ffc0a8a1d9f 100644 --- a/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java @@ -251,16 +251,27 @@ public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { final BidderCall httpCall = givenHttpCall( givenBidResponse(bidBuilder -> bidBuilder .impid("123") - .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "banner")))))); + .ext(mapper.valueToTree(Map.of( + "nativery", Map.of("bid_ad_media_type", "banner")))))); // when final Result> result = target.makeBids(httpCall, null); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(BidderBid::getType) - .containsExactly(BidType.banner); + assertThat(result.getValue()).hasSize(1); + + final BidderBid bidderBid = result.getValue().get(0); + assertThat(bidderBid.getType()).isEqualTo(BidType.banner); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); + + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("banner"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").size()).isEqualTo(0); } @Test @@ -269,16 +280,27 @@ public void makeBidsShouldReturnBannerBidForDisplayType() throws JsonProcessingE final BidderCall httpCall = givenHttpCall( givenBidResponse(bidBuilder -> bidBuilder .impid("123") - .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "display")))))); + .ext(mapper.valueToTree(Map.of( + "nativery", Map.of("bid_ad_media_type", "display")))))); // when final Result> result = target.makeBids(httpCall, null); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(BidderBid::getType) - .containsExactly(BidType.banner); + assertThat(result.getValue()).hasSize(1); + + final BidderBid bidderBid = result.getValue().get(0); + assertThat(bidderBid.getType()).isEqualTo(BidType.banner); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); + + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("banner"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").size()).isEqualTo(0); } @Test @@ -315,16 +337,27 @@ public void makeBidsShouldReturnVideoBid() throws JsonProcessingException { final BidderCall httpCall = givenHttpCall( givenBidResponse(bidBuilder -> bidBuilder .impid("123") - .ext(mapper.valueToTree(Map.of("nativery", Map.of("bid_ad_media_type", "video")))))); + .ext(mapper.valueToTree(Map.of( + "nativery", Map.of("bid_ad_media_type", "video")))))); // when final Result> result = target.makeBids(httpCall, null); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(BidderBid::getType) - .containsExactly(BidType.video); + assertThat(result.getValue()).hasSize(1); + + final BidderBid bidderBid = result.getValue().get(0); + assertThat(bidderBid.getType()).isEqualTo(BidType.video); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); + + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("video"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").size()).isEqualTo(0); } @Test @@ -390,24 +423,31 @@ public void makeBidsShouldAddMetadataFromNativeryExt() throws JsonProcessingExce final BidderCall httpCall = givenHttpCall( givenBidResponse(bidBuilder -> bidBuilder .impid("123") - .ext(mapper.valueToTree(Map.of("nativery", - Map.of("bid_ad_media_type", "native", "bid_adv_domains", List.of("domain.com"))))))); + .ext(mapper.valueToTree(Map.of( + "nativery", Map.of( + "bid_ad_media_type", "native", + "bid_adv_domains", List.of("domain.com"))))))); // when final Result> result = target.makeBids(httpCall, null); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .hasSize(1); + assertThat(result.getValue()).hasSize(1); final BidderBid bidderBid = result.getValue().get(0); - final JsonNode extNode = bidderBid.getBid().getExt(); - final JsonNode metaNode = extNode.path("prebid").path("meta"); + assertThat(bidderBid.getType()).isEqualTo(BidType.xNative); + assertThat(bidderBid.getBidCurrency()).isEqualTo(DEFAULT_CURRENCY); - assertThat(metaNode.path("mediaType").asText()).isEqualTo("native"); - assertThat(metaNode.path("advertiserDomains").isArray()).isTrue(); - assertThat(metaNode.path("advertiserDomains").get(0).asText()).isEqualTo("domain.com"); + final Bid bid = bidderBid.getBid(); + assertThat(bid.getImpid()).isEqualTo("123"); + + final JsonNode prebidMeta = bid.getExt().path("prebid").path("meta"); + assertThat(prebidMeta.path("mediaType").asText()).isEqualTo("native"); + assertThat(prebidMeta.path("advertiserDomains").isArray()).isTrue(); + assertThat(prebidMeta.path("advertiserDomains").get(0).asText()).isEqualTo("domain.com"); + + assertThat(bid.getExt().has("nativery")).isFalse(); } @Test