Skip to content

Commit 5372661

Browse files
committed
Refactoring.
1 parent 86492b5 commit 5372661

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/main/java/org/prebid/server/auction/model/EidPermissionHolder.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.prebid.server.auction.model;
22

33
import com.iab.openrtb.request.Eid;
4+
import org.apache.commons.collections4.CollectionUtils;
45
import org.apache.commons.lang3.StringUtils;
56
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
67

@@ -49,7 +50,8 @@ public boolean isAllowed(Eid eid, String bidder) {
4950
}
5051

5152
private int getRuleSpecificity(ExtRequestPrebidDataEidPermissions eidPermission) {
52-
return (int) Stream.of(eidPermission.getInserter(),
53+
return (int) Stream.of(
54+
eidPermission.getInserter(),
5355
eidPermission.getSource(),
5456
eidPermission.getMatcher(),
5557
eidPermission.getMm())
@@ -65,7 +67,7 @@ private boolean isRuleMatched(Eid eid, ExtRequestPrebidDataEidPermissions eidPer
6567
}
6668

6769
private boolean isBidderAllowed(String bidder, List<String> ruleBidders) {
68-
return ruleBidders == null || ruleBidders.stream()
70+
return CollectionUtils.emptyIfNull(ruleBidders).stream()
6971
.anyMatch(allowedBidder -> StringUtils.equalsIgnoreCase(allowedBidder, bidder)
7072
|| WILDCARD_BIDDER.equals(allowedBidder));
7173
}

src/main/java/org/prebid/server/validation/RequestValidator.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ private void validateEidPermissions(List<ExtRequestPrebidDataEidPermissions> eid
376376
boolean isDebugEnabled,
377377
List<String> warnings) throws ValidationException {
378378

379-
if (ObjectUtils.isEmpty(eidPermissions)) {
379+
if (CollectionUtils.isEmpty(eidPermissions)) {
380380
return;
381381
}
382382

@@ -385,10 +385,12 @@ private void validateEidPermissions(List<ExtRequestPrebidDataEidPermissions> eid
385385
throw new ValidationException("request.ext.prebid.data.eidpermissions[i] can't be null");
386386
}
387387

388-
validateEidPermissionCriteria(eidPermission.getInserter(),
388+
validateEidPermissionCriteria(
389+
eidPermission.getInserter(),
389390
eidPermission.getSource(),
390391
eidPermission.getMatcher(),
391392
eidPermission.getMm());
393+
392394
validateEidPermissionBidders(eidPermission.getBidders(), aliases, isDebugEnabled, warnings);
393395
}
394396
}
@@ -397,10 +399,8 @@ private void validateEidPermissionCriteria(String inserter,
397399
String source,
398400
String matcher,
399401
Integer mm) throws ValidationException {
400-
if (StringUtils.isEmpty(inserter)
401-
&& StringUtils.isEmpty(source)
402-
&& StringUtils.isEmpty(matcher)
403-
&& mm == null) {
402+
403+
if (StringUtils.isAllEmpty(inserter, source, matcher) && mm == null) {
404404
throw new ValidationException("Missing required parameter(s) in request.ext.prebid.data.eidPermissions[]. "
405405
+ "Either one or a combination of inserter, source, matcher, or mm should be defined.");
406406
}

0 commit comments

Comments
 (0)