Skip to content

Commit ea8225a

Browse files
CTMBNaraCTMBNara
committed
Resolve conflicts
1 parent 92de919 commit ea8225a

2 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎src/main/java/org/prebid/server/auction/bidderrequestpostprocessor/BidderRequestCleaner.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.prebid.server.auction.aliases.BidderAliases;
1010
import org.prebid.server.auction.model.AuctionContext;
1111
import org.prebid.server.auction.model.BidderRequest;
12-
import org.prebid.server.bidder.model.Result;
1312
import org.prebid.server.model.UpdateResult;
1413
import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
1514
import org.prebid.server.proto.openrtb.ext.request.ExtRequestBidAdjustmentFactors;
@@ -27,9 +26,9 @@
2726
public class BidderRequestCleaner implements BidderRequestPostProcessor {
2827

2928
@Override
30-
public Future<Result<BidderRequest>> process(BidderRequest bidderRequest,
31-
BidderAliases aliases,
32-
AuctionContext auctionContext) {
29+
public Future<BidderRequestPostProcessingResult> process(BidderRequest bidderRequest,
30+
BidderAliases aliases,
31+
AuctionContext auctionContext) {
3332

3433
final BidRequest bidRequest = bidderRequest.getBidRequest();
3534
final UpdateResult<ExtRequest> cleanedExt = cleanExt(bidRequest.getExt(), bidderRequest.getBidder());
@@ -38,7 +37,7 @@ public Future<Result<BidderRequest>> process(BidderRequest bidderRequest,
3837
? bidderRequest.with(bidRequest.toBuilder().ext(cleanedExt.getValue()).build())
3938
: bidderRequest;
4039

41-
return Future.succeededFuture(Result.of(cleanedBidderRequest, Collections.emptyList()));
40+
return Future.succeededFuture(BidderRequestPostProcessingResult.withValue(cleanedBidderRequest));
4241
}
4342

4443
private UpdateResult<ExtRequest> cleanExt(ExtRequest ext, String bidder) {

‎src/test/java/org/prebid/server/auction/bidderrequestpostprocessor/BidderRequestCleanerTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void processShouldCleanBidAdjustmentFactors() {
6868
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.bidadjustmentfactors(factors));
6969

7070
// when
71-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
71+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
7272

7373
// then
7474
assertThat(result.getValue())
@@ -97,7 +97,7 @@ public void processShouldRemoveBidAdjustmentFactors() {
9797
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.bidadjustmentfactors(factors));
9898

9999
// when
100-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
100+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
101101

102102
// then
103103
assertThat(result.getValue())
@@ -120,7 +120,7 @@ public void processShouldCleanBidAdjustments() {
120120
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.bidadjustments(bidAdjustments));
121121

122122
// when
123-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
123+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
124124

125125
// then
126126
assertThat(result.getValue())
@@ -141,7 +141,7 @@ public void processShouldRemoveBidAdjustments() {
141141
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.bidadjustments(bidAdjustments));
142142

143143
// when
144-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
144+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
145145

146146
// then
147147
assertThat(result.getValue())
@@ -164,7 +164,7 @@ public void processShouldCleanAlternateBidderCodes() {
164164
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.alternateBidderCodes(codes));
165165

166166
// when
167-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
167+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
168168

169169
// then
170170
assertThat(result.getValue())
@@ -183,7 +183,7 @@ public void processShouldRemoveReturnAllBidStatus() {
183183
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.returnallbidstatus(true));
184184

185185
// when
186-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
186+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
187187

188188
// then
189189
assertThat(result.getValue())
@@ -201,7 +201,7 @@ public void processShouldRemoveAliasGvlIds() {
201201
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.aliasgvlids(emptyMap()));
202202

203203
// when
204-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
204+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
205205

206206
// then
207207
assertThat(result.getValue())
@@ -219,7 +219,7 @@ public void processShouldRemoveAdServerTargeting() {
219219
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.adservertargeting(emptyList()));
220220

221221
// when
222-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
222+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
223223

224224
// then
225225
assertThat(result.getValue())
@@ -238,7 +238,7 @@ public void processShouldRemoveCache() {
238238
extPrebid -> extPrebid.cache(ExtRequestPrebidCache.EMPTY));
239239

240240
// when
241-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
241+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
242242

243243
// then
244244
assertThat(result.getValue())
@@ -257,7 +257,7 @@ public void processShouldRemoveEvents() {
257257
extPrebid -> extPrebid.events(mapper.createObjectNode()));
258258

259259
// when
260-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
260+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
261261

262262
// then
263263
assertThat(result.getValue())
@@ -275,7 +275,7 @@ public void processShouldRemoveNoSale() {
275275
final BidderRequest bidderRequest = givenBidderRequest(extPrebid -> extPrebid.nosale(emptyList()));
276276

277277
// when
278-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
278+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
279279

280280
// then
281281
assertThat(result.getValue())
@@ -313,7 +313,7 @@ public void processShouldRemoveAnalytics() {
313313
extPrebid -> extPrebid.analytics(mapper.createObjectNode()));
314314

315315
// when
316-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
316+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
317317

318318
// then
319319
assertThat(result.getValue())
@@ -332,7 +332,7 @@ public void processShouldRemovePassthrough() {
332332
extPrebid -> extPrebid.passthrough(mapper.createObjectNode()));
333333

334334
// when
335-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
335+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
336336

337337
// then
338338
assertThat(result.getValue())
@@ -351,7 +351,7 @@ public void processShouldRemoveKvps() {
351351
extPrebid -> extPrebid.kvps(mapper.createObjectNode()));
352352

353353
// when
354-
final Result<BidderRequest> result = target.process(bidderRequest, null, null).result();
354+
final BidderRequestPostProcessingResult result = target.process(bidderRequest, null, null).result();
355355

356356
// then
357357
assertThat(result.getValue())

0 commit comments

Comments
 (0)