Refactor

Author: Serhii Nahornyi

src/main/java/org/prebid/server/bidder/ix/IxBidder.java

@@ -206,37 +206,36 @@ private List<BidderBid> extractBids(BidResponse bidResponse, BidRequest bidReque
 
     private List<BidderBid> bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest) {
         return bidResponse.getSeatbid().stream()
+                .filter(Objects::nonNull)
                 .map(SeatBid::getBid)
+                .filter(Objects::nonNull)
                 .flatMap(Collection::stream)
                 .map(bid -> toBidderBid(bid, bidRequest, bidResponse))
                 .collect(Collectors.toList());
     }
 
     private BidderBid toBidderBid(Bid bid, BidRequest bidRequest, BidResponse bidResponse) {
         final BidType bidType = getBidType(bid.getImpid(), bidRequest.getImp());
-
-        final ExtBidPrebid bidExt = parseBidExt(bid.getExt());
+        final ObjectNode bidExt = bid.getExt();
+        final ExtBidPrebid extPrebid = bidExt != null ? parseBidExt(bidExt) : null;
+        final ExtBidPrebidVideo extVideo = extPrebid != null ? extPrebid.getVideo() : null;
         final boolean bidHasNoSizes = bid.getH() == null || bid.getW() == null;
         final Banner banner = bidRequest.getImp().get(0).getBanner();
-        if ((bidHasNoSizes && banner != null) || (bidExt != null && bidExt.getVideo() != null)) {
+
+        if ((bidHasNoSizes && banner != null) || (extVideo != null)) {
             final Bid.BidBuilder bidBuilder = bid.toBuilder();
 
-            if (bidType == BidType.banner) {
-                if (bidHasNoSizes && banner != null) {
-                    bidBuilder
-                            .w(banner.getW())
-                            .h(banner.getH())
-                            .build();
-                }
+            if (bidType == BidType.banner && bidHasNoSizes && banner != null) {
+                bidBuilder
+                        .w(banner.getW())
+                        .h(banner.getH())
+                        .build();
             }
 
-            if (bidType == BidType.video) {
-                if (bidExt != null && bidExt.getVideo() != null) {
-                    final ExtBidPrebidVideo video = bidExt.getVideo();
-                    bidBuilder.ext(toBidExt(video));
-                    if (CollectionUtils.isEmpty(bid.getCat())) {
-                        bidBuilder.cat(Collections.singletonList(video.getPrimaryCategory())).build();
-                    }
+            if (bidType == BidType.video && extVideo != null) {
+                bidBuilder.ext(resolveBidExt(extVideo.getDuration()));
+                if (CollectionUtils.isEmpty(bid.getCat())) {
+                    bidBuilder.cat(Collections.singletonList(extVideo.getPrimaryCategory())).build();
                 }
             }
             bid = bidBuilder.build();
@@ -264,14 +263,15 @@ private static BidType getBidType(String impId, List<Imp> imps) {
 
     private ExtBidPrebid parseBidExt(ObjectNode bidExt) {
         try {
-            return bidExt == null ? null : mapper.mapper().treeToValue(bidExt, ExtBidPrebid.class);
+            return mapper.mapper().treeToValue(bidExt, ExtBidPrebid.class);
         } catch (JsonProcessingException e) {
             throw new PreBidException(e.getMessage());
         }
     }
 
-    private ObjectNode toBidExt(ExtBidPrebidVideo extBidVideo) {
-        return mapper.mapper().valueToTree(ExtBidPrebidVideo.of(extBidVideo.getDuration(), null));
+    private ObjectNode resolveBidExt(Integer duration) {
+        return mapper.mapper().valueToTree(ExtBidPrebid.builder()
+                .video(ExtBidPrebidVideo.of(duration, null))
+                .build());
     }
-
 }

src/test/java/org/prebid/server/bidder/ix/IxBidderTest.java

@@ -23,6 +23,7 @@
 import org.prebid.server.proto.openrtb.ext.ExtPrebid;
 import org.prebid.server.proto.openrtb.ext.request.ix.ExtImpIx;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
+import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidVideo;
 
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import static java.util.function.Function.identity;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.tuple;
 
 public class IxBidderTest extends VertxTest {
 
@@ -387,7 +389,9 @@ public void makeBidsShouldReturnBidWithVideoExt() throws JsonProcessingException
                         givenBidResponse(
                                 bidBuilder -> bidBuilder
                                         .impid("123")
-                                        .ext(mapper.valueToTree(ExtPrebid.of(null, ExtBidPrebidVideo.of(1, "cat")))))));
+                                        .ext(mapper.valueToTree(ExtBidPrebid.builder()
+                                                .video(ExtBidPrebidVideo.of(1, "cat"))
+                                                .build())))));
 
         // when
         final Result<List<BidderBid>> result = ixBidder.makeBids(httpCall, null);
@@ -397,7 +401,10 @@ public void makeBidsShouldReturnBidWithVideoExt() throws JsonProcessingException
         assertThat(result.getValue())
                 .extracting(BidderBid::getBid)
                 .extracting(Bid::getExt)
-                .containsExactly(mapper.valueToTree(ExtPrebid.of(null, ExtBidPrebidVideo.of(1, "cat"))));
+                .extracting(node -> mapper.treeToValue(node, ExtBidPrebid.class))
+                .extracting(ExtBidPrebid::getVideo)
+                .extracting(ExtBidPrebidVideo::getDuration, ExtBidPrebidVideo::getPrimaryCategory)
+                .containsExactly(tuple(1, null));
     }
 
     private static BidRequest givenBidRequest(