From 69a8df9422877a2cc8b20785a1c662132a1ea10d Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Thu, 27 Mar 2025 13:02:18 +0100 Subject: [PATCH 01/10] New adapter: FeedAd (#3718) --- .../server/bidder/feedad/FeedAdBidder.java | 83 +++++++ .../ext/request/feedad/ExtImpFeedAd.java | 22 ++ .../feedad/ExtImpFeedAdSdkOptions.java | 29 +++ .../config/bidder/FeedAdConfiguration.java | 41 ++++ src/main/resources/bidder-config/feedad.yaml | 18 ++ .../static/bidder-params/feedad.json | 65 ++++++ .../bidder/feedad/FeedAdBidderTest.java | 206 ++++++++++++++++++ .../server/it/test-application.properties | 2 + 8 files changed, 466 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java create mode 100644 src/main/resources/bidder-config/feedad.yaml create mode 100644 src/main/resources/static/bidder-params/feedad.json create mode 100644 src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java diff --git a/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java new file mode 100644 index 00000000000..1269744fcc7 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java @@ -0,0 +1,83 @@ +package org.prebid.server.bidder.feedad; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; +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.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.json.DecodeException; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.BidderUtil; +import org.prebid.server.util.HttpUtil; + +public class FeedAdBidder implements Bidder { + private final String endpointUrl; + private final JacksonMapper mapper; + + private static final String OPENRTB_VERSION = "2.5"; + private static final String X_FA_PBS_ADAPTER_VERSION_HEADER = "X-FA-PBS-Adapter-Version"; + private static final String FEED_AD_ADAPTER_VERSION = "1.0.0"; + + public FeedAdBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = HttpUtil.validateUrl(endpointUrl); + this.mapper = Objects.requireNonNull(mapper); + } + + private MultiMap resolveHeaders(Device device) { + MultiMap headers = HttpUtil.headers() + .add(X_FA_PBS_ADAPTER_VERSION_HEADER, FEED_AD_ADAPTER_VERSION) + .add(HttpUtil.X_OPENRTB_VERSION_HEADER, OPENRTB_VERSION); + if (device != null) { + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6()); + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp()); + } + return headers; + } + + @Override + public Result>> makeHttpRequests(BidRequest bidRequest) { + MultiMap headers = resolveHeaders(bidRequest.getDevice()); + return Result.withValue(BidderUtil.defaultRequest(bidRequest, headers, endpointUrl, mapper)); + } + + @Override + public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + return Result.withValues(extractBids(bidResponse)); + } catch (DecodeException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private static List extractBids(BidResponse bidResponse) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + List bids = bidsFromResponse(bidResponse); + return bids; + } + + private static List bidsFromResponse(BidResponse bidResponse) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> BidderBid.of(bid, BidType.banner, bidResponse.getCur())) + .toList(); + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java new file mode 100644 index 00000000000..87bf513e413 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java @@ -0,0 +1,22 @@ +package org.prebid.server.proto.openrtb.ext.request.feedad; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Value; + +@Value +@AllArgsConstructor(staticName = "of") +public class ExtImpFeedAd { + + @JsonProperty("clientToken") + String clientToken; + + @JsonProperty("decoration") + String decoration; + + @JsonProperty("placementId") + String placementId; + + @JsonProperty("sdkOptions") + ExtImpFeedAdSdkOptions sdkOptions; +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java new file mode 100644 index 00000000000..f98db907bf7 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java @@ -0,0 +1,29 @@ +package org.prebid.server.proto.openrtb.ext.request.feedad; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Value; + +@Value +@AllArgsConstructor(staticName = "of") +public class ExtImpFeedAdSdkOptions { + + @JsonProperty("advertising_id") + String advertisingId; + + @JsonProperty("app_name") + String appName; + + @JsonProperty("bundle_id") + String bundleId; + + @JsonProperty("hybrid_app") + boolean hybridApp; + + @JsonProperty("hybrid_platform") + String hybridPlatform; + + @JsonProperty("limit_ad_tracking") + boolean limitAdTracking; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java new file mode 100644 index 00000000000..4f94877fe4d --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java @@ -0,0 +1,41 @@ +package org.prebid.server.spring.config.bidder; + +import jakarta.validation.constraints.NotBlank; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.feedad.FeedAdBidder; +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; + +@Configuration +@PropertySource(value = "classpath:/bidder-config/feedad.yaml", factory = YamlPropertySourceFactory.class) +public class FeedAdConfiguration { + + private static final String BIDDER_NAME = "feedad"; + + @Bean("feedadConfigurationProperties") + @ConfigurationProperties("adapters.feedad") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps feedadBidderDeps(BidderConfigurationProperties feedadConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(feedadConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new FeedAdBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/feedad.yaml b/src/main/resources/bidder-config/feedad.yaml new file mode 100644 index 00000000000..fbd8f58627d --- /dev/null +++ b/src/main/resources/bidder-config/feedad.yaml @@ -0,0 +1,18 @@ +adapters: + feedad: + endpoint: https://ortb.feedad.com/1/prebid/requests + endpoint-compression: gzip + modifying-vast-xml-allowed: true + meta-info: + maintainer-email: support@feedad.com + app-media-types: + - banner + site-media-types: + - banner + vendor-id: 781 + usersync: + cookie-family-name: feedad + iframe: + url: https://ortb.feedad.com/1/usersyncs/supply?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&gpp={{gpp}}&gpp_sid={{gpp_sid}}&us_privacy={{us_privacy}}&redirect={{redirect_url}} + support-cors: false + uid-macro: $UID diff --git a/src/main/resources/static/bidder-params/feedad.json b/src/main/resources/static/bidder-params/feedad.json new file mode 100644 index 00000000000..6049775e260 --- /dev/null +++ b/src/main/resources/static/bidder-params/feedad.json @@ -0,0 +1,65 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "FeedAd Adapter Params", + "description": "A schema which validates params accepted by the FeedAd adapter", + "properties": { + "clientToken": { + "description": "Your FeedAd client token. Check your FeedAd admin panel.", + "minLength": 1, + "type": "string" + }, + "decoration": { + "description": "A decoration to apply to the ad slot. See our documentation at https://docs.feedad.com/web/feed_ad/#decorations", + "type": "string" + }, + "placementId": { + "description": "A FeedAd placement ID of your choice", + "minLength": 1, + "pattern": "^(([a-z0-9])+[-_]?)+$", + "type": "string" + }, + "sdkOptions": { + "description": "Optional: Only required if you are using Prebid.JS in an app environment (aka hybrid app). See our documentation at https://docs.feedad.com/web/configuration/#hybrid-app-config-parameters", + "properties": { + "advertising_id": { + "type": "string", + "description": "Optional: The advertising id of the device or user (e.g. Apple IDFA, Google Advertising Client Id). We highly recommend setting this parameter to maximize your fill rate." + }, + "app_name": { + "type": "string", + "description": "The name of your app. This name will identify your app within the FeedAd admin dashboard." + }, + "bundle_id": { + "type": "string", + "description": "The unique package name or bundle id of your app." + }, + "hybrid_app": { + "type": "boolean", + "description": "Boolean indicating that the SDK is loaded within a hybrid app." + }, + "hybrid_platform": { + "description": "String identifying the device platform.", + "enum": [ + "", + "android", + "ios", + "windows" + ] + }, + "limit_ad_tracking": { + "type": "boolean", + "description": "Whether the app's user has limited ad tracking enabled." + } + }, + "type": [ + "object", + "null" + ] + } + }, + "required": [ + "clientToken", + "placementId" + ], + "type": "object" +} diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java new file mode 100644 index 00000000000..998e604f8c0 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -0,0 +1,206 @@ +package org.prebid.server.bidder.feedad; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.function.UnaryOperator; + +import static java.util.Collections.singletonList; +import static java.util.function.UnaryOperator.identity; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.tuple; +import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; +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.netty.handler.codec.http.HttpHeaderValues; +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.util.HttpUtil; + +public class FeedAdBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "https://randomurl.com"; + + private final FeedAdBidder target = new FeedAdBidder(ENDPOINT_URL, jacksonMapper); + + @Test + public void creationShouldFailOnInvalidEndpointUrl() { + assertThatIllegalArgumentException().isThrownBy(() -> new FeedAdBidder("invalid_url", jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldCreateExpectedUrl() { + // given + final BidRequest bidRequest = givenBidRequest(identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly("https://randomurl.com"); + } + + @Test + public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDevicePresent() { + // given + final BidRequest bidRequest = givenBidRequest( + bidRequestBuilder -> bidRequestBuilder + .device(Device.builder() + .ip("ip") + .ipv6("ipV6").build()), + Function.identity() + ); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple("X-FA-PBS-Adapter-Version", "1.0.0"), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ip"), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipV6"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5")); + } + + @Test + public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsNull() { + // given + final BidRequest bidRequest = givenBidRequest( + bidRequestBuilder -> bidRequestBuilder.device(null), + Function.identity() + ); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple("X-FA-PBS-Adapter-Version", "1.0.0"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5")); + } + + @Test + public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { + // given + final BidderCall httpCall = givenHttpCall(null, "invalid"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); + assertThat(error.getMessage()).startsWith("Failed to decode: Unrecognized token"); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + null, + mapper.writeValueAsString(givenBidResponse(impBuilder -> impBuilder.impid("123"))) + ); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(givenBid(), banner, null)); + } + + @Test + public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsEmpty() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + null, + 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 makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + null, + mapper.writeValueAsString(null)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + private static BidRequest givenBidRequest(UnaryOperator impCustomizer) { + return givenBidRequest(identity(), impCustomizer); + } + + private static BidRequest givenBidRequest( + Function bidRequestCustomizer, + Function impCustomizer) { + return bidRequestCustomizer.apply(BidRequest.builder() + .imp(singletonList(impCustomizer.apply(Imp.builder().id("123")).build()))) + .build(); + } + + private static BidResponse givenBidResponse(Function bidCustomizer) { + return BidResponse.builder() + .seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .build())) + .build(); + } + + private static Bid givenBid() { + return Bid.builder().impid("123").build(); + } + + private static BidderCall givenHttpCall(BidRequest bidRequest, String body) { + return BidderCall.succeededHttp( + HttpRequest.builder().payload(bidRequest).build(), + HttpResponse.of(200, null, body), + null); + } +} 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 ced0d8f2ad4..8d9a26ce2a2 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -215,6 +215,8 @@ adapters.escalax.endpoint=http://localhost:8090/escalax-exchange?k={{AccountID}} adapters.evolution.enabled=true adapters.evolution.endpoint=http://localhost:8090/evolution-exchange adapters.evtech.enabled=true +adapters.feedad.enabled=true +adapters.feedad.endpoint=http://localhost:8090/feedad-exchange adapters.flipp.enabled=true adapters.flipp.endpoint=http://localhost:8090/flipp-exchange adapters.audiencenetwork.enabled=true From 9e7f95fa1a5f47a99f70842757d27d6e2c332a63 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Thu, 27 Mar 2025 13:25:10 +0100 Subject: [PATCH 02/10] FeedAd integration test (#3718) --- .../java/org/prebid/server/it/FeedAdTest.java | 34 ++++++++++ .../feedad/test-auction-feedad-request.json | 40 ++++++++++++ .../feedad/test-auction-feedad-response.json | 41 ++++++++++++ .../feedad/test-feedad-bid-request.json | 65 +++++++++++++++++++ .../feedad/test-feedad-bid-response.json | 27 ++++++++ 5 files changed, 207 insertions(+) create mode 100644 src/test/java/org/prebid/server/it/FeedAdTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-response.json diff --git a/src/test/java/org/prebid/server/it/FeedAdTest.java b/src/test/java/org/prebid/server/it/FeedAdTest.java new file mode 100644 index 00000000000..4081b2f1a1e --- /dev/null +++ b/src/test/java/org/prebid/server/it/FeedAdTest.java @@ -0,0 +1,34 @@ +package org.prebid.server.it; + +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static java.util.Collections.singletonList; + +import com.github.tomakehurst.wiremock.client.WireMock; +import io.restassured.response.Response; + +import java.io.IOException; + +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.prebid.server.model.Endpoint; + +public class FeedAdTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromFeedAdBidder() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(WireMock.post(WireMock.urlPathEqualTo("/feedad-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/feedad/test-feedad-bid-request.json"))) + .willReturn(WireMock.aResponse().withBody(jsonFrom("openrtb2/feedad/test-feedad-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/feedad/test-auction-feedad-request.json", + Endpoint.openrtb2_auction); + + System.out.println(response.asString()); + + // then + assertJsonEquals("openrtb2/feedad/test-auction-feedad-response.json", response, + singletonList("feedad")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-request.json b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-request.json new file mode 100644 index 00000000000..a783a28b5b4 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-request.json @@ -0,0 +1,40 @@ +{ + "id": "some-request-id", + "imp": [ + { + "id": "some-impression-id1", + "tagid": "ogTAGID", + "banner": { + "w": 320, + "h": 50 + }, + "ext": { + "feedad": { + "clientToken": "some-client-token", + "placementId": "some-placement-id" + } + } + } + ], + "site": { + "page": "https://example.com", + "publisher": { + "id": "123456789" + } + }, + "user": { + "buyeruid": "awesome-user" + }, + "device": { + "ua": "test-user-agent", + "ip": "193.168.244.1", + "language": "en", + "dnt": 0 + }, + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json new file mode 100644 index 00000000000..a7e0a340207 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json @@ -0,0 +1,41 @@ +{ + "id": "some-request-id", + "seatbid": [ + { + "bid": [ + { + "id": "a3ae1b4e2fc24a4fb45540082e98e161", + "impid": "some-impression-id1", + "price": 3.5, + "adm": "awesome-markup", + "adomain": [ + "awesome.com" + ], + "crid": "20", + "w": 320, + "h": 50, + "exp": 300, + "mtype": 1, + "ext": { + "prebid": { + "type": "banner" + }, + "origbidcpm": 3.5 + } + } + ], + "seat": "feedad", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "feedad": "{{ feedad.response_time_ms }}" + }, + "tmaxrequest": 5000, + "prebid": { + "auctiontimestamp": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-request.json new file mode 100644 index 00000000000..79f55a08a75 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-request.json @@ -0,0 +1,65 @@ +{ + "id": "some-request-id", + "imp": [ + { + "id": "some-impression-id1", + "tagid": "ogTAGID", + "secure": 1, + "banner": { + "w": 320, + "h": 50 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "clientToken": "some-client-token", + "placementId": "some-placement-id" + } + } + } + ], + "site": { + "domain": "example.com", + "page": "https://example.com", + "publisher": { + "domain": "example.com", + "id": "123456789" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "test-user-agent", + "ip": "193.168.244.1", + "language": "en", + "dnt": 0 + }, + "user": { + "buyeruid": "awesome-user" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": ["USD"], + "source" : { + "tid": "${json-unit.any-string}" + }, + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "prebid": { + "channel": { + "name": "web" + }, + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-response.json new file mode 100644 index 00000000000..adb7c87cd65 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-feedad-bid-response.json @@ -0,0 +1,27 @@ +{ + "id": "some-request-id", + "seatbid": [ + { + "bid": [ + { + "id": "a3ae1b4e2fc24a4fb45540082e98e161", + "impid": "some-impression-id1", + "price": 3.5, + "adm": "awesome-markup", + "crid": "20", + "adomain": [ + "awesome.com" + ], + "w": 320, + "h": 50, + "mtype": 1, + "ext": { + "prebid": { + "type": "banner" + } + } + } + ] + } + ] +} From ef23c25ace3bbfaf7f7daac2743942decf2ca1db Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Thu, 27 Mar 2025 13:51:27 +0100 Subject: [PATCH 03/10] Checkstyle compliance (#3718) --- .../server/bidder/feedad/FeedAdBidder.java | 54 +++++++++---------- .../feedad/ExtImpFeedAdSdkOptions.java | 1 - .../config/bidder/FeedAdConfiguration.java | 4 +- .../bidder/feedad/FeedAdBidderTest.java | 24 ++++----- .../java/org/prebid/server/it/FeedAdTest.java | 13 ++--- 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java index 1269744fcc7..8402d39beed 100644 --- a/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java +++ b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java @@ -1,10 +1,5 @@ package org.prebid.server.bidder.feedad; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.response.BidResponse; @@ -23,21 +18,44 @@ import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + public class FeedAdBidder implements Bidder { - private final String endpointUrl; - private final JacksonMapper mapper; private static final String OPENRTB_VERSION = "2.5"; private static final String X_FA_PBS_ADAPTER_VERSION_HEADER = "X-FA-PBS-Adapter-Version"; private static final String FEED_AD_ADAPTER_VERSION = "1.0.0"; + private final String endpointUrl; + private final JacksonMapper mapper; + public FeedAdBidder(String endpointUrl, JacksonMapper mapper) { this.endpointUrl = HttpUtil.validateUrl(endpointUrl); this.mapper = Objects.requireNonNull(mapper); } + private static List extractBids(BidResponse bidResponse) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse); + } + + private static List bidsFromResponse(BidResponse bidResponse) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> BidderBid.of(bid, BidType.banner, bidResponse.getCur())) + .toList(); + } + private MultiMap resolveHeaders(Device device) { - MultiMap headers = HttpUtil.headers() + final MultiMap headers = HttpUtil.headers() .add(X_FA_PBS_ADAPTER_VERSION_HEADER, FEED_AD_ADAPTER_VERSION) .add(HttpUtil.X_OPENRTB_VERSION_HEADER, OPENRTB_VERSION); if (device != null) { @@ -49,7 +67,7 @@ private MultiMap resolveHeaders(Device device) { @Override public Result>> makeHttpRequests(BidRequest bidRequest) { - MultiMap headers = resolveHeaders(bidRequest.getDevice()); + final MultiMap headers = resolveHeaders(bidRequest.getDevice()); return Result.withValue(BidderUtil.defaultRequest(bidRequest, headers, endpointUrl, mapper)); } @@ -62,22 +80,4 @@ public Result> makeBids(BidderCall httpCall, BidRequ return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - - private static List extractBids(BidResponse bidResponse) { - if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { - return Collections.emptyList(); - } - List bids = bidsFromResponse(bidResponse); - return bids; - } - - private static List bidsFromResponse(BidResponse bidResponse) { - return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .map(bid -> BidderBid.of(bid, BidType.banner, bidResponse.getCur())) - .toList(); - } } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java index f98db907bf7..3655e4ad0c5 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request.feedad; - import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Value; diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java index 4f94877fe4d..a716452fbfa 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java @@ -1,7 +1,5 @@ package org.prebid.server.spring.config.bidder; -import jakarta.validation.constraints.NotBlank; - import org.prebid.server.bidder.BidderDeps; import org.prebid.server.bidder.feedad.FeedAdBidder; import org.prebid.server.json.JacksonMapper; @@ -15,6 +13,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; +import jakarta.validation.constraints.NotBlank; + @Configuration @PropertySource(value = "classpath:/bidder-config/feedad.yaml", factory = YamlPropertySourceFactory.class) public class FeedAdConfiguration { diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index 998e604f8c0..ad420665976 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -1,17 +1,5 @@ package org.prebid.server.bidder.feedad; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.function.UnaryOperator; - -import static java.util.Collections.singletonList; -import static java.util.function.UnaryOperator.identity; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.tuple; -import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; - import com.fasterxml.jackson.core.JsonProcessingException; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; @@ -31,6 +19,18 @@ import org.prebid.server.bidder.model.Result; import org.prebid.server.util.HttpUtil; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.function.UnaryOperator; + +import static java.util.Collections.singletonList; +import static java.util.function.UnaryOperator.identity; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.tuple; +import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; + public class FeedAdBidderTest extends VertxTest { private static final String ENDPOINT_URL = "https://randomurl.com"; diff --git a/src/test/java/org/prebid/server/it/FeedAdTest.java b/src/test/java/org/prebid/server/it/FeedAdTest.java index 4081b2f1a1e..04e06a8634b 100644 --- a/src/test/java/org/prebid/server/it/FeedAdTest.java +++ b/src/test/java/org/prebid/server/it/FeedAdTest.java @@ -1,17 +1,16 @@ package org.prebid.server.it; -import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; -import static java.util.Collections.singletonList; - import com.github.tomakehurst.wiremock.client.WireMock; import io.restassured.response.Response; - -import java.io.IOException; - 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.equalToJson; +import static java.util.Collections.singletonList; + public class FeedAdTest extends IntegrationTest { @Test @@ -25,8 +24,6 @@ public void openrtb2AuctionShouldRespondWithBidsFromFeedAdBidder() throws IOExce final Response response = responseFor("openrtb2/feedad/test-auction-feedad-request.json", Endpoint.openrtb2_auction); - System.out.println(response.asString()); - // then assertJsonEquals("openrtb2/feedad/test-auction-feedad-response.json", response, singletonList("feedad")); From 53605ea9228c4252eb4688ccffacddc2f8b4e2a8 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Thu, 27 Mar 2025 14:14:59 +0100 Subject: [PATCH 04/10] Codestyle compliance (#3718) --- .../server/bidder/feedad/FeedAdBidder.java | 42 +++++++++---------- .../bidder/feedad/FeedAdBidderTest.java | 13 +++--- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java index 8402d39beed..5279e2f70b3 100644 --- a/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java +++ b/src/main/java/org/prebid/server/bidder/feedad/FeedAdBidder.java @@ -37,21 +37,10 @@ public FeedAdBidder(String endpointUrl, JacksonMapper mapper) { this.mapper = Objects.requireNonNull(mapper); } - private static List extractBids(BidResponse bidResponse) { - if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { - return Collections.emptyList(); - } - return bidsFromResponse(bidResponse); - } - - private static List bidsFromResponse(BidResponse bidResponse) { - return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .map(bid -> BidderBid.of(bid, BidType.banner, bidResponse.getCur())) - .toList(); + @Override + public Result>> makeHttpRequests(BidRequest bidRequest) { + final MultiMap headers = resolveHeaders(bidRequest.getDevice()); + return Result.withValue(BidderUtil.defaultRequest(bidRequest, headers, endpointUrl, mapper)); } private MultiMap resolveHeaders(Device device) { @@ -65,12 +54,6 @@ private MultiMap resolveHeaders(Device device) { return headers; } - @Override - public Result>> makeHttpRequests(BidRequest bidRequest) { - final MultiMap headers = resolveHeaders(bidRequest.getDevice()); - return Result.withValue(BidderUtil.defaultRequest(bidRequest, headers, endpointUrl, mapper)); - } - @Override public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { @@ -80,4 +63,21 @@ public Result> makeBids(BidderCall httpCall, BidRequ return Result.withError(BidderError.badServerResponse(e.getMessage())); } } + + private static List extractBids(BidResponse bidResponse) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse); + } + + private static List bidsFromResponse(BidResponse bidResponse) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> BidderBid.of(bid, BidType.banner, bidResponse.getCur())) + .toList(); + } } diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index ad420665976..aec58e3856f 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -58,15 +58,14 @@ public void makeHttpRequestsShouldCreateExpectedUrl() { } @Test - public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDevicePresent() { + public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsPresent() { // given final BidRequest bidRequest = givenBidRequest( bidRequestBuilder -> bidRequestBuilder .device(Device.builder() .ip("ip") .ipv6("ipV6").build()), - Function.identity() - ); + Function.identity()); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -91,8 +90,7 @@ public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsNull() { // given final BidRequest bidRequest = givenBidRequest( bidRequestBuilder -> bidRequestBuilder.device(null), - Function.identity() - ); + Function.identity()); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -128,12 +126,11 @@ public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { } @Test - public void makeBidsShouldReturnBannerBid() throws JsonProcessingException { + public void makeBidsShouldAlwaysReturnBannerBid() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( null, - mapper.writeValueAsString(givenBidResponse(impBuilder -> impBuilder.impid("123"))) - ); + mapper.writeValueAsString(givenBidResponse(impBuilder -> impBuilder.impid("123")))); // when final Result> result = target.makeBids(httpCall, null); From e96f8b886aaf1a3a2de30f31e0b7a4d342cc333c Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 11 Apr 2025 14:25:37 +0200 Subject: [PATCH 05/10] Removed unused extension (#3718) --- .../ext/request/feedad/ExtImpFeedAd.java | 22 --------------- .../feedad/ExtImpFeedAdSdkOptions.java | 28 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java delete mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java deleted file mode 100644 index 87bf513e413..00000000000 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAd.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.prebid.server.proto.openrtb.ext.request.feedad; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Value; - -@Value -@AllArgsConstructor(staticName = "of") -public class ExtImpFeedAd { - - @JsonProperty("clientToken") - String clientToken; - - @JsonProperty("decoration") - String decoration; - - @JsonProperty("placementId") - String placementId; - - @JsonProperty("sdkOptions") - ExtImpFeedAdSdkOptions sdkOptions; -} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java deleted file mode 100644 index 3655e4ad0c5..00000000000 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/feedad/ExtImpFeedAdSdkOptions.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.prebid.server.proto.openrtb.ext.request.feedad; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Value; - -@Value -@AllArgsConstructor(staticName = "of") -public class ExtImpFeedAdSdkOptions { - - @JsonProperty("advertising_id") - String advertisingId; - - @JsonProperty("app_name") - String appName; - - @JsonProperty("bundle_id") - String bundleId; - - @JsonProperty("hybrid_app") - boolean hybridApp; - - @JsonProperty("hybrid_platform") - String hybridPlatform; - - @JsonProperty("limit_ad_tracking") - boolean limitAdTracking; -} From 451480f0ffc755135fcb40edec7036f6ebae073d Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 11 Apr 2025 14:25:47 +0200 Subject: [PATCH 06/10] Expanded test cases (#3718) --- .../bidder/feedad/FeedAdBidderTest.java | 59 ++++++++++++++++--- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index aec58e3856f..9f5a67ad2ae 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -1,6 +1,7 @@ package org.prebid.server.bidder.feedad; import com.fasterxml.jackson.core.JsonProcessingException; +import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; @@ -57,6 +58,49 @@ public void makeHttpRequestsShouldCreateExpectedUrl() { .containsExactly("https://randomurl.com"); } + @Test + public void makeHttpRequestsShouldIncludeImpIdsInPayload() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(singletonList(Imp.builder() + .id("impId1") + .build())) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getId) + .containsExactly("impId1"); + } + + @Test + public void makeHttpRequestsShouldIncludeRequestBodyInPayload() { + // given + final Banner banner = Banner.builder().w(320).h(50).build(); + final BidRequest bidRequest = BidRequest.builder() + .imp(singletonList(Imp.builder() + .banner(banner) + .build())) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBanner) + .containsExactly(banner); + } + @Test public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsPresent() { // given @@ -111,7 +155,7 @@ public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsNull() { @Test public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { // given - final BidderCall httpCall = givenHttpCall(null, "invalid"); + final BidderCall httpCall = givenHttpCallWithNoPayload("invalid"); // when final Result> result = target.makeBids(httpCall, null); @@ -128,8 +172,7 @@ public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { @Test public void makeBidsShouldAlwaysReturnBannerBid() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall( - null, + final BidderCall httpCall = givenHttpCallWithNoPayload( mapper.writeValueAsString(givenBidResponse(impBuilder -> impBuilder.impid("123")))); // when @@ -144,8 +187,7 @@ public void makeBidsShouldAlwaysReturnBannerBid() throws JsonProcessingException @Test public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsEmpty() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall( - null, + final BidderCall httpCall = givenHttpCallWithNoPayload( mapper.writeValueAsString(BidResponse.builder().build())); // when @@ -159,8 +201,7 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsEmpty() throws Js @Test public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall( - null, + final BidderCall httpCall = givenHttpCallWithNoPayload( mapper.writeValueAsString(null)); // when @@ -194,9 +235,9 @@ private static Bid givenBid() { return Bid.builder().impid("123").build(); } - private static BidderCall givenHttpCall(BidRequest bidRequest, String body) { + private static BidderCall givenHttpCallWithNoPayload(String body) { return BidderCall.succeededHttp( - HttpRequest.builder().payload(bidRequest).build(), + HttpRequest.builder().payload(null).build(), HttpResponse.of(200, null, body), null); } From eb8358a99025e3511ae42de60dedbd96fcfb5f52 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 11 Apr 2025 14:32:21 +0200 Subject: [PATCH 07/10] Changed Function occurencies to UnaryOperator (#3718) --- .../prebid/server/bidder/feedad/FeedAdBidderTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index 9f5a67ad2ae..9003e5fb2e4 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.function.UnaryOperator; import static java.util.Collections.singletonList; @@ -109,7 +108,7 @@ public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsPresent() { .device(Device.builder() .ip("ip") .ipv6("ipV6").build()), - Function.identity()); + UnaryOperator.identity()); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -134,7 +133,7 @@ public void makeHttpRequestsShouldCorrectlyAddHeadersWhenDeviceIsNull() { // given final BidRequest bidRequest = givenBidRequest( bidRequestBuilder -> bidRequestBuilder.device(null), - Function.identity()); + UnaryOperator.identity()); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -217,14 +216,14 @@ private static BidRequest givenBidRequest(UnaryOperator impCusto } private static BidRequest givenBidRequest( - Function bidRequestCustomizer, - Function impCustomizer) { + UnaryOperator bidRequestCustomizer, + UnaryOperator impCustomizer) { return bidRequestCustomizer.apply(BidRequest.builder() .imp(singletonList(impCustomizer.apply(Imp.builder().id("123")).build()))) .build(); } - private static BidResponse givenBidResponse(Function bidCustomizer) { + private static BidResponse givenBidResponse(UnaryOperator bidCustomizer) { return BidResponse.builder() .seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) .build())) From 18fb5dfff7dcf9bcbc9ec3f9231a1f6fbd2f59c4 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 14 Apr 2025 11:39:37 +0200 Subject: [PATCH 08/10] Post-review test improvement (#3718) --- .../org/prebid/server/bidder/feedad/FeedAdBidderTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index 9003e5fb2e4..69142994ff2 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -95,9 +95,7 @@ public void makeHttpRequestsShouldIncludeRequestBodyInPayload() { assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()).hasSize(1) .extracting(HttpRequest::getPayload) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getBanner) - .containsExactly(banner); + .containsExactly(bidRequest); } @Test From d0134746bf2b60e78e5b7992542e39f333cb9333 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Wed, 16 Apr 2025 12:12:18 +0200 Subject: [PATCH 09/10] Post-review style improvement (#3718) --- .../org/prebid/server/bidder/feedad/FeedAdBidderTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java index 69142994ff2..205715e7a62 100644 --- a/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/feedad/FeedAdBidderTest.java @@ -170,7 +170,7 @@ public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { public void makeBidsShouldAlwaysReturnBannerBid() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCallWithNoPayload( - mapper.writeValueAsString(givenBidResponse(impBuilder -> impBuilder.impid("123")))); + mapper.writeValueAsString(givenBidResponse(bid -> bid.impid("123")))); // when final Result> result = target.makeBids(httpCall, null); @@ -216,6 +216,7 @@ private static BidRequest givenBidRequest(UnaryOperator impCusto private static BidRequest givenBidRequest( UnaryOperator bidRequestCustomizer, UnaryOperator impCustomizer) { + return bidRequestCustomizer.apply(BidRequest.builder() .imp(singletonList(impCustomizer.apply(Imp.builder().id("123")).build()))) .build(); @@ -223,7 +224,8 @@ private static BidRequest givenBidRequest( private static BidResponse givenBidResponse(UnaryOperator bidCustomizer) { return BidResponse.builder() - .seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) .build())) .build(); } From b1d77d13466c74eb43d613a8ac76c0cde2144d16 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Wed, 16 Apr 2025 16:30:11 +0200 Subject: [PATCH 10/10] Fixed integration test fixture (#3718) --- .../it/openrtb2/feedad/test-auction-feedad-response.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json index a7e0a340207..2ef3414f19f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/feedad/test-auction-feedad-response.json @@ -18,7 +18,10 @@ "mtype": 1, "ext": { "prebid": { - "type": "banner" + "type": "banner", + "meta":{ + "adaptercode": "feedad" + } }, "origbidcpm": 3.5 }