Skip to content

Commit d0764ab

Browse files
committed
Fix NPE. Make db config optional.
1 parent a526e37 commit d0764ab

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ public Future<BidRequest> process(AuctionContext auctionContext, BidRequest bidR
107107
private AllProfilesIds profilesIds(BidRequest bidRequest, AuctionContext auctionContext, String accountId) {
108108
final AllProfilesIds initialProfilesIds = new AllProfilesIds(
109109
requestProfilesIds(bidRequest),
110-
bidRequest.getImp().stream().map(this::impProfilesIds).toList());
110+
Optional.ofNullable(bidRequest)
111+
.map(BidRequest::getImp)
112+
.orElse(Collections.emptyList())
113+
.stream()
114+
.map(this::impProfilesIds)
115+
.toList());
111116

112117
final AllProfilesIds profilesIds = truncate(
113118
initialProfilesIds,

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public DatabaseApplicationSettings(DatabaseClient databaseClient,
102102
Objects.requireNonNull(selectAccountQuery));
103103
this.selectStoredRequestsQuery = Objects.requireNonNull(selectStoredRequestsQuery);
104104
this.selectAmpStoredRequestsQuery = Objects.requireNonNull(selectAmpStoredRequestsQuery);
105-
this.selectProfilesQuery = Objects.requireNonNull(selectProfilesQuery);
105+
this.selectProfilesQuery = selectProfilesQuery;
106106
this.selectStoredResponsesQuery = Objects.requireNonNull(selectStoredResponsesQuery);
107107
}
108108

@@ -186,6 +186,11 @@ public Future<StoredDataResult<Profile>> getProfiles(String accountId,
186186
Set<String> impIds,
187187
Timeout timeout) {
188188

189+
// TODO: remove in PBS 4.0
190+
if (selectProfilesQuery == null) {
191+
return Future.failedFuture("Profiles storage not configured.");
192+
}
193+
189194
return fetchStoredData(
190195
selectProfilesQuery,
191196
requestIds,

src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ DatabaseApplicationSettings databaseApplicationSettings(
104104
@Value("${settings.database.account-query}") String accountQuery,
105105
@Value("${settings.database.stored-requests-query}") String storedRequestsQuery,
106106
@Value("${settings.database.amp-stored-requests-query}") String ampStoredRequestsQuery,
107-
@Value("${settings.database.profiles-query}") String profilesQuery,
107+
@Value("${settings.database.profiles-query:#{null}}") String profilesQuery,
108108
@Value("${settings.database.stored-responses-query}") String storedResponsesQuery,
109109
ParametrizedQueryHelper parametrizedQueryHelper,
110110
DatabaseClient databaseClient,

0 commit comments

Comments
 (0)