Skip to content

Commit 6f37890

Browse files
author
Mohammad Nurul Islam Shihan
committed
addtlconsent parsing logic removed
1 parent 4626c55 commit 6f37890

File tree

2 files changed

+0
-75
lines changed

2 files changed

+0
-75
lines changed

src/main/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidder.java

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.fasterxml.jackson.core.JsonProcessingException;
55
import com.fasterxml.jackson.core.type.TypeReference;
66
import com.fasterxml.jackson.databind.JsonNode;
7-
import com.fasterxml.jackson.databind.node.ArrayNode;
87
import com.fasterxml.jackson.databind.node.ObjectNode;
98
import com.iab.openrtb.request.BidRequest;
109
import com.iab.openrtb.request.Imp;
11-
import com.iab.openrtb.request.User;
1210
import com.iab.openrtb.response.Bid;
1311
import com.iab.openrtb.response.BidResponse;
1412
import com.iab.openrtb.response.SeatBid;
@@ -26,13 +24,10 @@
2624
import org.prebid.server.json.DecodeException;
2725
import org.prebid.server.json.JacksonMapper;
2826
import org.prebid.server.proto.openrtb.ext.ExtPrebid;
29-
import org.prebid.server.proto.openrtb.ext.request.ConsentedProvidersSettings;
30-
import org.prebid.server.proto.openrtb.ext.request.ExtUser;
3127
import org.prebid.server.proto.openrtb.ext.request.improvedigital.ExtImpImprovedigital;
3228
import org.prebid.server.proto.openrtb.ext.response.BidType;
3329
import org.prebid.server.util.BidderUtil;
3430
import org.prebid.server.util.HttpUtil;
35-
import org.prebid.server.util.ObjectUtil;
3631

3732
import java.util.ArrayList;
3833
import java.util.Collection;
@@ -50,10 +45,6 @@ public class ImprovedigitalBidder implements Bidder<BidRequest> {
5045
private static final TypeReference<ExtPrebid<?, ExtImpImprovedigital>> IMPROVEDIGITAL_EXT_TYPE_REFERENCE =
5146
new TypeReference<>() {
5247
};
53-
private static final String CONSENT_PROVIDERS_SETTINGS_OUT_KEY = "consented_providers_settings";
54-
private static final String CONSENTED_PROVIDERS_KEY = "consented_providers";
55-
private static final String REGEX_SPLIT_STRING_BY_DOT = "\\.";
56-
5748
private static final String IS_REWARDED_INVENTORY_FIELD = "is_rewarded_inventory";
5849
private static final JsonPointer IS_REWARDED_INVENTORY_POINTER
5950
= JsonPointer.valueOf("/prebid/" + IS_REWARDED_INVENTORY_FIELD);
@@ -89,46 +80,6 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
8980
return Result.withValues(httpRequests);
9081
}
9182

92-
private ExtUser getAdditionalConsentProvidersUserExt(ExtUser extUser) {
93-
final String consentedProviders = ObjectUtil.getIfNotNull(
94-
ObjectUtil.getIfNotNull(extUser, ExtUser::getConsentedProvidersSettings),
95-
ConsentedProvidersSettings::getConsentedProviders);
96-
97-
if (StringUtils.isBlank(consentedProviders)) {
98-
return extUser;
99-
}
100-
101-
final String[] consentedProvidersParts = StringUtils.split(consentedProviders, "~");
102-
final String consentedProvidersPart = consentedProvidersParts.length > 1 ? consentedProvidersParts[1] : null;
103-
if (StringUtils.isBlank(consentedProvidersPart)) {
104-
return extUser;
105-
}
106-
107-
return fillExtUser(extUser, consentedProvidersPart.split(REGEX_SPLIT_STRING_BY_DOT));
108-
}
109-
110-
private ExtUser fillExtUser(ExtUser extUser, String[] arrayOfSplitString) {
111-
final JsonNode consentProviderSettingJsonNode;
112-
try {
113-
consentProviderSettingJsonNode = customJsonNode(arrayOfSplitString);
114-
} catch (IllegalArgumentException e) {
115-
throw new PreBidException(e.getMessage());
116-
}
117-
118-
return mapper.fillExtension(extUser, consentProviderSettingJsonNode);
119-
}
120-
121-
private JsonNode customJsonNode(String[] arrayOfSplitString) {
122-
final Integer[] integers = mapper.mapper().convertValue(arrayOfSplitString, Integer[].class);
123-
final ArrayNode arrayNode = mapper.mapper().createArrayNode();
124-
for (Integer integer : integers) {
125-
arrayNode.add(integer);
126-
}
127-
128-
return mapper.mapper().createObjectNode().set(CONSENT_PROVIDERS_SETTINGS_OUT_KEY,
129-
mapper.mapper().createObjectNode().set(CONSENTED_PROVIDERS_KEY, arrayNode));
130-
}
131-
13283
private ExtImpImprovedigital parseImpExt(Imp imp) {
13384
try {
13485
return mapper.mapper().convertValue(imp.getExt(), IMPROVEDIGITAL_EXT_TYPE_REFERENCE).getBidder();
@@ -149,12 +100,8 @@ private static Imp updateImp(Imp imp) {
149100
}
150101

151102
private HttpRequest<BidRequest> resolveRequest(BidRequest bidRequest, Imp imp, Integer publisherId) {
152-
final User user = bidRequest.getUser();
153103
final BidRequest modifiedRequest = bidRequest.toBuilder()
154104
.imp(Collections.singletonList(updateImp(imp)))
155-
.user(user != null
156-
? user.toBuilder().ext(getAdditionalConsentProvidersUserExt(user.getExt())).build()
157-
: null)
158105
.build();
159106

160107
final String pathPrefix = publisherId != null && publisherId > 0

src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -192,28 +192,6 @@ public void makeHttpRequestsShouldReturnUserExtIfConsentedProvidersIsNotProvided
192192
.containsExactly(extUser);
193193
}
194194

195-
@Test
196-
public void makeHttpRequestsShouldReturnErrorIfCannotParseConsentedProviders() {
197-
// given
198-
final ExtUser extUser = ExtUser.builder()
199-
.consentedProvidersSettings(ConsentedProvidersSettings.of("1~a.fv.90"))
200-
.build();
201-
202-
final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder
203-
.user(User.builder().ext(extUser).build()).id("request_id"),
204-
identity());
205-
206-
// when
207-
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
208-
209-
// then
210-
assertThat(result.getValue()).isEmpty();
211-
assertThat(result.getErrors()).allSatisfy(error -> {
212-
assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input);
213-
assertThat(error.getMessage()).startsWith("Cannot deserialize value of type");
214-
});
215-
}
216-
217195
@Test
218196
public void makeHttpRequestsShouldReturnErrorIfImpExtCouldNotBeParsed() {
219197
// given

0 commit comments

Comments
 (0)