From fc2a2e9349c1d0ef06bc48bb53b45f8026fc2c1e Mon Sep 17 00:00:00 2001 From: markiian Date: Wed, 26 Jan 2022 12:01:44 +0200 Subject: [PATCH] Adagio : remove adapter --- .../server/bidder/adagio/AdagioBidder.java | 110 ------- .../config/bidder/AdagioConfiguration.java | 41 --- src/main/resources/bidder-config/adagio.yaml | 19 -- .../static/bidder-params/adagio.json | 94 ------ .../bidder/adagio/AdagioBidderTest.java | 309 ------------------ .../java/org/prebid/server/it/AdagioTest.java | 35 -- .../adagio/test-adagio-bid-request.json | 43 --- .../adagio/test-adagio-bid-response.json | 25 -- .../adagio/test-auction-adagio-request.json | 25 -- .../adagio/test-auction-adagio-response.json | 38 --- .../server/it/test-application.properties | 2 - 11 files changed, 741 deletions(-) delete mode 100644 src/main/java/org/prebid/server/bidder/adagio/AdagioBidder.java delete mode 100644 src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java delete mode 100644 src/main/resources/bidder-config/adagio.yaml delete mode 100644 src/main/resources/static/bidder-params/adagio.json delete mode 100644 src/test/java/org/prebid/server/bidder/adagio/AdagioBidderTest.java delete mode 100644 src/test/java/org/prebid/server/it/AdagioTest.java delete mode 100644 src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-request.json delete mode 100644 src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-response.json delete mode 100644 src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-request.json delete mode 100644 src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-response.json diff --git a/src/main/java/org/prebid/server/bidder/adagio/AdagioBidder.java b/src/main/java/org/prebid/server/bidder/adagio/AdagioBidder.java deleted file mode 100644 index 795e90aa1d0..00000000000 --- a/src/main/java/org/prebid/server/bidder/adagio/AdagioBidder.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.prebid.server.bidder.adagio; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.iab.openrtb.request.BidRequest; -import com.iab.openrtb.request.Device; -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 io.vertx.core.http.HttpMethod; -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.BidderError; -import org.prebid.server.bidder.model.HttpCall; -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.response.BidType; -import org.prebid.server.util.HttpUtil; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -public class AdagioBidder implements Bidder { - - private final String endpointUrl; - private final JacksonMapper mapper; - - public AdagioBidder(String endpointUrl, JacksonMapper mapper) { - this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); - this.mapper = Objects.requireNonNull(mapper); - } - - @Override - public Result>> makeHttpRequests(BidRequest request) { - return Result.withValue(HttpRequest.builder() - .method(HttpMethod.POST) - .uri(endpointUrl) - .headers(resolveHeaders(request.getDevice())) - .payload(request) - .body(mapper.encodeToBytes(request)) - .build()); - } - - private static MultiMap resolveHeaders(Device device) { - final MultiMap headers = HttpUtil.headers() - .add(HttpUtil.CONTENT_ENCODING_HEADER, HttpHeaderValues.GZIP); - - 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 final Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { - try { - final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - final List errors = new ArrayList<>(); - return Result.of(extractBids(bidResponse, errors), errors); - } catch (DecodeException | PreBidException e) { - return Result.withError(BidderError.badServerResponse(e.getMessage())); - } - } - - private List extractBids(BidResponse bidResponse, List errors) { - if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { - return Collections.emptyList(); - } - return bidsFromResponse(bidResponse, errors); - } - - private List bidsFromResponse(BidResponse bidResponse, List errors) { - return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .map(bid -> toBidderBid(bid, bidResponse, errors)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } - - private BidderBid toBidderBid(Bid bid, BidResponse bidResponse, List errors) { - try { - return BidderBid.of(bid, getBidType(bid.getExt()), bidResponse.getCur()); - } catch (IllegalArgumentException | PreBidException e) { - errors.add(BidderError.badInput(e.getMessage())); - return null; - } - } - - private BidType getBidType(ObjectNode bidExt) { - final JsonNode typeNode = bidExt != null && !bidExt.isEmpty() ? bidExt.at("/prebid/type") : null; - if (typeNode == null || !typeNode.isTextual()) { - throw new PreBidException("Missing ext.prebid.type"); - } - return mapper.mapper().convertValue(typeNode.asText(), BidType.class); - } -} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java deleted file mode 100644 index 7669625b61e..00000000000 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.prebid.server.spring.config.bidder; - -import org.prebid.server.bidder.BidderDeps; -import org.prebid.server.bidder.adagio.AdagioBidder; -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 javax.validation.constraints.NotBlank; - -@Configuration -@PropertySource(value = "classpath:/bidder-config/adagio.yaml", factory = YamlPropertySourceFactory.class) -public class AdagioConfiguration { - - private static final String BIDDER_NAME = "adagio"; - - @Bean("adagioConfigurationProperties") - @ConfigurationProperties("adapters.adagio") - BidderConfigurationProperties configurationProperties() { - return new BidderConfigurationProperties(); - } - - @Bean - BidderDeps adagioBidderDeps(BidderConfigurationProperties adagioConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, - JacksonMapper mapper) { - - return BidderDepsAssembler.forBidder(BIDDER_NAME) - .withConfig(adagioConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) - .bidderCreator(config -> new AdagioBidder(config.getEndpoint(), mapper)) - .assemble(); - } -} diff --git a/src/main/resources/bidder-config/adagio.yaml b/src/main/resources/bidder-config/adagio.yaml deleted file mode 100644 index 0b3023aa3cb..00000000000 --- a/src/main/resources/bidder-config/adagio.yaml +++ /dev/null @@ -1,19 +0,0 @@ -adapters: - adagio: - endpoint: https://mp.4dex.io/ortb2 - meta-info: - maintainer-email: dev@adagio.io - app-media-types: - - banner - site-media-types: - - banner - - video - - native - supported-vendors: - vendor-id: 617 - usersync: - url: https://mp.4dex.io/sync?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect= - redirect-url: /setuid?bidder=adagio&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid={{UID}} - cookie-family-name: adagio - type: redirect - support-cors: false diff --git a/src/main/resources/static/bidder-params/adagio.json b/src/main/resources/static/bidder-params/adagio.json deleted file mode 100644 index 504b486a965..00000000000 --- a/src/main/resources/static/bidder-params/adagio.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Adagio Adapter Params", - "description": "A schema which validates params accepted by the Adagio adapter", - "type": "object", - "required": [ - "organizationId", - "site", - "placement" - ], - "properties": { - "organizationId": { - "type": "string", - "description": "Name to identify the organization", - "minLength": 1 - }, - "site": { - "type": "string", - "description": "Name to identify the site", - "minLength": 1 - }, - "placement": { - "type": "string", - "description": "Name to identify the placement", - "minLength": 1 - }, - "pageviewId": { - "type": "string", - "description": "Name to identify the pageview" - }, - "pagetype": { - "type": "string", - "description": "Name to identify the page type" - }, - "category": { - "type": "string", - "description": "Name to identify the category" - }, - "subcategory": { - "type": "string", - "description": "Name to identify the subcategory" - }, - "environment": { - "type": "string", - "description": "Name to identify the environment" - }, - "features": { - "type": "object", - "patternProperties": { - "^[a-zA-Z_]": { "type": "string" } - } - }, - "prebidVersion:": { - "type": "string", - "description": "Name to identify the version of Prebid.js" - }, - "debug": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "cpm": { - "type": "number" - }, - "lazyLoad": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "threshold": { - "type": "number" - }, - "rootMargin": { - "type": "string" - } - } - } - } - }, - "native": { - "type": "object", - "properties": { - "context": { - "type": "number" - }, - "plcmttype": { - "type": "number" - } - } - } - } -} \ No newline at end of file diff --git a/src/test/java/org/prebid/server/bidder/adagio/AdagioBidderTest.java b/src/test/java/org/prebid/server/bidder/adagio/AdagioBidderTest.java deleted file mode 100644 index c249927594a..00000000000 --- a/src/test/java/org/prebid/server/bidder/adagio/AdagioBidderTest.java +++ /dev/null @@ -1,309 +0,0 @@ -package org.prebid.server.bidder.adagio; - -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.request.Site; -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 org.junit.Before; -import org.junit.Test; -import org.prebid.server.VertxTest; -import org.prebid.server.bidder.model.BidderBid; -import org.prebid.server.bidder.model.BidderError; -import org.prebid.server.bidder.model.HttpCall; -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.response.BidType; -import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; -import org.prebid.server.util.HttpUtil; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.function.UnaryOperator; -import java.util.stream.Collectors; - -import static java.util.Collections.singletonList; -import static java.util.function.Function.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; - -public class AdagioBidderTest extends VertxTest { - - private static final String ENDPOINT_URL = "http://localhost/prebid_server"; - - private AdagioBidder adagioBidder; - - @Before - public void setUp() { - adagioBidder = new AdagioBidder(ENDPOINT_URL, jacksonMapper); - } - - @Test - public void creationShouldFailOnInvalidEndpointUrl() { - assertThatIllegalArgumentException().isThrownBy(() -> new AdagioBidder("invalid_url", jacksonMapper)); - } - - @Test - public void makeHttpRequestsShouldCorrectlyAddAllHeaders() { - // given - final BidRequest bidRequest = BidRequest.builder() - .device(Device.builder().ua("someUa").dnt(5).ip("someIp").language("someLanguage").build()) - .site(Site.builder().page("somePage").build()) - .imp(singletonList(givenImp(identity()))) - .build(); - - // when - final Result>> result = adagioBidder.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .flatExtracting(res -> res.getHeaders().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(HttpUtil.CONTENT_ENCODING_HEADER.toString(), HttpHeaderValues.GZIP.toString()), - tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "someIp")); - } - - @Test - public void makeHttpRequestsShouldAddForwardedForHeaderIfIpv6PresentAndIpIsAbsent() { - // given - final BidRequest bidRequest = BidRequest.builder() - .device(Device.builder().ua("someUa").dnt(5).ip(null).ipv6("someIpv6").language("someLanguage").build()) - .site(Site.builder().page("somePage").build()) - .imp(singletonList(givenImp(identity()))) - .build(); - - // when - final Result>> result = adagioBidder.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .flatExtracting(res -> res.getHeaders().entries()) - .extracting(Map.Entry::getKey, Map.Entry::getValue) - .contains(tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "someIpv6")); - } - - @Test - public void makeHttpRequestsShouldAddForwardedForHeaderIfIpv6PresentAndIpIsPresent() { - // given - final BidRequest bidRequest = BidRequest.builder() - .device(Device.builder() - .ua("someUa") - .dnt(5) - .ipv6("someIpv6") - .ip("someIp") - .language("someLanguage") - .build()) - .site(Site.builder().page("somePage").build()) - .imp(singletonList(givenImp(identity()))) - .build(); - - // when - final Result>> result = adagioBidder.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .flatExtracting(res -> res.getHeaders().entries()) - .extracting(Map.Entry::getKey, Map.Entry::getValue) - .contains(tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "someIp")); - } - - @Test - public void makeHttpRequestsShouldAddForwardedForHeaderIfIpv6AbsentAndIpIsPresent() { - // given - final BidRequest bidRequest = BidRequest.builder() - .device(Device.builder().ua("someUa").dnt(5).ipv6(null).ip("someIp").language("someLanguage").build()) - .site(Site.builder().page("somePage").build()) - .imp(singletonList(givenImp(identity()))) - .build(); - - // when - final Result>> result = adagioBidder.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .flatExtracting(res -> res.getHeaders().entries()) - .extracting(Map.Entry::getKey, Map.Entry::getValue) - .contains(tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "someIp")); - } - - @Test - public void makeHttpRequestsShouldAddForwardedForHeaderIfIpv6AbsentAndIpIsAbsent() { - // given - final BidRequest bidRequest = BidRequest.builder() - .device(Device.builder().ua("someUa").dnt(5).ipv6(null).ip(null).language("someLanguage").build()) - .site(Site.builder().page("somePage").build()) - .imp(singletonList(givenImp(identity()))) - .build(); - - // when - final Result>> result = adagioBidder.makeHttpRequests(bidRequest); - - // then - assertThat(result.getValue()) - .flatExtracting(res -> res.getHeaders().entries()) - .extracting(Map.Entry::getKey) - .doesNotContain(HttpUtil.X_FORWARDED_FOR_HEADER.toString()); - assertThat(result.getErrors()).isEmpty(); - } - - @Test - public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { - // given - final HttpCall httpCall = givenHttpCall(null, "invalid"); - - // when - final Result> result = adagioBidder.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 makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { - // given - final HttpCall httpCall = givenHttpCall(null, mapper.writeValueAsString(null)); - - // when - final Result> result = adagioBidder.makeBids(httpCall, null); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()).isEmpty(); - } - - @Test - public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws JsonProcessingException { - // given - final HttpCall httpCall = givenHttpCall(null, - mapper.writeValueAsString(BidResponse.builder().build())); - - // when - final Result> result = adagioBidder.makeBids(httpCall, null); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()).isEmpty(); - } - - @Test - public void makeBidsShouldReturnErrorAndEmptyValuesIfExtIsNull() throws JsonProcessingException { - // given - final HttpCall httpCall = givenHttpCall(givenBidRequest(identity()), - mapper.writeValueAsString(givenBidResponse(builder -> builder.ext(null)))); - - // when - final Result> result = adagioBidder.makeBids(httpCall, null); - - // then - assertThat(result.getErrors()).hasSize(1) - .extracting(BidderError::getType) - .containsOnly(BidderError.Type.bad_input); - assertThat(result.getValue()).isEmpty(); - } - - @Test - public void makeBidsShouldReturnErrorIfExtIsEmpty() throws JsonProcessingException { - // given - final HttpCall httpCall = givenHttpCall(givenBidRequest(identity()), - mapper.writeValueAsString(givenBidResponse(builder -> builder.ext(mapper.createObjectNode())))); - - // when - final Result> result = adagioBidder.makeBids(httpCall, null); - - // then - assertThat(result.getErrors()).hasSize(1) - .extracting(BidderError::getType) - .containsOnly(BidderError.Type.bad_input); - assertThat(result.getValue()).isEmpty(); - } - - @Test - public void makeBidsShouldProceedWithErrorsAndValues() throws JsonProcessingException { - // given - final HttpCall httpCall = givenHttpCall(givenBidRequest(identity()), - mapper.writeValueAsString(givenBidResponse( - firstBuilder -> firstBuilder - .ext(mapper - .createObjectNode() - .set("prebid", mapper.valueToTree(ExtBidPrebid.builder() - .type(BidType.banner) - .build()))), - - secondBuilder -> secondBuilder - .ext(mapper - .createObjectNode() - .set("prebid", mapper.valueToTree(ExtBidPrebid.builder() - .type(BidType.banner) - .build()))), - - thirdBuilder -> thirdBuilder.ext(null)))); - - // when - final Result> result = adagioBidder.makeBids(httpCall, null); - - // then - assertThat(result.getErrors()).hasSize(1) - .extracting(BidderError::getType) - .containsOnly(BidderError.Type.bad_input); - - assertThat(result.getValue()).hasSize(2) - .extracting(BidderBid::getType) - .containsOnly(BidType.banner); - } - - private static BidRequest givenBidRequest( - Function bidRequestCustomizer, - Function impCustomizer) { - - return bidRequestCustomizer.apply(BidRequest.builder() - .imp(singletonList(givenImp(impCustomizer)))) - .build(); - } - - private static BidRequest givenBidRequest(Function impCustomizer) { - return givenBidRequest(identity(), impCustomizer); - } - - @SafeVarargs - private static BidResponse givenBidResponse(UnaryOperator... bidCustomizers) { - return BidResponse.builder() - .cur("USD") - .seatbid(singletonList(SeatBid.builder() - .bid(Arrays.stream(bidCustomizers) - .map(bidCustomizer -> bidCustomizer.apply(Bid.builder()).build()) - .collect(Collectors.toList())) - .build())) - .build(); - } - - private static Imp givenImp(Function impCustomizer) { - return impCustomizer.apply(Imp.builder()).build(); - } - - private static HttpCall givenHttpCall(BidRequest bidRequest, String body) { - return HttpCall.success( - HttpRequest.builder().payload(bidRequest).build(), - HttpResponse.of(200, null, body), - null); - } -} diff --git a/src/test/java/org/prebid/server/it/AdagioTest.java b/src/test/java/org/prebid/server/it/AdagioTest.java deleted file mode 100644 index 1d00e875452..00000000000 --- a/src/test/java/org/prebid/server/it/AdagioTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.prebid.server.it; - -import io.restassured.response.Response; -import org.json.JSONException; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.prebid.server.model.Endpoint; -import org.springframework.test.context.junit4.SpringRunner; - -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; - -@RunWith(SpringRunner.class) -public class AdagioTest extends IntegrationTest { - - @Test - public void openrtb2AuctionShouldRespondWithBidsFromAdagio() throws IOException, JSONException { - // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/adagio-exchange")) - .withRequestBody(equalToJson(jsonFrom("openrtb2/adagio/test-adagio-bid-request.json"))) - .willReturn(aResponse().withBody(jsonFrom("openrtb2/adagio/test-adagio-bid-response.json")))); - - // when - final Response response = responseFor("openrtb2/adagio/test-auction-adagio-request.json", - Endpoint.openrtb2_auction); - - // then - assertJsonEquals("openrtb2/adagio/test-auction-adagio-response.json", response, singletonList("adagio")); - } -} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-request.json deleted file mode 100644 index e1551b385d7..00000000000 --- a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-request.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "id": "request_id", - "imp": [ - { - "id": "imp_id", - "banner": { - "w": 300, - "h": 250 - }, - "ext": { - "bidder": { - "organizationId": "someOrganizationId", - "site": "someSiteId", - "placement": "somePlacementInfo" - } - } - } - ], - "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" - ], - "regs": { - "ext": { - "gdpr": 0 - } - } -} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-response.json deleted file mode 100644 index d6b74c9bf9e..00000000000 --- a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-adagio-bid-response.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "request_id", - "seatbid": [ - { - "bid": [ - { - "id": "bid_id", - "impid": "imp_id", - "price": 3.33, - "adid": "adid001", - "crid": "crid001", - "cid": "cid001", - "adm": "adm001", - "h": 250, - "w": 300, - "ext": { - "prebid": { - "type": "banner" - } - } - } - ] - } - ] -} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-request.json deleted file mode 100644 index 27f453bf5bf..00000000000 --- a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-request.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "request_id", - "imp": [ - { - "id": "imp_id", - "banner": { - "w": 300, - "h": 250 - }, - "ext": { - "adagio": { - "organizationId": "someOrganizationId", - "site": "someSiteId", - "placement": "somePlacementInfo" - } - } - } - ], - "tmax": 5000, - "regs": { - "ext": { - "gdpr": 0 - } - } -} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-response.json deleted file mode 100644 index 9543956ef3e..00000000000 --- a/src/test/resources/org/prebid/server/it/openrtb2/adagio/test-auction-adagio-response.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "id": "request_id", - "seatbid": [ - { - "bid": [ - { - "id": "bid_id", - "impid": "imp_id", - "price": 3.33, - "adm": "adm001", - "adid": "adid001", - "cid": "cid001", - "crid": "crid001", - "w": 300, - "h": 250, - "ext": { - "prebid": { - "type": "banner" - }, - "origbidcpm": 3.33 - } - } - ], - "seat": "adagio", - "group": 0 - } - ], - "cur": "USD", - "ext": { - "responsetimemillis": { - "adagio": "{{ adagio.response_time_ms }}" - }, - "prebid": { - "auctiontimestamp": 0 - }, - "tmaxrequest": 5000 - } -} 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 cb735e3b882..fa67429006d 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -4,8 +4,6 @@ adapters.aceex.enabled=true adapters.aceex.endpoint=http://localhost:8090/aceex-exchange adapters.acuityads.enabled=true adapters.acuityads.endpoint=http://localhost:8090/acuityads-exchange -adapters.adagio.enabled=true -adapters.adagio.endpoint=http://localhost:8090/adagio-exchange adapters.adf.enabled=true adapters.adf.endpoint=http://localhost:8090/adf-exchange adapters.adf.aliases.adform.enabled=true