Core: Convert some bidders as Generic aliases (#2828)

prebid · May 7, 2024 · dc42b0b · dc42b0b
1 parent 988fcbe
commit dc42b0b
Show file tree

Hide file tree

Showing 35 changed files with 133 additions and 1,704 deletions.
diff --git a/src/main/java/org/prebid/server/bidder/GenericBidder.java b/src/main/java/org/prebid/server/bidder/GenericBidder.java
@@ -2,10 +2,8 @@
 
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
-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.prebid.server.bidder.model.BidderBid;
 import org.prebid.server.bidder.model.BidderCall;
@@ -14,14 +12,16 @@
 import org.prebid.server.bidder.model.Result;
 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.BidderUtil;
 import org.prebid.server.util.HttpUtil;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class GenericBidder implements Bidder<BidRequest> {
 
@@ -35,15 +35,7 @@ public GenericBidder(String endpointUrl, JacksonMapper mapper) {
 
     @Override
     public final Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequest) {
-        return Result.withValue(
-                HttpRequest.<BidRequest>builder()
-                        .method(HttpMethod.POST)
-                        .uri(endpointUrl)
-                        .headers(HttpUtil.headers())
-                        .body(mapper.encodeToBytes(bidRequest))
-                        .impIds(BidderUtil.impIds(bidRequest))
-                        .payload(bidRequest)
-                        .build());
+        return Result.withValue(BidderUtil.defaultRequest(bidRequest, endpointUrl, mapper));
     }
 
     @Override
@@ -64,29 +56,15 @@ private static List<BidderBid> extractBids(BidRequest bidRequest, BidResponse bi
     }
 
     private static List<BidderBid> bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) {
+        final Map<String, Imp> impMap = bidRequest.getImp().stream()
+                .collect(Collectors.toMap(Imp::getId, Function.identity()));
         return bidResponse.getSeatbid().stream()
                 .filter(Objects::nonNull)
                 .map(SeatBid::getBid)
                 .filter(Objects::nonNull)
                 .flatMap(Collection::stream)
-                .map(bid -> BidderBid.of(bid, getBidType(bid, bidRequest.getImp()), bidResponse.getCur()))
+                .map(bid -> BidderBid.of(bid, BidderUtil.getBidType(bid, impMap), bidResponse.getCur()))
                 .toList();
     }
 
-    private static BidType getBidType(Bid bid, List<Imp> imps) {
-        for (Imp imp : imps) {
-            if (imp.getId().equals(bid.getImpid())) {
-                if (imp.getBanner() != null) {
-                    return BidType.banner;
-                } else if (imp.getVideo() != null) {
-                    return BidType.video;
-                } else if (imp.getXNative() != null) {
-                    return BidType.xNative;
-                } else if (imp.getAudio() != null) {
-                    return BidType.audio;
-                }
-            }
-        }
-        return BidType.banner;
-    }
 }
diff --git a/src/main/java/org/prebid/server/bidder/adrino/AdrinoBidder.java b/src/main/java/org/prebid/server/bidder/adrino/AdrinoBidder.java
diff --git a/src/main/java/org/prebid/server/bidder/alkimi/AlkimiBidder.java b/src/main/java/org/prebid/server/bidder/alkimi/AlkimiBidder.java
@@ -36,8 +36,6 @@ public class AlkimiBidder implements Bidder<BidRequest> {
     private final String endpointUrl;
     private final JacksonMapper mapper;
 
-    private static final String TYPE_BANNER = "Banner";
-    private static final String TYPE_VIDEO = "Video";
     private static final String PRICE_MACRO = "${AUCTION_PRICE}";
 
     private static final TypeReference<ExtPrebid<?, ExtImpAlkimi>> ALKIMI_EXT_TYPE_REFERENCE = new TypeReference<>() {

diff --git a/src/main/java/org/prebid/server/bidder/ccx/CcxBidder.java b/src/main/java/org/prebid/server/bidder/ccx/CcxBidder.java
diff --git a/src/main/java/org/prebid/server/bidder/infytv/InfytvBidder.java b/src/main/java/org/prebid/server/bidder/infytv/InfytvBidder.java
diff --git a/src/main/java/org/prebid/server/bidder/loopme/LoopmeBidder.java b/src/main/java/org/prebid/server/bidder/loopme/LoopmeBidder.java
diff --git a/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java b/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java
@@ -42,7 +42,6 @@ public class MgidxBidder implements Bidder<BidRequest> {
     private static final String PUBLISHER_PROPERTY = "publisher";
     private static final String NETWORK_PROPERTY = "network";
     private static final String BIDDER_PROPERTY = "bidder";
-    private static final String PREBID_EXT = "prebid";
 
     private final String endpointUrl;
     private final JacksonMapper mapper;