Revert hotfix for imp[].ext.context.data.adslot issue (#628)

prebid · Feb 21, 2020 · 3a982b4 · 3a982b4
1 parent 4b806f7
commit 3a982b4
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/main/java/org/prebid/server/auction/ExchangeService.java b/src/main/java/org/prebid/server/auction/ExchangeService.java
@@ -529,10 +529,7 @@ private BidderRequest createBidderRequest(String bidder, BidRequest bidRequest,
         return BidderRequest.of(bidder, bidRequest.toBuilder()
                 .user(privacyEnforcementResult.getUser())
                 .device(privacyEnforcementResult.getDevice())
-                // FIXME: remove firstPartyDataBidders.isEmpty() after FPD will be reworked
-                //  https://github.com/prebid/prebid-server/issues/879
-                .imp(prepareImps(bidder, imps,
-                        firstPartyDataBidders.contains(bidder) || firstPartyDataBidders.isEmpty()))
+                .imp(prepareImps(bidder, imps, firstPartyDataBidders.contains(bidder)))
                 .app(prepareApp(app, extApp, firstPartyDataBidders.contains(bidder)))
                 .site(prepareSite(site, extSite, firstPartyDataBidders.contains(bidder)))
                 .source(prepareSource(bidder, bidderToPrebidSchains, bidRequest.getSource()))
@@ -594,9 +591,7 @@ private List<Imp> prepareImps(String bidder, List<Imp> imps, boolean useFirstPar
     private ObjectNode prepareImpExt(String bidder, ObjectNode impExt, boolean useFirstPartyData) {
         final ObjectNode result = mapper.mapper().valueToTree(ExtPrebid.of(impExt.get(PREBID_EXT), impExt.get(bidder)));
 
-        // FIXME: consider to remove impExt.get(CONTEXT_EXT) != null after FPD will be reworked
-        //  https://github.com/prebid/prebid-server/issues/879
-        if (useFirstPartyData && impExt.get(CONTEXT_EXT) != null) {
+        if (useFirstPartyData) {
             result.set(CONTEXT_EXT, impExt.get(CONTEXT_EXT));
         }