diff --git a/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java b/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java similarity index 91% rename from src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java rename to src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java index e7b7f71432d..276aa0e39b7 100644 --- a/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java +++ b/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.conversant; +package org.prebid.server.bidder.epsilon; import com.fasterxml.jackson.core.type.TypeReference; import com.iab.openrtb.request.App; @@ -22,7 +22,7 @@ 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.conversant.ExtImpConversant; +import org.prebid.server.proto.openrtb.ext.request.epsilon.ExtImpEpsilon; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; @@ -37,9 +37,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -public class ConversantBidder implements Bidder { +public class EpsilonBidder implements Bidder { - private static final TypeReference> CONVERSANT_EXT_TYPE_REFERENCE = + private static final TypeReference> EPSILON_EXT_TYPE_REFERENCE = new TypeReference<>() { }; @@ -59,7 +59,7 @@ public class ConversantBidder implements Bidder { private final boolean generateBidId; private final JacksonMapper mapper; - public ConversantBidder(String endpointUrl, boolean generateBidId, JacksonMapper mapper) { + public EpsilonBidder(String endpointUrl, boolean generateBidId, JacksonMapper mapper) { this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); this.generateBidId = generateBidId; this.mapper = Objects.requireNonNull(mapper); @@ -83,12 +83,12 @@ private BidRequest createOutgoingRequest(BidRequest bidRequest) { final List requestImps = bidRequest.getImp(); for (int i = 0; i < requestImps.size(); i++) { final Imp imp = requestImps.get(i); - final ExtImpConversant impExt = parseImpExt(imp, i); + final ExtImpEpsilon impExt = parseImpExt(imp, i); modifiedImps.add(modifyImp(imp, impExt)); } final Imp firstImp = requestImps.get(0); - final ExtImpConversant extImp = parseImpExt(firstImp, 0); + final ExtImpEpsilon extImp = parseImpExt(firstImp, 0); final String siteId = extImp.getSiteId(); final Site requestSite = bidRequest.getSite(); final App requestApp = bidRequest.getApp(); @@ -100,10 +100,10 @@ private BidRequest createOutgoingRequest(BidRequest bidRequest) { .build(); } - private ExtImpConversant parseImpExt(Imp imp, int impIndex) { - final ExtImpConversant extImp; + private ExtImpEpsilon parseImpExt(Imp imp, int impIndex) { + final ExtImpEpsilon extImp; try { - extImp = mapper.mapper().convertValue(imp.getExt(), CONVERSANT_EXT_TYPE_REFERENCE).getBidder(); + extImp = mapper.mapper().convertValue(imp.getExt(), EPSILON_EXT_TYPE_REFERENCE).getBidder(); } catch (IllegalArgumentException e) { throw new PreBidException("Impression[%d] missing ext.bidder object".formatted(impIndex)); } @@ -122,7 +122,7 @@ private static App updateApp(App app, String siteId) { return app == null ? null : app.toBuilder().id(siteId).build(); } - private static Imp modifyImp(Imp imp, ExtImpConversant impExt) { + private static Imp modifyImp(Imp imp, ExtImpEpsilon impExt) { final Banner banner = imp.getBanner(); final Video video = imp.getVideo(); @@ -148,7 +148,7 @@ private static BigDecimal getBidFloor(BigDecimal impBidFloor, BigDecimal impExtB : impBidFloor; } - private static Integer getSecure(Imp imp, ExtImpConversant impExt) { + private static Integer getSecure(Imp imp, ExtImpEpsilon impExt) { final Integer extSecure = impExt.getSecure(); final Integer impSecure = imp.getSecure(); @@ -163,7 +163,7 @@ private static Banner modifyBanner(Banner impBanner, Integer extPosition) { .build(); } - private static Video modifyVideo(Video video, ExtImpConversant impExt) { + private static Video modifyVideo(Video video, ExtImpEpsilon impExt) { final List extMimes = impExt.getMimes(); final Integer extMaxDuration = impExt.getMaxduration(); final Integer extPosition = impExt.getPosition(); diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/conversant/ExtImpConversant.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/epsilon/ExtImpEpsilon.java similarity index 78% rename from src/main/java/org/prebid/server/proto/openrtb/ext/request/conversant/ExtImpConversant.java rename to src/main/java/org/prebid/server/proto/openrtb/ext/request/epsilon/ExtImpEpsilon.java index 35ff14830e2..c513f9e873a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/conversant/ExtImpConversant.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/epsilon/ExtImpEpsilon.java @@ -1,4 +1,4 @@ -package org.prebid.server.proto.openrtb.ext.request.conversant; +package org.prebid.server.proto.openrtb.ext.request.epsilon; import lombok.Builder; import lombok.Value; @@ -8,7 +8,7 @@ @Builder @Value -public class ExtImpConversant { +public class ExtImpEpsilon { String siteId; diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ConversantConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java similarity index 64% rename from src/main/java/org/prebid/server/spring/config/bidder/ConversantConfiguration.java rename to src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java index a2550f00261..3025a45289c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ConversantConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.prebid.server.bidder.BidderDeps; -import org.prebid.server.bidder.conversant.ConversantBidder; +import org.prebid.server.bidder.epsilon.EpsilonBidder; import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; @@ -21,29 +21,29 @@ import javax.validation.constraints.NotNull; @Configuration -@PropertySource(value = "classpath:/bidder-config/conversant.yaml", factory = YamlPropertySourceFactory.class) -public class ConversantConfiguration { +@PropertySource(value = "classpath:/bidder-config/epsilon.yaml", factory = YamlPropertySourceFactory.class) +public class EpsilonConfiguration { - private static final String BIDDER_NAME = "conversant"; + private static final String BIDDER_NAME = "epsilon"; - @Bean("conversantConfigurationProperties") - @ConfigurationProperties("adapters.conversant") - ConversantConfigurationProperties configurationProperties() { - return new ConversantConfigurationProperties(); + @Bean("epsilonConfigurationProperties") + @ConfigurationProperties("adapters.epsilon") + EpsilonConfigurationProperties configurationProperties() { + return new EpsilonConfigurationProperties(); } @Bean - BidderDeps conversantBidderDeps(ConversantConfigurationProperties conversantConfigurationProperties, + BidderDeps epsilonBidderDeps(EpsilonConfigurationProperties epsilonConfigurationProperties, @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) - .withConfig(conversantConfigurationProperties) + .withConfig(epsilonConfigurationProperties) .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> - new ConversantBidder( + new EpsilonBidder( config.getEndpoint(), - conversantConfigurationProperties.getGenerateBidId(), + epsilonConfigurationProperties.getGenerateBidId(), mapper)) .assemble(); } @@ -52,7 +52,7 @@ BidderDeps conversantBidderDeps(ConversantConfigurationProperties conversantConf @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor - private static class ConversantConfigurationProperties extends BidderConfigurationProperties { + private static class EpsilonConfigurationProperties extends BidderConfigurationProperties { @NotNull private Boolean generateBidId; diff --git a/src/main/resources/bidder-config/conversant.yaml b/src/main/resources/bidder-config/epsilon.yaml similarity index 73% rename from src/main/resources/bidder-config/conversant.yaml rename to src/main/resources/bidder-config/epsilon.yaml index c276c54cb38..8fea3cc382b 100644 --- a/src/main/resources/bidder-config/conversant.yaml +++ b/src/main/resources/bidder-config/epsilon.yaml @@ -1,8 +1,12 @@ adapters: - conversant: + epsilon: endpoint: http://api.hb.ad.cpe.dotomi.com/s2s/header/24 + aliases: + conversant: + usersync: + cookie-family-name: conversant meta-info: - maintainer-email: CNVR_PublisherIntegration@conversantmedia.com + maintainer-email: PublisherIntegration@epsilon.com app-media-types: - banner - video @@ -12,7 +16,7 @@ adapters: supported-vendors: vendor-id: 24 usersync: - cookie-family-name: conversant + cookie-family-name: epsilon redirect: url: https://prebid-match.dotomi.com/match/bounce/current?version=1&networkId=72582&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&gpp={{gpp}}&gpp_sid={{gpp_sid}}&rurl={{redirect_url}} support-cors: false diff --git a/src/main/resources/static/bidder-params/conversant.json b/src/main/resources/static/bidder-params/epsilon.json similarity index 87% rename from src/main/resources/static/bidder-params/conversant.json rename to src/main/resources/static/bidder-params/epsilon.json index 947a38b5be6..4adeff07c16 100644 --- a/src/main/resources/static/bidder-params/conversant.json +++ b/src/main/resources/static/bidder-params/epsilon.json @@ -1,12 +1,12 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Conversant Adapter Params", - "description": "A schema which validates params accepted by the Conversant adapter.", + "title": "Epsilon (formerly Conversant) Adapter Params", + "description": "A schema which validates params accepted by the Epsilon (Conversant) adapter.", "type": "object", "properties": { "site_id": { "type": "string", - "description": "A Conversant specific ID which identifies the site." + "description": "An Epsilon (Conversant) specific ID which identifies the site." }, "secure": { "type": "integer", diff --git a/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java b/src/test/java/org/prebid/server/bidder/epsilon/EpsilonBidderTest.java similarity index 96% rename from src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java rename to src/test/java/org/prebid/server/bidder/epsilon/EpsilonBidderTest.java index 6217c686c6e..f357c3df365 100644 --- a/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/epsilon/EpsilonBidderTest.java @@ -1,4 +1,4 @@ -package org.prebid.server.bidder.conversant; +package org.prebid.server.bidder.epsilon; import com.fasterxml.jackson.core.JsonProcessingException; import com.iab.openrtb.request.App; @@ -19,7 +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.conversant.ExtImpConversant; +import org.prebid.server.proto.openrtb.ext.request.epsilon.ExtImpEpsilon; import java.math.BigDecimal; import java.util.Collections; @@ -35,18 +35,18 @@ import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; -public class ConversantBidderTest extends VertxTest { +public class EpsilonBidderTest extends VertxTest { private static final String ENDPOINT_URL = "https://test.endpoint.com"; private static final String UUID_REGEX = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}" + "-[0-9a-fA-F]{12}"; - private ConversantBidder target = new ConversantBidder(ENDPOINT_URL, false, jacksonMapper); + private EpsilonBidder target = new EpsilonBidder(ENDPOINT_URL, false, jacksonMapper); @Test public void creationShouldFailOnInvalidEndpointUrl() { assertThatIllegalArgumentException() - .isThrownBy(() -> new ConversantBidder("invalid_url", false, jacksonMapper)); + .isThrownBy(() -> new EpsilonBidder("invalid_url", false, jacksonMapper)); } @Test @@ -146,7 +146,7 @@ public void makeHttpRequestsShouldSetSiteIdFromExtSiteIdIfSiteIdIsNullOrEmpty() final BidRequest bidRequest = givenBidRequest( requestBuilder -> requestBuilder.site(Site.builder().id(null).build()), impBuilder -> impBuilder.ext(mapper.valueToTree(ExtPrebid.of(null, - ExtImpConversant.builder().mobile(123).siteId("site id").build()))), + ExtImpEpsilon.builder().mobile(123).siteId("site id").build()))), identity()); // when @@ -595,7 +595,7 @@ public void makeBidsShouldReturnVideoBidIfRequestImpHasVideo() throws JsonProces @Test public void makeBidsShouldUpdateBidWithUUIDIfGenerateBidIdIsTrue() throws JsonProcessingException { // given - target = new ConversantBidder(ENDPOINT_URL, true, jacksonMapper); + target = new EpsilonBidder(ENDPOINT_URL, true, jacksonMapper); final BidderCall httpCall = givenHttpCall( givenBidRequest(builder -> builder.id("123") .banner(Banner.builder().build())), @@ -655,8 +655,8 @@ public void makeHttpRequestsShouldNotSetImpBidFloorFromImpExt() { private static BidRequest givenBidRequest( Function bidRequestCustomizer, Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return bidRequestCustomizer.apply(BidRequest.builder() .imp(singletonList(givenImp(impCustomizer, extCustomizer)))) @@ -669,21 +669,21 @@ private static BidRequest givenBidRequest(Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return givenBidRequest(identity(), impCustomizer, extCustomizer); } private static Imp givenImp( Function impCustomizer, - Function extCustomizer) { + Function extCustomizer) { return impCustomizer.apply(Imp.builder() .id("123") .ext(mapper.valueToTree(ExtPrebid.of(null, - extCustomizer.apply(ExtImpConversant.builder().siteId("site id")).build())))) + extCustomizer.apply(ExtImpEpsilon.builder().siteId("site id")).build())))) .build(); } diff --git a/src/test/java/org/prebid/server/it/ConversantTest.java b/src/test/java/org/prebid/server/it/EpsilonTest.java similarity index 51% rename from src/test/java/org/prebid/server/it/ConversantTest.java rename to src/test/java/org/prebid/server/it/EpsilonTest.java index 69b0430a8fb..07319915263 100644 --- a/src/test/java/org/prebid/server/it/ConversantTest.java +++ b/src/test/java/org/prebid/server/it/EpsilonTest.java @@ -17,41 +17,41 @@ import static java.util.Collections.singletonList; @RunWith(SpringRunner.class) -public class ConversantTest extends IntegrationTest { +public class EpsilonTest extends IntegrationTest { - private static final String CONVERSANT = "conversant"; - private static final String CONVERSANT_ALIAS = "conversantAlias"; + private static final String EPSILON = "epsilon"; + private static final String EPSILON_ALIAS = "conversant"; @Test - public void openrtb2AuctionShouldRespondWithBidsFromConversant() throws IOException, JSONException { + public void openrtb2AuctionShouldRespondWithBidsFromEpsilon() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/conversant-exchange")) - .withRequestBody(equalToJson(jsonFrom("openrtb2/conversant/test-conversant-bid-request.json"))) - .willReturn(aResponse().withBody(jsonFrom("openrtb2/conversant/test-conversant-bid-response.json")))); + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/epsilon-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/epsilon/test-epsilon-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/epsilon/test-epsilon-bid-response.json")))); // when - final Response response = responseFor("openrtb2/conversant/test-auction-conversant-request.json", + final Response response = responseFor("openrtb2/epsilon/test-auction-epsilon-request.json", Endpoint.openrtb2_auction); // then - assertJsonEquals("openrtb2/conversant/test-auction-conversant-response.json", response, - singletonList(CONVERSANT)); + assertJsonEquals("openrtb2/epsilon/test-auction-epsilon-response.json", response, + singletonList(EPSILON)); } @Test - public void openrtb2AuctionShouldRespondWithBidsFromConversantAlias() throws IOException, JSONException { + public void openrtb2AuctionShouldRespondWithBidsFromConversant() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/conversant-exchange")) - .withRequestBody(equalToJson(jsonFrom("openrtb2/conversant/alias/test-conversant-bid-request.json"))) + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/epsilon-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/epsilon/alias/test-epsilon-bid-request.json"))) .willReturn(aResponse().withBody( - jsonFrom("openrtb2/conversant/alias/test-conversant-bid-response.json")))); + jsonFrom("openrtb2/epsilon/alias/test-epsilon-bid-response.json")))); // when - final Response response = responseFor("openrtb2/conversant/alias/test-auction-conversant-request.json", + final Response response = responseFor("openrtb2/epsilon/alias/test-auction-epsilon-request.json", Endpoint.openrtb2_auction); // then - assertJsonEquals("openrtb2/conversant/alias/test-auction-conversant-response.json", response, - asList(CONVERSANT, CONVERSANT_ALIAS)); + assertJsonEquals("openrtb2/epsilon/alias/test-auction-epsilon-response.json", response, + asList(EPSILON, EPSILON_ALIAS)); } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-request.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-request.json similarity index 73% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-request.json index fd1e565b076..8f0e96aa1e3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-request.json @@ -8,7 +8,7 @@ "h": 600 }, "ext": { - "conversantAlias": { + "conversant": { "site_id": "site_id" } } @@ -17,15 +17,18 @@ "tmax": 5000, "ext": { "prebid": { - "aliases": { - "conversantAlias": "conversant" + "conversant": { + "site_id": "site_id" }, "auctiontimestamp": 0 } }, + "aliases": { + "conversant": "epsilon" + }, "regs": { "ext": { "gdpr": 0 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json similarity index 91% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json index 1f664173137..aadd13302aa 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-auction-epsilon-response.json @@ -6,7 +6,7 @@ { "id": "bid_id", "impid": "imp_id", - "price": 6.0, + "price": 5.0, "adm": "adm4", "crid": "crid4", "w": 300, @@ -15,7 +15,7 @@ "prebid": { "type": "banner" }, - "origbidcpm": 6.0 + "origbidcpm": 5.0 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-conversant-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-epsilon-bid-request.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-conversant-bid-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-epsilon-bid-request.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-conversant-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-epsilon-bid-response.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-conversant-bid-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/alias/test-epsilon-bid-response.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-request.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-request.json similarity index 91% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-request.json index 1c833f4957e..6a9f9405096 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-request.json @@ -8,7 +8,7 @@ "h": 600 }, "ext": { - "conversant": { + "epsilon": { "site_id": "site_id" } } @@ -20,4 +20,4 @@ "gdpr": 0 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json similarity index 76% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json index dd6212eed91..8cb45ddcbac 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-auction-epsilon-response.json @@ -6,7 +6,7 @@ { "id": "bid_id", "impid": "imp_id", - "price": 5.0, + "price": 6.0, "adm": "adm4", "crid": "crid4", "w": 300, @@ -15,18 +15,18 @@ "prebid": { "type": "banner" }, - "origbidcpm": 5.0 + "origbidcpm": 6.0 } } ], - "seat": "conversantAlias", + "seat": "epsilon", "group": 0 } ], "cur": "USD", "ext": { "responsetimemillis": { - "conversantAlias": "{{ conversantAlias.response_time_ms }}" + "epsilon": "{{ epsilon.response_time_ms }}" }, "prebid": { "auctiontimestamp": 0 diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-conversant-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-epsilon-bid-request.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/test-conversant-bid-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-epsilon-bid-request.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-conversant-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-epsilon-bid-response.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/conversant/test-conversant-bid-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/epsilon/test-epsilon-bid-response.json 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 d136e19d83c..aa87f4b8ce4 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -128,9 +128,6 @@ adapters.coinzilla.enabled=true adapters.coinzilla.endpoint=http://localhost:8090/coinzilla-exchange adapters.consumable.enabled=true adapters.consumable.endpoint=http://localhost:8090/consumable-exchange -adapters.conversant.enabled=true -adapters.conversant.endpoint=http://localhost:8090/conversant-exchange -adapters.conversant.generate-bid-id=false adapters.criteo.enabled=true adapters.criteo.endpoint=http://localhost:8090/criteo-exchange adapters.criteo.generate-slot-id=false @@ -156,6 +153,9 @@ adapters.eplanning.enabled=true adapters.eplanning.endpoint=http://localhost:8090/eplanning-exchange adapters.epom.enabled=true adapters.epom.endpoint=http://localhost:8090/epom-exchange +adapters.epsilon.enabled=true +adapters.epsilon.endpoint=http://localhost:8090/epsilon-exchange +adapters.epsilon.generate-bid-id=false adapters.evolution.enabled=true adapters.evolution.endpoint=http://localhost:8090/evolution-exchange adapters.evtech.enabled=true