diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java index 8ca4cb127be..865bbf2b339 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java @@ -15,7 +15,7 @@ @PropertySource(value = "classpath:/bidder-config/emxdigital.yaml", factory = YamlPropertySourceFactory.class) public class EmxDigitalConfiguration { - private static final String BIDDER_NAME = "emx_digital"; + private static final String BIDDER_NAME = "emxdigital"; @Bean("emxdigitalConfigurationProperties") @ConfigurationProperties("adapters.emxdigital") diff --git a/src/main/resources/bidder-config/emxdigital.yaml b/src/main/resources/bidder-config/emxdigital.yaml index e358522534b..863f99b8183 100644 --- a/src/main/resources/bidder-config/emxdigital.yaml +++ b/src/main/resources/bidder-config/emxdigital.yaml @@ -10,6 +10,10 @@ adapters: geoscope: - USA - CAN + emx_digital: + enabled: false + meta-info: + vendor-id: 183 meta-info: maintainer-email: contactaperturemx@cadent.tv app-media-types: diff --git a/src/main/resources/static/bidder-params/emx_digital.json b/src/main/resources/static/bidder-params/emxdigital.json similarity index 100% rename from src/main/resources/static/bidder-params/emx_digital.json rename to src/main/resources/static/bidder-params/emxdigital.json diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java index 0e9c1d61864..e6e0baf5525 100644 --- a/src/test/java/org/prebid/server/it/ApplicationTest.java +++ b/src/test/java/org/prebid/server/it/ApplicationTest.java @@ -460,10 +460,6 @@ public void biddersParamsShouldReturnBidderSchemas() throws JSONException, IOExc final List bidders = getBidderNamesFromParamFiles(); final Map aliases = getBidderAliasesFromConfigFiles(); - //todo: necessary since the config file is not a source of truth in terms of defining aliases for the bidders - // the suggestion is eventually resolving static json file name from the bidder config file - // and not from the name hard-coded in the Configuration class - aliases.put("cadent_aperture_mx", "emx_digital"); final Map expectedMap = CollectionUtils.union(bidders, aliases.keySet()).stream() .collect(Collectors.toMap( Function.identity(), diff --git a/src/test/java/org/prebid/server/it/CadentApertureMxTest.java b/src/test/java/org/prebid/server/it/CadentApertureMxTest.java index e3b9a23ae6a..cc062921a3a 100644 --- a/src/test/java/org/prebid/server/it/CadentApertureMxTest.java +++ b/src/test/java/org/prebid/server/it/CadentApertureMxTest.java @@ -18,7 +18,7 @@ public class CadentApertureMxTest extends IntegrationTest { @Test public void openrtb2AuctionShouldRespondWithBidsFromCadentApertureMx() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/emx_digital-exchange")) + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/cadent_aperture_mx-exchange")) .withRequestBody( equalToJson(jsonFrom("openrtb2/cadentaperturemx/test-cadentaperturemx-bid-request.json"), true, false)) diff --git a/src/test/java/org/prebid/server/it/EmxdigitalTest.java b/src/test/java/org/prebid/server/it/EmxdigitalTest.java index 03b1da91fea..366e6ae7e01 100644 --- a/src/test/java/org/prebid/server/it/EmxdigitalTest.java +++ b/src/test/java/org/prebid/server/it/EmxdigitalTest.java @@ -18,7 +18,7 @@ public class EmxdigitalTest extends IntegrationTest { @Test public void openrtb2AuctionShouldRespondWithBidsFromEmxdigital() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/emx_digital-exchange")) + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/emxdigital-exchange")) .withRequestBody(equalToJson(jsonFrom("openrtb2/emxdigital/test-emxdigital-bid-request.json"), true, false)) .willReturn(aResponse().withBody(jsonFrom("openrtb2/emxdigital/test-emxdigital-bid-response.json")))); @@ -29,6 +29,23 @@ public void openrtb2AuctionShouldRespondWithBidsFromEmxdigital() throws IOExcept // then assertJsonEquals("openrtb2/emxdigital/test-auction-emxdigital-response.json", + response, singletonList("emxdigital")); + } + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromEmxUnderscoreDigital() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/emx_digital-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/emx_digital/test-emx_digital-bid-request.json"), + true, false)) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/emx_digital/test-emx_digital-bid-response.json")))); + + // when + final Response response = + responseFor("openrtb2/emx_digital/test-auction-emx_digital-request.json", Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/emx_digital/test-auction-emx_digital-response.json", response, singletonList("emx_digital")); } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-request.json b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-request.json new file mode 100644 index 00000000000..916e721b29c --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-request.json @@ -0,0 +1,27 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "prebid": { + "bidder": { + "emx_digital": { + "tagid": "25251" + } + } + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-response.json new file mode 100644 index 00000000000..0c7409ad7f1 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-auction-emx_digital-response.json @@ -0,0 +1,42 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "imp_id", + "impid": "imp_id", + "exp": 300, + "price": 2.942808, + "adm": "
", + "adid": "94395500", + "crid": "94395500", + "w": 300, + "h": 250, + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "emx_digital" + } + }, + "origbidcpm": 2.942808, + "origbidcur": "USD" + } + } + ], + "seat": "emx_digital", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "emx_digital": 0 + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-request.json new file mode 100644 index 00000000000..d903d68ab21 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-request.json @@ -0,0 +1,58 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "tagid": "25251", + "secure": 0, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "tagid": "25251" + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "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": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "http_method": "POST", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-response.json new file mode 100644 index 00000000000..c40dd3e89f8 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/emx_digital/test-emx_digital-bid-response.json @@ -0,0 +1,22 @@ +{ + "id": "some_test_auction", + "seatbid": [ + { + "seat": "12356", + "bid": [ + { + "id": "imp_id", + "adm": "