Skip to content

Commit 5717e39

Browse files
CTMBNaraCTMBNara
committed
Fix units
1 parent d2448c7 commit 5717e39

17 files changed

Lines changed: 372 additions & 155 deletions

‎sample/configs/prebid-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ settings:
2424
settings-filename: sample/configs/sample-app-settings.yaml
2525
stored-requests-dir: sample
2626
stored-imps-dir: sample
27+
profiles-dir: sample
2728
stored-responses-dir: sample
2829
categories-dir:
2930
gdpr:

‎src/main/java/org/prebid/server/auction/externalortb/ProfilesProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.iab.openrtb.request.BidRequest;
77
import com.iab.openrtb.request.Imp;
88
import io.vertx.core.Future;
9+
import org.apache.commons.lang3.StringUtils;
910
import org.prebid.server.auction.model.AuctionContext;
1011
import org.prebid.server.exception.InvalidProfileException;
1112
import org.prebid.server.exception.InvalidRequestException;
@@ -83,7 +84,7 @@ public Future<BidRequest> process(AuctionContext auctionContext, BidRequest bidR
8384

8485
final String accountId = Optional.ofNullable(auctionContext.getAccount())
8586
.map(Account::getId)
86-
.orElse(null);
87+
.orElse(StringUtils.EMPTY);
8788

8889
return fetchProfiles(accountId, profilesIds, timeoutMillis(bidRequest))
8990
.compose(profiles -> emitMetrics(accountId, profiles, auctionContext))

‎src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ private Future<String> findAccountIdFrom(AuctionContext auctionContext,
483483
}
484484

485485
return accountIdFromStored(bidRequest)
486-
.compose(id -> StringUtils.isBlank(accountId)
486+
.compose(id -> StringUtils.isBlank(id)
487487
? accountIdFromProfiles(auctionContext, bidRequest)
488488
: Future.succeededFuture(id));
489489
}
@@ -512,7 +512,7 @@ private String parentAccountIdFromExtPublisher(ExtPublisher extPublisher) {
512512
}
513513

514514
private Future<String> accountIdFromStored(BidRequest bidRequest) {
515-
return storedRequestProcessor.processAuctionRequest(null, bidRequest)
515+
return storedRequestProcessor.processAuctionRequest(StringUtils.EMPTY, bidRequest)
516516
.map(AuctionStoredResult::bidRequest)
517517
.map(this::accountIdFromBidRequest);
518518
}

‎src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public Future<StoredDataResult<String>> getAmpStoredData(String accountId,
160160
return fetchStoredData(
161161
selectAmpStoredRequestsQuery,
162162
requestIds,
163-
impIds,
163+
Collections.emptySet(),
164164
result -> DatabaseStoredDataResultMapper.map(result, accountId, requestIds, impIds),
165165
timeout);
166166
}

‎src/main/java/org/prebid/server/settings/HttpApplicationSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public Future<StoredDataResult<String>> getAmpStoredData(String accountId,
176176
Set<String> impIds,
177177
Timeout timeout) {
178178

179-
return fetchStoredData(ampEndpoint, requestIds, impIds, timeout);
179+
return fetchStoredData(ampEndpoint, requestIds, Collections.emptySet(), timeout);
180180
}
181181

182182
@Override

‎src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.prebid.server.auction.GeoLocationServiceWrapper;
3131
import org.prebid.server.auction.ImplicitParametersExtractor;
3232
import org.prebid.server.auction.OrtbTypesResolver;
33+
import org.prebid.server.auction.externalortb.ProfilesProcessor;
3334
import org.prebid.server.auction.externalortb.StoredRequestProcessor;
3435
import org.prebid.server.auction.gpp.AmpGppService;
3536
import org.prebid.server.auction.model.AuctionContext;
@@ -72,12 +73,12 @@
7273
import java.util.HashMap;
7374
import java.util.List;
7475
import java.util.Map;
75-
import java.util.function.Function;
76+
import java.util.function.UnaryOperator;
7677

7778
import static java.util.Arrays.asList;
7879
import static java.util.Collections.singletonList;
7980
import static java.util.Collections.singletonMap;
80-
import static java.util.function.Function.identity;
81+
import static java.util.function.UnaryOperator.identity;
8182
import static org.apache.commons.lang3.StringUtils.EMPTY;
8283
import static org.assertj.core.api.Assertions.assertThat;
8384
import static org.assertj.core.api.Assertions.tuple;
@@ -103,6 +104,8 @@ public class AmpRequestFactoryTest extends VertxTest {
103104
@Mock(strictness = LENIENT)
104105
private StoredRequestProcessor storedRequestProcessor;
105106
@Mock(strictness = LENIENT)
107+
private ProfilesProcessor profilesProcessor;
108+
@Mock(strictness = LENIENT)
106109
private BidRequestOrtbVersionConversionManager ortbVersionConversionManager;
107110
@Mock(strictness = LENIENT)
108111
private AmpGppService ampGppService;
@@ -139,6 +142,9 @@ public void setUp() {
139142
given(ortbVersionConversionManager.convertToAuctionSupportedVersion(any()))
140143
.willAnswer(invocation -> invocation.getArgument(0));
141144

145+
given(profilesProcessor.process(any(), any()))
146+
.willAnswer(invocation -> Future.succeededFuture(invocation.getArgument(1)));
147+
142148
given(ampGppService.contextFrom(any())).willReturn(Future.succeededFuture());
143149
given(ampGppService.updateBidRequest(any(), any()))
144150
.willAnswer(invocation -> invocation.getArgument(0));
@@ -191,6 +197,7 @@ public void setUp() {
191197
target = new AmpRequestFactory(
192198
ortb2RequestFactory,
193199
storedRequestProcessor,
200+
profilesProcessor,
194201
ortbVersionConversionManager,
195202
ampGppService,
196203
ortbTypesResolver,
@@ -1736,9 +1743,9 @@ public void shouldUpdateTimeout() {
17361743
.isEqualTo(10000L);
17371744
}
17381745

1739-
private void givenBidRequest(
1740-
Function<BidRequest.BidRequestBuilder, BidRequest.BidRequestBuilder> storedBidRequestBuilderCustomizer,
1741-
Imp... imps) {
1746+
private void givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> storedBidRequestBuilderCustomizer,
1747+
Imp... imps) {
1748+
17421749
final List<Imp> impList = imps.length > 0 ? asList(imps) : null;
17431750

17441751
given(storedRequestProcessor.processAmpRequest(any(), anyString(), any()))

‎src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.prebid.server.auction.ImplicitParametersExtractor;
3131
import org.prebid.server.auction.InterstitialProcessor;
3232
import org.prebid.server.auction.OrtbTypesResolver;
33+
import org.prebid.server.auction.externalortb.ProfilesProcessor;
3334
import org.prebid.server.auction.externalortb.StoredRequestProcessor;
3435
import org.prebid.server.auction.gpp.AuctionGppService;
3536
import org.prebid.server.auction.model.AuctionContext;
@@ -89,6 +90,8 @@ public class AuctionRequestFactoryTest extends VertxTest {
8990
@Mock(strictness = LENIENT)
9091
private StoredRequestProcessor storedRequestProcessor;
9192
@Mock(strictness = LENIENT)
93+
private ProfilesProcessor profilesProcessor;
94+
@Mock(strictness = LENIENT)
9295
private BidRequestOrtbVersionConversionManager ortbVersionConversionManager;
9396
@Mock(strictness = LENIENT)
9497
private AuctionGppService auctionGppService;
@@ -146,6 +149,9 @@ public void setUp() {
146149
.debugContext(DebugContext.of(true, true, null))
147150
.build();
148151

152+
given(profilesProcessor.process(any(), any()))
153+
.willAnswer(invocation -> Future.succeededFuture(invocation.getArgument(1)));
154+
149155
given(ortbVersionConversionManager.convertToAuctionSupportedVersion(any()))
150156
.willAnswer(invocation -> invocation.getArgument(0));
151157

@@ -207,6 +213,7 @@ public void setUp() {
207213
Integer.MAX_VALUE,
208214
ortb2RequestFactory,
209215
storedRequestProcessor,
216+
profilesProcessor,
210217
ortbVersionConversionManager,
211218
auctionGppService,
212219
cookieDeprecationService,
@@ -243,6 +250,7 @@ public void shouldReturnFailedFutureIfRequestBodyExceedsMaxRequestSize() {
243250
1,
244251
ortb2RequestFactory,
245252
storedRequestProcessor,
253+
profilesProcessor,
246254
ortbVersionConversionManager,
247255
auctionGppService,
248256
cookieDeprecationService,

‎src/test/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactoryTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.prebid.server.activity.infrastructure.creator.ActivityInfrastructureCreator;
2929
import org.prebid.server.auction.IpAddressHelper;
3030
import org.prebid.server.auction.TimeoutResolver;
31+
import org.prebid.server.auction.externalortb.ProfilesProcessor;
3132
import org.prebid.server.auction.externalortb.StoredRequestProcessor;
3233
import org.prebid.server.auction.model.AuctionContext;
3334
import org.prebid.server.auction.model.AuctionStoredResult;
@@ -123,6 +124,8 @@ public class Ortb2RequestFactoryTest extends VertxTest {
123124
@Mock
124125
private StoredRequestProcessor storedRequestProcessor;
125126
@Mock(strictness = LENIENT)
127+
private ProfilesProcessor profilesProcessor;
128+
@Mock(strictness = LENIENT)
126129
private ApplicationSettings applicationSettings;
127130
@Mock
128131
private IpAddressHelper ipAddressHelper;
@@ -150,6 +153,9 @@ public void setUp() {
150153

151154
given(timeoutResolver.limitToMax(any())).willReturn(2000L);
152155

156+
given(profilesProcessor.process(any(), any()))
157+
.willAnswer(invocation -> Future.succeededFuture(invocation.getArgument(1)));
158+
153159
given(hookStageExecutor.executeEntrypointStage(any(), any(), any(), any()))
154160
.willAnswer(invocation -> Future.succeededFuture(HookStageExecutionResult.of(
155161
false,
@@ -1787,6 +1793,7 @@ private void givenTarget(int timeoutAdjustmentFactor) {
17871793
timeoutResolver,
17881794
timeoutFactory,
17891795
storedRequestProcessor,
1796+
profilesProcessor,
17901797
applicationSettings,
17911798
ipAddressHelper,
17921799
hookStageExecutor,

‎src/test/java/org/prebid/server/handler/SettingsCacheNotificationHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class SettingsCacheNotificationHandlerTest extends VertxTest {
3232

3333
@Mock
34-
private CacheNotificationListener cacheNotificationListener;
34+
private CacheNotificationListener<String> cacheNotificationListener;
3535

3636
private SettingsCacheNotificationHandler handler;
3737
@Mock(strictness = LENIENT)
@@ -45,7 +45,7 @@ public class SettingsCacheNotificationHandlerTest extends VertxTest {
4545

4646
@BeforeEach
4747
public void setUp() {
48-
handler = new SettingsCacheNotificationHandler(cacheNotificationListener, jacksonMapper, "endpoint");
48+
handler = new SettingsCacheNotificationHandler("endpoint", cacheNotificationListener, jacksonMapper);
4949

5050
given(routingContext.request()).willReturn(httpRequest);
5151
given(routingContext.response()).willReturn(httpResponse);

‎src/test/java/org/prebid/server/settings/CachingApplicationSettingsTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ public void setUp() {
5858

5959
target = new CachingApplicationSettings(
6060
delegateSettings,
61-
new SettingsCache(360, 100, 0),
62-
new SettingsCache(360, 100, 0),
63-
new SettingsCache(360, 100, 0),
61+
new SettingsCache<>(360, 100, 0),
62+
new SettingsCache<>(360, 100, 0),
63+
new SettingsCache<>(360, 100, 0),
64+
new SettingsCache<>(360, 100, 0),
6465
metrics,
6566
360,
6667
100,
@@ -357,7 +358,7 @@ public void getStoredDataShouldReturnResultOnSuccessiveCalls() {
357358
singletonMap("reqid", "json"), singletonMap("impid", "json2"), emptyList())));
358359

359360
// when
360-
final Future<StoredDataResult> future =
361+
final Future<StoredDataResult<String>> future =
361362
target.getStoredData("1001", singleton("reqid"), singleton("impid"), timeout);
362363
// second call
363364
target.getStoredData("1001", singleton("reqid"), singleton("impid"), timeout);
@@ -378,7 +379,7 @@ public void getStoredDataShouldPropagateFailure() {
378379
.willReturn(Future.failedFuture(new InvalidRequestException("error")));
379380

380381
// when
381-
final Future<StoredDataResult> future =
382+
final Future<StoredDataResult<String>> future =
382383
target.getStoredData(null, singleton("id"), emptySet(), timeout);
383384

384385
// then
@@ -396,7 +397,7 @@ public void getStoredDataShouldReturnResultWithErrorsOnNotSuccessiveCallToCacheA
396397
emptyMap(), emptyMap(), singletonList("error"))));
397398

398399
// when
399-
final Future<StoredDataResult> future =
400+
final Future<StoredDataResult<String>> future =
400401
target.getStoredData(null, singleton("id"), emptySet(), timeout);
401402

402403
// then
@@ -416,7 +417,7 @@ public void getStoredDataShouldReturnResultWithErrorIfAccountDiffers() {
416417
// when
417418
target.getStoredData("1001", singleton("reqid"), emptySet(), timeout);
418419
// second call
419-
final Future<StoredDataResult> future =
420+
final Future<StoredDataResult<String>> future =
420421
target.getStoredData("1002", singleton("reqid"), emptySet(), timeout);
421422

422423
// then

0 commit comments

Comments
 (0)