Skip to content

Commit c70227e

Browse files
pavel-ptashytspavel-ptashyts
committed
Rename adoppler bidder adapter to elementaltv add adoppler as alias to elemental for backward compatibility
1 parent 01acd95 commit c70227e

20 files changed

Lines changed: 141 additions & 155 deletions

‎src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/java/org/prebid/server/bidder/adoppler/AdopplerBidder.java renamed to src/main/java/org/prebid/server/bidder/elementaltv/ElementalTVBidder.java

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.bidder.adoppler;
1+
package org.prebid.server.bidder.elementaltv;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.core.type.TypeReference;
@@ -10,11 +10,18 @@
1010
import com.iab.openrtb.response.SeatBid;
1111
import io.vertx.core.MultiMap;
1212
import io.vertx.core.http.HttpMethod;
13+
import java.util.ArrayList;
14+
import java.util.Collection;
15+
import java.util.Collections;
16+
import java.util.HashMap;
17+
import java.util.List;
18+
import java.util.Map;
19+
import java.util.Objects;
1320
import org.apache.commons.lang3.StringUtils;
1421
import org.prebid.server.bidder.Bidder;
15-
import org.prebid.server.bidder.adoppler.model.AdopplerResponseAdsExt;
16-
import org.prebid.server.bidder.adoppler.model.AdopplerResponseExt;
17-
import org.prebid.server.bidder.adoppler.model.AdopplerResponseVideoAdsExt;
22+
import org.prebid.server.bidder.elementaltv.model.ElementalTVResponseAdsExt;
23+
import org.prebid.server.bidder.elementaltv.model.ElementalTVResponseExt;
24+
import org.prebid.server.bidder.elementaltv.model.ElementalTVResponseVideoAdsExt;
1825
import org.prebid.server.bidder.model.BidderBid;
1926
import org.prebid.server.bidder.model.BidderCall;
2027
import org.prebid.server.bidder.model.BidderError;
@@ -24,29 +31,20 @@
2431
import org.prebid.server.json.DecodeException;
2532
import org.prebid.server.json.JacksonMapper;
2633
import org.prebid.server.proto.openrtb.ext.ExtPrebid;
27-
import org.prebid.server.proto.openrtb.ext.request.adoppler.ExtImpAdoppler;
34+
import org.prebid.server.proto.openrtb.ext.request.elementaltv.ExtImpElementalTV;
2835
import org.prebid.server.proto.openrtb.ext.response.BidType;
2936
import org.prebid.server.util.HttpUtil;
3037

31-
import java.util.ArrayList;
32-
import java.util.Collection;
33-
import java.util.Collections;
34-
import java.util.HashMap;
35-
import java.util.List;
36-
import java.util.Map;
37-
import java.util.Objects;
38-
39-
public class AdopplerBidder implements Bidder<BidRequest> {
38+
public class ElementalTVBidder implements Bidder<BidRequest> {
4039

41-
private static final TypeReference<ExtPrebid<?, ExtImpAdoppler>> ADOPPLER_EXT_TYPE_REFERENCE =
40+
private static final TypeReference<ExtPrebid<?, ExtImpElementalTV>> ELEMENTALTV_EXT_TYPE_REFERENCE =
4241
new TypeReference<>() {
4342
};
44-
private static final String DEFAULT_CLIENT = "app";
4543

4644
private final String endpointTemplate;
4745
private final JacksonMapper mapper;
4846

49-
public AdopplerBidder(String endpointTemplate, JacksonMapper mapper) {
47+
public ElementalTVBidder(String endpointTemplate, JacksonMapper mapper) {
5048
this.endpointTemplate = HttpUtil.validateUrl(Objects.requireNonNull(endpointTemplate));
5149
this.mapper = Objects.requireNonNull(mapper);
5250
}
@@ -58,7 +56,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
5856

5957
for (Imp imp : request.getImp()) {
6058
try {
61-
final ExtImpAdoppler validExtImp = parseAndValidateImpExt(imp);
59+
final ExtImpElementalTV validExtImp = parseAndValidateImpExt(imp);
6260
final String updateRequestId = request.getId() + "-" + validExtImp.getAdunit();
6361
final BidRequest updateRequest = request.toBuilder().id(updateRequestId).build();
6462
final String url = resolveUrl(validExtImp);
@@ -71,29 +69,22 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
7169
return Result.of(result, errors);
7270
}
7371

74-
private ExtImpAdoppler parseAndValidateImpExt(Imp imp) {
75-
final ExtImpAdoppler extImpAdoppler;
72+
private ExtImpElementalTV parseAndValidateImpExt(Imp imp) {
73+
final ExtImpElementalTV extImpElementalTV;
7674
try {
77-
extImpAdoppler = mapper.mapper().convertValue(imp.getExt(), ADOPPLER_EXT_TYPE_REFERENCE).getBidder();
75+
extImpElementalTV = mapper.mapper().convertValue(imp.getExt(), ELEMENTALTV_EXT_TYPE_REFERENCE).getBidder();
7876
} catch (IllegalArgumentException e) {
7977
throw new PreBidException(e.getMessage());
8078
}
81-
if (StringUtils.isBlank(extImpAdoppler.getAdunit())) {
82-
throw new PreBidException("adunit parameter is required for adoppler bidder");
79+
if (StringUtils.isBlank(extImpElementalTV.getAdunit())) {
80+
throw new PreBidException("adunit parameter is required for elementaltv bidder");
8381
}
84-
return extImpAdoppler;
82+
return extImpElementalTV;
8583
}
8684

87-
private String resolveUrl(ExtImpAdoppler extImp) {
88-
final String client = extImp.getClient();
89-
85+
private String resolveUrl(ExtImpElementalTV extImp) {
9086
try {
91-
final String accountIdMacro = StringUtils.isBlank(client)
92-
? DEFAULT_CLIENT
93-
: HttpUtil.encodeUrl(client);
94-
9587
return endpointTemplate
96-
.replace("{{AccountID}}", accountIdMacro)
9788
.replace("{{AdUnit}}", HttpUtil.encodeUrl(extImp.getAdunit()));
9889
} catch (Exception e) {
9990
throw new PreBidException(e.getMessage());
@@ -171,17 +162,17 @@ private BidderBid createBid(Bid bid, Map<String, BidType> impTypes, String curre
171162

172163
private void validateVideoBidExt(Bid bid) {
173164
final ObjectNode extNode = bid.getExt();
174-
final AdopplerResponseExt ext = extNode != null ? parseResponseExt(extNode) : null;
175-
final AdopplerResponseAdsExt adsExt = ext != null ? ext.getAds() : null;
176-
final AdopplerResponseVideoAdsExt videoAdsExt = adsExt != null ? adsExt.getVideo() : null;
165+
final ElementalTVResponseExt ext = extNode != null ? parseResponseExt(extNode) : null;
166+
final ElementalTVResponseAdsExt adsExt = ext != null ? ext.getAds() : null;
167+
final ElementalTVResponseVideoAdsExt videoAdsExt = adsExt != null ? adsExt.getVideo() : null;
177168
if (videoAdsExt == null) {
178169
throw new PreBidException("$.seatbid.bid.ext.ads.video required");
179170
}
180171
}
181172

182-
private AdopplerResponseExt parseResponseExt(ObjectNode ext) {
173+
private ElementalTVResponseExt parseResponseExt(ObjectNode ext) {
183174
try {
184-
return mapper.mapper().treeToValue(ext, AdopplerResponseExt.class);
175+
return mapper.mapper().treeToValue(ext, ElementalTVResponseExt.class);
185176
} catch (JsonProcessingException e) {
186177
throw new PreBidException(e.getMessage(), e);
187178
}

‎src/main/java/org/prebid/server/bidder/elementaltv/model/ElementalTVResponseAdsExt.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.prebid.server.bidder.elementaltv.model;
2+
3+
import lombok.Value;
4+
5+
@Value(staticConstructor = "of")
6+
public class ElementalTVResponseAdsExt {
7+
8+
ElementalTVResponseVideoAdsExt video;
9+
}

‎src/main/java/org/prebid/server/bidder/elementaltv/model/ElementalTVResponseExt.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.prebid.server.bidder.elementaltv.model;
2+
3+
import lombok.Value;
4+
5+
@Value(staticConstructor = "of")
6+
public class ElementalTVResponseExt {
7+
8+
ElementalTVResponseAdsExt ads;
9+
}

‎src/main/java/org/prebid/server/bidder/elementaltv/model/ElementalTVResponseVideoAdsExt.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.prebid.server.bidder.elementaltv.model;
2+
3+
import lombok.Value;
4+
5+
@Value(staticConstructor = "of")
6+
public class ElementalTVResponseVideoAdsExt {
7+
8+
Integer duration;
9+
}

‎src/main/java/org/prebid/server/proto/openrtb/ext/request/adoppler/ExtImpAdoppler.java‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/java/org/prebid/server/proto/openrtb/ext/request/elementaltv/ExtImpElementalTV.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.prebid.server.proto.openrtb.ext.request.elementaltv;
2+
3+
import lombok.Value;
4+
5+
@Value(staticConstructor = "of")
6+
public class ExtImpElementalTV {
7+
8+
String adunit;
9+
}

src/main/java/org/prebid/server/spring/config/bidder/AdopplerConfiguration.java renamed to src/main/java/org/prebid/server/spring/config/bidder/ElementalTVConfiguration.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.prebid.server.spring.config.bidder;
22

3+
import jakarta.validation.constraints.NotBlank;
34
import org.prebid.server.bidder.BidderDeps;
4-
import org.prebid.server.bidder.adoppler.AdopplerBidder;
5+
import org.prebid.server.bidder.elementaltv.ElementalTVBidder;
56
import org.prebid.server.json.JacksonMapper;
67
import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties;
78
import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler;
@@ -13,29 +14,27 @@
1314
import org.springframework.context.annotation.Configuration;
1415
import org.springframework.context.annotation.PropertySource;
1516

16-
import jakarta.validation.constraints.NotBlank;
17-
1817
@Configuration
19-
@PropertySource(value = "classpath:/bidder-config/adoppler.yaml", factory = YamlPropertySourceFactory.class)
20-
public class AdopplerConfiguration {
18+
@PropertySource(value = "classpath:/bidder-config/elementaltv.yaml", factory = YamlPropertySourceFactory.class)
19+
public class ElementalTVConfiguration {
2120

22-
private static final String BIDDER_NAME = "adoppler";
21+
private static final String BIDDER_NAME = "elementaltv";
2322

24-
@Bean("adopplerConfigurationProperties")
25-
@ConfigurationProperties("adapters.adoppler")
23+
@Bean("elementalTVConfigurationProperties")
24+
@ConfigurationProperties("adapters.elementaltv")
2625
BidderConfigurationProperties configurationProperties() {
2726
return new BidderConfigurationProperties();
2827
}
2928

3029
@Bean
31-
BidderDeps adopplerBidderDeps(BidderConfigurationProperties adopplerConfigurationProperties,
30+
BidderDeps elementaltvBidderDeps(BidderConfigurationProperties elementalTVConfigurationProperties,
3231
@NotBlank @Value("${external-url}") String externalUrl,
3332
JacksonMapper mapper) {
3433

3534
return BidderDepsAssembler.forBidder(BIDDER_NAME)
36-
.withConfig(adopplerConfigurationProperties)
35+
.withConfig(elementalTVConfigurationProperties)
3736
.usersyncerCreator(UsersyncerCreator.create(externalUrl))
38-
.bidderCreator(config -> new AdopplerBidder(config.getEndpoint(), mapper))
37+
.bidderCreator(config -> new ElementalTVBidder(config.getEndpoint(), mapper))
3938
.assemble();
4039
}
4140
}

0 commit comments

Comments
 (0)