Skip to content

Commit 6a4d3f5

Browse files
committed
PR review - make code clearer
1 parent 938d12e commit 6a4d3f5

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

src/main/java/org/prebid/server/bidder/ogury/OguryBidder.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,16 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
7070
}
7171
}
7272

73-
if (isAppRequest(bidRequest)) {
74-
if (!isValidAppRequestKeys(impsWithOguryParams)) {
73+
if (CollectionUtils.isEmpty(impsWithOguryParams)) {
74+
if (bidRequest.getApp() != null) {
7575
errors.add(BidderError.badInput("Invalid request. assetKey/adUnitId required"));
7676
return Result.withErrors(errors);
7777
}
78-
} else if (!isValidSiteRequestKeys(bidRequest, impsWithOguryParams)) {
79-
errors.add(BidderError.badInput(
80-
"Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
81-
return Result.withErrors(errors);
78+
if (!hasPublisherId(bidRequest)) {
79+
errors.add(BidderError.badInput(
80+
"Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
81+
return Result.withErrors(errors);
82+
}
8283
}
8384

8485
final BidRequest modifiedBidRequest = bidRequest.toBuilder()
@@ -142,16 +143,8 @@ private boolean hasOguryParams(Imp imp) {
142143
&& impExtBidderHoist.has(PREBID_FIELD_ADUNIT_ID);
143144
}
144145

145-
private boolean isAppRequest(BidRequest request) {
146-
return Optional.ofNullable(request.getApp()).isPresent();
147-
}
148-
149-
private boolean isValidAppRequestKeys(List<Imp> impsWithOguryParams) {
150-
return !CollectionUtils.isEmpty(impsWithOguryParams);
151-
}
152-
153-
private boolean isValidSiteRequestKeys(BidRequest request, List<Imp> impsWithOguryParams) {
154-
return !CollectionUtils.isEmpty(impsWithOguryParams) || Optional.ofNullable(request.getSite())
146+
private boolean hasPublisherId(BidRequest request) {
147+
return Optional.ofNullable(request.getSite())
155148
.map(Site::getPublisher)
156149
.map(Publisher::getId)
157150
.isPresent();

0 commit comments

Comments
 (0)