Trimming publisher ID before passing in Pubmatic bidder (prebid#1163)

Author: SerhiiNahornyi

src/main/java/org/prebid/server/bidder/pubmatic/PubmaticBidder.java

@@ -202,6 +202,7 @@ private HttpRequest<BidRequest> makeRequest(BidRequest bidRequest, List<Imp> imp
         final String pubId = extImpPubmatics.stream()
                 .map(ExtImpPubmatic::getPublisherId)
                 .filter(Objects::nonNull)
+                .map(String::trim)
                 .findFirst().orElse(null);
 
         if (bidRequest.getSite() != null) {

src/test/java/org/prebid/server/bidder/pubmatic/PubmaticBidderTest.java

@@ -208,7 +208,7 @@ public void makeHttpRequestsShouldSetAudioToNullIfPresent() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getAudio).containsNull();
     }
@@ -224,12 +224,12 @@ public void makeHttpRequestsShouldSetBannerWidthAndHeightFromAdSlot() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getBanner)
                 .extracting(Banner::getH).containsOnly(250);
         assertThat(result.getValue())
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getBanner)
                 .extracting(Banner::getW).containsOnly(300);
@@ -246,7 +246,7 @@ public void makeHttpRequestsShouldSetImpExtNullIfKeywordsAreNull() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getExt).containsNull();
     }
@@ -264,7 +264,7 @@ public void makeHttpRequestsShouldSetImpExtNullIfKeywordsAreEmpty() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getExt).containsNull();
     }
@@ -284,7 +284,7 @@ public void makeHttpRequestsShouldSetImpExtFromKeywords() throws IOException {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getExt)
                 .containsOnly(mapper.readValue("{\"key2\":\"value1,value2\"}", ObjectNode.class));
@@ -306,7 +306,7 @@ public void makeHttpRequestsShouldSetImpExtFromKeywordsSkippingKeysWithEmptyValu
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getExt)
                 .containsOnly(mapper.readValue("{\"key2\":\"value1,value2\"}", ObjectNode.class));
@@ -326,7 +326,7 @@ public void makeHttpRequestsShouldSetRequestExtFromWrapExt() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getExt)
                 .containsOnly(jacksonMapper.fillExtension(
                         ExtRequest.empty(), PubmaticRequestExt.of(mapper.valueToTree(singletonMap("key", 1)))));
@@ -346,7 +346,7 @@ public void makeHttpRequestsShouldNotChangeExtIfWrapExtIsMissing() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getExt)
                 .containsOnly(ExtRequest.empty());
     }
@@ -365,13 +365,34 @@ public void makeHttpRequestsShouldSetSitePublisherIdFromImpExtPublisherId() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getSite)
                 .extracting(Site::getPublisher)
                 .extracting(Publisher::getId)
                 .containsOnly("pub id");
     }
 
+    @Test
+    public void makeHttpRequestsShouldSetTrimmedImpExtPublisherId() {
+        // given
+        final BidRequest bidRequest = givenBidRequest(
+                bidRequestBuilder -> bidRequestBuilder.site(Site.builder().build()),
+                identity(),
+                extImpPubmaticBuilder -> extImpPubmaticBuilder.publisherId("  pubId  "));
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = pubmaticBidder.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).hasSize(1)
+                .extracting(HttpRequest::getPayload)
+                .extracting(BidRequest::getSite)
+                .extracting(Site::getPublisher)
+                .extracting(Publisher::getId)
+                .containsOnly("pubId");
+    }
+
     @Test
     public void makeHttpRequestsShouldNotSetAppPublisherIdIfSiteIsNotNull() {
         // given
@@ -388,7 +409,7 @@ public void makeHttpRequestsShouldNotSetAppPublisherIdIfSiteIsNotNull() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getApp)
                 .extracting(App::getId)
                 .containsNull();
@@ -408,7 +429,7 @@ public void makeHttpRequestsShouldSetAppPublisherIdIfSiteIsNull() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getApp)
                 .extracting(App::getPublisher)
                 .extracting(Publisher::getId)

src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-request.json

@@ -16,7 +16,7 @@
       "ext": {
         "pubmatic": {
           "adSlot": "slot9@300x250:zzz",
-          "publisherId": "publisherId",
+          "publisherId": "   publisherId   ",
           "keywords": [{
             "key": "pmZoneID",
             "value": ["Zone1", "Zone2"]
@@ -111,4 +111,4 @@
       "gdpr": 0
     }
   }
-}
+}