Skip to content

Commit ac44451

Browse files
And1sSAnd1sS
committed
Renamed ExtRequestPrebidDataEidPermissions.
1 parent 0e4cc05 commit ac44451

8 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎src/main/java/org/prebid/server/auction/EidPermissionResolver.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.iab.openrtb.request.Eid;
44
import org.apache.commons.collections4.CollectionUtils;
55
import org.apache.commons.lang3.StringUtils;
6-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
6+
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermission;
77

88
import java.util.ArrayList;
99
import java.util.Collections;
@@ -17,20 +17,20 @@ public class EidPermissionResolver {
1717

1818
private static final String WILDCARD_BIDDER = "*";
1919

20-
private static final ExtRequestPrebidDataEidPermissions DEFAULT_RULE = ExtRequestPrebidDataEidPermissions.builder()
20+
private static final ExtRequestPrebidDataEidPermission DEFAULT_RULE = ExtRequestPrebidDataEidPermission.builder()
2121
.bidders(Collections.singletonList(WILDCARD_BIDDER))
2222
.build();
2323

2424
private static final EidPermissionResolver EMPTY = new EidPermissionResolver(Collections.emptyList());
2525

26-
private final List<ExtRequestPrebidDataEidPermissions> eidPermissions;
26+
private final List<ExtRequestPrebidDataEidPermission> eidPermissions;
2727

28-
private EidPermissionResolver(List<ExtRequestPrebidDataEidPermissions> eidPermissions) {
28+
private EidPermissionResolver(List<ExtRequestPrebidDataEidPermission> eidPermissions) {
2929
this.eidPermissions = new ArrayList<>(eidPermissions);
3030
this.eidPermissions.add(DEFAULT_RULE);
3131
}
3232

33-
public static EidPermissionResolver of(List<ExtRequestPrebidDataEidPermissions> eidPermissions) {
33+
public static EidPermissionResolver of(List<ExtRequestPrebidDataEidPermission> eidPermissions) {
3434
return new EidPermissionResolver(eidPermissions);
3535
}
3636

@@ -46,7 +46,7 @@ public List<Eid> resolveAllowedEids(List<Eid> userEids, String bidder) {
4646
}
4747

4848
private boolean isAllowed(Eid eid, String bidder) {
49-
final Map<Integer, List<ExtRequestPrebidDataEidPermissions>> matchingRulesBySpecificity = eidPermissions
49+
final Map<Integer, List<ExtRequestPrebidDataEidPermission>> matchingRulesBySpecificity = eidPermissions
5050
.stream()
5151
.filter(rule -> isRuleMatched(eid, rule))
5252
.collect(Collectors.groupingBy(this::getRuleSpecificity));
@@ -56,7 +56,7 @@ private boolean isAllowed(Eid eid, String bidder) {
5656
.anyMatch(eidPermission -> isBidderAllowed(bidder, eidPermission.getBidders()));
5757
}
5858

59-
private int getRuleSpecificity(ExtRequestPrebidDataEidPermissions eidPermission) {
59+
private int getRuleSpecificity(ExtRequestPrebidDataEidPermission eidPermission) {
6060
return (int) Stream.of(
6161
eidPermission.getInserter(),
6262
eidPermission.getSource(),
@@ -66,7 +66,7 @@ private int getRuleSpecificity(ExtRequestPrebidDataEidPermissions eidPermission)
6666
.count();
6767
}
6868

69-
private boolean isRuleMatched(Eid eid, ExtRequestPrebidDataEidPermissions eidPermission) {
69+
private boolean isRuleMatched(Eid eid, ExtRequestPrebidDataEidPermission eidPermission) {
7070
return (eidPermission.getInserter() == null || eidPermission.getInserter().equals(eid.getInserter()))
7171
&& (eidPermission.getSource() == null || eidPermission.getSource().equals(eid.getSource()))
7272
&& (eidPermission.getMatcher() == null || eidPermission.getMatcher().equals(eid.getMatcher()))

‎src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ public class ExtRequestPrebidData {
1919

2020
@JsonProperty("eidpermissions")
2121
@JsonFormat(without = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
22-
List<ExtRequestPrebidDataEidPermissions> eidPermissions;
22+
List<ExtRequestPrebidDataEidPermission> eidPermissions;
2323
}

src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermissions.java renamed to src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermission.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@Value
1010
@Builder
11-
public class ExtRequestPrebidDataEidPermissions {
11+
public class ExtRequestPrebidDataEidPermission {
1212

1313
/**
1414
* Defines the contract for bidrequest.ext.prebid.data.eidPermissions.inserter
@@ -37,7 +37,7 @@ public class ExtRequestPrebidDataEidPermissions {
3737
List<String> bidders;
3838

3939
@Deprecated
40-
public static ExtRequestPrebidDataEidPermissions of(String source, List<String> bidders) {
41-
return new ExtRequestPrebidDataEidPermissions(null, source, null, null, bidders);
40+
public static ExtRequestPrebidDataEidPermission of(String source, List<String> bidders) {
41+
return new ExtRequestPrebidDataEidPermission(null, source, null, null, bidders);
4242
}
4343
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.prebid.server.proto.openrtb.ext.request.ExtRequestBidAdjustmentFactors;
3838
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
3939
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidData;
40-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
40+
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermission;
4141
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidSchain;
4242
import org.prebid.server.proto.openrtb.ext.request.ExtRequestTargeting;
4343
import org.prebid.server.proto.openrtb.ext.request.ExtSite;
@@ -371,7 +371,7 @@ private void validateExtBidPrebidData(ExtRequestPrebidData data,
371371
}
372372
}
373373

374-
private void validateEidPermissions(List<ExtRequestPrebidDataEidPermissions> eidPermissions,
374+
private void validateEidPermissions(List<ExtRequestPrebidDataEidPermission> eidPermissions,
375375
Map<String, String> aliases,
376376
boolean isDebugEnabled,
377377
List<String> warnings) throws ValidationException {
@@ -380,7 +380,7 @@ private void validateEidPermissions(List<ExtRequestPrebidDataEidPermissions> eid
380380
return;
381381
}
382382

383-
for (ExtRequestPrebidDataEidPermissions eidPermission : eidPermissions) {
383+
for (ExtRequestPrebidDataEidPermission eidPermission : eidPermissions) {
384384
if (eidPermission == null) {
385385
throw new ValidationException("request.ext.prebid.data.eidpermissions[i] can't be null");
386386
}

‎src/test/java/org/prebid/server/auction/EidPermissionResolverTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.iab.openrtb.request.Eid;
44
import org.junit.jupiter.api.Test;
5-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
5+
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermission;
66

77
import java.util.List;
88

@@ -20,7 +20,7 @@ public void resolveShouldFilterEidsWhenBidderIsNotAllowedForSourceIgnoringCase()
2020
Eid.builder().source("source2").build());
2121

2222
final EidPermissionResolver resolver = EidPermissionResolver.of(
23-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
23+
singletonList(ExtRequestPrebidDataEidPermission.builder()
2424
.source("source1")
2525
.bidders(singletonList("OtHeRbIdDeR"))
2626
.build()));
@@ -38,7 +38,7 @@ void resolveShouldFilterEidsWhenBidderIsNotAllowedForInserterIgnoringCase() {
3838
Eid.builder().inserter("inserter2").build());
3939

4040
final EidPermissionResolver resolver = EidPermissionResolver.of(
41-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
41+
singletonList(ExtRequestPrebidDataEidPermission.builder()
4242
.inserter("inserter1")
4343
.bidders(singletonList("OtHeRbIdDeR"))
4444
.build()));
@@ -56,7 +56,7 @@ public void resolveShouldFilterEidsWhenBidderIsNotAllowedForMatcherIgnoringCase(
5656
Eid.builder().matcher("matcher2").build());
5757

5858
final EidPermissionResolver resolver = EidPermissionResolver.of(
59-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
59+
singletonList(ExtRequestPrebidDataEidPermission.builder()
6060
.matcher("matcher1")
6161
.bidders(singletonList("OtHeRbIdDeR"))
6262
.build()));
@@ -72,7 +72,7 @@ public void resolveShouldFilterEidsWhenBidderIsNotAllowedForMm() {
7272
final List<Eid> userEids = asList(Eid.builder().mm(1).build(), Eid.builder().mm(2).build());
7373

7474
final EidPermissionResolver resolver = EidPermissionResolver.of(
75-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
75+
singletonList(ExtRequestPrebidDataEidPermission.builder()
7676
.mm(1)
7777
.bidders(singletonList("OtHeRbIdDeR"))
7878
.build()));
@@ -90,7 +90,7 @@ public void resolveShouldFilterEidsWhenBidderIsNotAllowedUsingMultipleCriteria()
9090
Eid.builder().inserter("inserter2").source("source2").matcher("matcher2").mm(2).build());
9191

9292
final EidPermissionResolver resolver = EidPermissionResolver.of(
93-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
93+
singletonList(ExtRequestPrebidDataEidPermission.builder()
9494
.inserter("inserter1")
9595
.source("source1")
9696
.matcher("matcher1")
@@ -111,7 +111,7 @@ public void resolveShouldFilterEidsWhenEveryCriteriaMatches() {
111111
Eid.builder().inserter("inserter2").source("source2").matcher("matcher2").mm(2).build());
112112

113113
final EidPermissionResolver resolver = EidPermissionResolver.of(
114-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
114+
singletonList(ExtRequestPrebidDataEidPermission.builder()
115115
.inserter("inserter1")
116116
.source("source2")
117117
.matcher("matcher3")
@@ -133,11 +133,11 @@ public void resolveShouldFilterEidsWhenBidderIsNotAllowedUsingTheMostSpecificRul
133133
Eid.builder().inserter("inserter2").source("source2").matcher("matcher2").mm(2).build());
134134

135135
final EidPermissionResolver resolver = EidPermissionResolver.of(
136-
asList(ExtRequestPrebidDataEidPermissions.builder()
136+
asList(ExtRequestPrebidDataEidPermission.builder()
137137
.inserter("inserter1")
138138
.bidders(singletonList("someBidder"))
139139
.build(),
140-
ExtRequestPrebidDataEidPermissions.builder()
140+
ExtRequestPrebidDataEidPermission.builder()
141141
.inserter("inserter1")
142142
.source("source1")
143143
.matcher("matcher1")
@@ -158,11 +158,11 @@ public void resolveShouldNotFilterUserExtEidsWhenBidderIsAllowedUsingTheMostSpec
158158
Eid.builder().inserter("inserter2").source("source2").matcher("matcher2").mm(2).build());
159159

160160
final EidPermissionResolver resolver = EidPermissionResolver.of(
161-
asList(ExtRequestPrebidDataEidPermissions.builder()
161+
asList(ExtRequestPrebidDataEidPermission.builder()
162162
.inserter("inserter1")
163163
.bidders(singletonList("OtHeRbIdDeR"))
164164
.build(),
165-
ExtRequestPrebidDataEidPermissions.builder()
165+
ExtRequestPrebidDataEidPermission.builder()
166166
.inserter("inserter1")
167167
.source("source1")
168168
.matcher("matcher1")
@@ -184,12 +184,12 @@ public void resolveShouldNotFilterUserExtEidsWhenBidderIsAllowedUsingMultipleSam
184184
Eid.builder().inserter("inserter2").source("source2").matcher("matcher2").mm(2).build());
185185

186186
final EidPermissionResolver resolver = EidPermissionResolver.of(
187-
asList(ExtRequestPrebidDataEidPermissions.builder()
187+
asList(ExtRequestPrebidDataEidPermission.builder()
188188
.inserter("inserter1")
189189
.source("source1")
190190
.bidders(singletonList("OtHeRbIdDeR"))
191191
.build(),
192-
ExtRequestPrebidDataEidPermissions.builder()
192+
ExtRequestPrebidDataEidPermission.builder()
193193
.matcher("matcher1")
194194
.mm(1)
195195
.bidders(singletonList("someBidder"))
@@ -207,7 +207,7 @@ public void resolveShouldNotFilterEidsWhenEidsPermissionDoesNotContainSourceIgno
207207
final List<Eid> userEids = singletonList(Eid.builder().source("source1").build());
208208

209209
final EidPermissionResolver resolver = EidPermissionResolver.of(
210-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
210+
singletonList(ExtRequestPrebidDataEidPermission.builder()
211211
.source("source2")
212212
.bidders(singletonList("OtHeRbIdDeR"))
213213
.build()));
@@ -223,7 +223,7 @@ public void resolveShouldNotFilterEidsWhenSourceAllowedForAllBiddersIgnoringCase
223223
final List<Eid> userEids = singletonList(Eid.builder().source("source1").build());
224224

225225
final EidPermissionResolver resolver = EidPermissionResolver.of(
226-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
226+
singletonList(ExtRequestPrebidDataEidPermission.builder()
227227
.source("source1")
228228
.bidders(singletonList("*"))
229229
.build()));
@@ -239,7 +239,7 @@ public void resolveShouldNotFilterEidsWhenSourceAllowedForBidderIgnoringCase() {
239239
final List<Eid> userEids = singletonList(Eid.builder().source("source1").build());
240240

241241
final EidPermissionResolver resolver = EidPermissionResolver.of(
242-
singletonList(ExtRequestPrebidDataEidPermissions.builder()
242+
singletonList(ExtRequestPrebidDataEidPermission.builder()
243243
.source("source1")
244244
.bidders(singletonList("SoMeBiDdEr"))
245245
.build()));

‎src/test/java/org/prebid/server/auction/ExchangeServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidCacheBids;
123123
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidCacheVastxml;
124124
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidData;
125-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
125+
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermission;
126126
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidMultiBid;
127127
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidSchain;
128128
import org.prebid.server.proto.openrtb.ext.request.ExtRequestTargeting;
@@ -2240,7 +2240,7 @@ public void shouldFilterUserExtEidsWhenBidderIsNotAllowedForSourceAndSetNullIfNo
22402240
builder -> builder
22412241
.ext(ExtRequest.of(ExtRequestPrebid.builder()
22422242
.data(ExtRequestPrebidData.of(null, singletonList(
2243-
ExtRequestPrebidDataEidPermissions.builder()
2243+
ExtRequestPrebidDataEidPermission.builder()
22442244
.source("source1")
22452245
.bidders(singletonList("otherBidder"))
22462246
.build())))
@@ -2278,7 +2278,7 @@ public void shouldFilterUserExtEidsWhenBidderPermissionsGivenToBidderAliasOnly()
22782278
.ext(ExtRequest.of(ExtRequestPrebid.builder()
22792279
.aliases(singletonMap("someBidder", "someBidderAlias"))
22802280
.data(ExtRequestPrebidData.of(null, singletonList(
2281-
ExtRequestPrebidDataEidPermissions.builder()
2281+
ExtRequestPrebidDataEidPermission.builder()
22822282
.source("source1")
22832283
.bidders(singletonList("someBidderAlias"))
22842284
.build())))
@@ -2316,7 +2316,7 @@ public void shouldFilterUserExtEidsWhenPermissionsGivenToBidderButNotForAlias()
23162316
.ext(ExtRequest.of(ExtRequestPrebid.builder()
23172317
.aliases(singletonMap("someBidder", "someBidderAlias"))
23182318
.data(ExtRequestPrebidData.of(null, singletonList(
2319-
ExtRequestPrebidDataEidPermissions.builder()
2319+
ExtRequestPrebidDataEidPermission.builder()
23202320
.source("source1")
23212321
.bidders(singletonList("someBidder"))
23222322
.build())))

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
5757
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
5858
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidData;
59-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
59+
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermission;
6060
import org.prebid.server.settings.model.Account;
6161

6262
import java.util.ArrayList;
@@ -487,7 +487,7 @@ public void shouldReturnFailedFutureIfEidsPermissionsContainsWrongDataType() {
487487

488488
final ObjectNode requestNode = mapper.convertValue(bidRequest, ObjectNode.class);
489489
final JsonNode eidPermissionNode = mapper.convertValue(
490-
ExtRequestPrebidDataEidPermissions.builder()
490+
ExtRequestPrebidDataEidPermission.builder()
491491
.source("source")
492492
.bidders(emptyList())
493493
.build(),
@@ -524,7 +524,7 @@ public void shouldReturnFailedFutureIfEidsPermissionsBiddersContainsWrongDataTyp
524524
final ObjectNode requestNode = mapper.convertValue(bidRequest, ObjectNode.class);
525525

526526
final ObjectNode eidPermissionNode = mapper.convertValue(
527-
ExtRequestPrebidDataEidPermissions.builder()
527+
ExtRequestPrebidDataEidPermission.builder()
528528
.source("source")
529529
.bidders(emptyList())
530530
.build(),

0 commit comments

Comments
 (0)