Rid RevContent bidder of OpenrtbBidder. (prebid#1625)

Author: CTMBNara

src/main/java/org/prebid/server/bidder/revcontent/RevcontentBidder.java

@@ -2,36 +2,93 @@
 
 import com.iab.openrtb.request.App;
 import com.iab.openrtb.request.BidRequest;
-import com.iab.openrtb.request.Imp;
 import com.iab.openrtb.request.Site;
 import com.iab.openrtb.response.Bid;
+import com.iab.openrtb.response.BidResponse;
+import com.iab.openrtb.response.SeatBid;
+import io.vertx.core.http.HttpMethod;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.prebid.server.bidder.OpenrtbBidder;
+import org.prebid.server.bidder.Bidder;
+import org.prebid.server.bidder.model.BidderBid;
+import org.prebid.server.bidder.model.BidderError;
+import org.prebid.server.bidder.model.HttpCall;
+import org.prebid.server.bidder.model.HttpRequest;
+import org.prebid.server.bidder.model.Result;
 import org.prebid.server.exception.PreBidException;
+import org.prebid.server.json.DecodeException;
 import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
+import org.prebid.server.util.HttpUtil;
+import org.prebid.server.util.ObjectUtil;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
-public class RevcontentBidder extends OpenrtbBidder<Void> {
+public class RevcontentBidder implements Bidder<BidRequest> {
+
+    private final String endpointUrl;
+    private final JacksonMapper mapper;
 
     public RevcontentBidder(String endpointUrl, JacksonMapper mapper) {
-        super(endpointUrl, RequestCreationStrategy.SINGLE_REQUEST, Void.class, mapper);
+        this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
+        this.mapper = Objects.requireNonNull(mapper);
     }
 
     @Override
-    protected void validateRequest(BidRequest bidRequest) throws PreBidException {
-        final App app = bidRequest.getApp();
-        final Site site = bidRequest.getSite();
-        final boolean hasAppName = app != null && StringUtils.isNotBlank(app.getName());
-        final boolean hasSiteDomain = site != null && StringUtils.isNotBlank(site.getDomain());
-        if (!hasAppName && !hasSiteDomain) {
+    public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequest) {
+        try {
+            validateRequest(bidRequest);
+        } catch (PreBidException e) {
+            return Result.withError(BidderError.badInput(e.getMessage()));
+        }
+
+        return Result.withValue(HttpRequest.<BidRequest>builder()
+                .method(HttpMethod.POST)
+                .headers(HttpUtil.headers())
+                .uri(endpointUrl)
+                .body(mapper.encodeToBytes(bidRequest))
+                .payload(bidRequest)
+                .build());
+    }
+
+    private static void validateRequest(BidRequest bidRequest) throws PreBidException {
+        if (StringUtils.isBlank(ObjectUtil.getIfNotNull(bidRequest.getApp(), App::getName))
+                && StringUtils.isBlank(ObjectUtil.getIfNotNull(bidRequest.getSite(), Site::getDomain))) {
             throw new PreBidException("Impression is missing app name or site domain, and must contain one.");
         }
     }
 
     @Override
-    protected BidType getBidType(Bid bid, List<Imp> imps) {
+    public Result<List<BidderBid>> makeBids(HttpCall<BidRequest> httpCall, BidRequest bidRequest) {
+        try {
+            final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
+            return Result.withValues(extractBids(bidResponse));
+        } catch (DecodeException e) {
+            return Result.withError(BidderError.badServerResponse(e.getMessage()));
+        }
+    }
+
+    private static List<BidderBid> extractBids(BidResponse bidResponse) {
+        if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
+            return Collections.emptyList();
+        }
+
+        final String currency = bidResponse.getCur();
+        return bidResponse.getSeatbid().stream()
+                .filter(Objects::nonNull)
+                .map(SeatBid::getBid)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .filter(Objects::nonNull)
+                .map(bid -> BidderBid.of(bid, resolveBidType(bid), currency))
+                .collect(Collectors.toList());
+    }
+
+    private static BidType resolveBidType(Bid bid) {
         // native: {"ver":"1.1","assets":...
         // banner: <div id='rtb-widget...
         final String bidAdm = bid.getAdm();