From 8fad617cfe77c260678225cde2b62d542d756522 Mon Sep 17 00:00:00 2001 From: Matias Waisgold Date: Thu, 27 Aug 2015 17:30:22 +0200 Subject: [PATCH 1/2] Send through bidders configuration so that it's available everywhere and reenables notifications --- .../com/bidtorrent/bidding/AuctionResult.java | 40 ++++++--------- .../com/bidtorrent/bidding/Auctioneer.java | 51 ++++++++----------- .../java/com/bidtorrent/bidding/IBidder.java | 7 +-- .../com/bidtorrent/bidding/Notificator.java | 11 ---- .../bidding/bidders/ConstantBidder.java | 10 ++-- .../bidding/bidders/HttpBidder.java | 34 ++++++++----- .../bidding/messages/BidResponse.java | 12 +++++ .../messages/ContextualizedBidResponse.java | 29 +++++++++++ .../configuration/BidderConfiguration.java | 5 +- .../BidderConfigurationFilters.java | 3 +- .../biddingservice/BiddingIntentService.java | 7 +-- .../actions/NotificationsAction.java | 10 ++-- .../biddingservice/debug/ListViewAdapter.java | 11 ++-- .../functions/TriggerBidFunction.java | 0 .../receivers/CreativeDisplayReceiver.java | 10 +--- 15 files changed, 126 insertions(+), 114 deletions(-) mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/IBidder.java mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/bidders/ConstantBidder.java mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/bidders/HttpBidder.java create mode 100755 bidding/src/main/java/com/bidtorrent/bidding/messages/ContextualizedBidResponse.java mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfiguration.java mode change 100644 => 100755 bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfigurationFilters.java mode change 100644 => 100755 biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java mode change 100644 => 100755 biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java mode change 100644 => 100755 biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java diff --git a/bidding/src/main/java/com/bidtorrent/bidding/AuctionResult.java b/bidding/src/main/java/com/bidtorrent/bidding/AuctionResult.java index f6590eb..03a9fa1 100755 --- a/bidding/src/main/java/com/bidtorrent/bidding/AuctionResult.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/AuctionResult.java @@ -1,48 +1,40 @@ package com.bidtorrent.bidding; -import com.bidtorrent.bidding.messages.BidResponse; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import java.io.Serializable; import java.util.Collection; public class AuctionResult implements Serializable { - private IBidder winningBidder; - private final BidResponse winningBid; - private final float winningPrice; - private long runnerUp; - private Collection responses; + private final ContextualizedBidResponse winningBid; + private final ContextualizedBidResponse runnerUp; + private Collection responses; + private float winningPrice; public AuctionResult( - BidResponse winningBid, - float winningPrice, - IBidder winningBidder, - Collection responses, - long runnerUp) - { + ContextualizedBidResponse winningBid, + Collection responses, + ContextualizedBidResponse runnerUp, + float winningPrice){ this.winningBid = winningBid; - this.winningPrice = winningPrice; - this.winningBidder = winningBidder; this.responses = responses; this.runnerUp = runnerUp; + this.winningPrice = winningPrice; } - public BidResponse getWinningBid() { - return winningBid; + public AuctionResult() { + this(null,null,null, 0f); } - public float getWinningPrice() { - return winningPrice; + public ContextualizedBidResponse getWinningBid() { + return winningBid; } - public Collection getResponses() { + public Collection getResponses() { return responses; } - public IBidder getWinningBidder() { - return winningBidder; - } - - public long getRunnerUp() { + public ContextualizedBidResponse getRunnerUp() { return runnerUp; } } diff --git a/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java b/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java old mode 100644 new mode 100755 index c38beff..c4ed347 --- a/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java @@ -2,6 +2,7 @@ import com.bidtorrent.bidding.messages.BidResponse; import com.bidtorrent.bidding.messages.Imp; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -36,18 +37,18 @@ public Future runAuction(final Auction auction) { resultFuture = this.executor.submit(new Callable() { @Override public AuctionResult call() throws ExecutionException, InterruptedException { - Collection> responseFutures; - ListenableFuture> responses; + Collection> responseFutures; + ListenableFuture> responses; responseFutures = pushResponseFutures(auction.getImpression(), auction.getBidders()); responses = getBidResponses(responseFutures); - return Futures.lazyTransform(responses, new Function, AuctionResult>() { + return Futures.lazyTransform(responses, new Function, AuctionResult>() { @Nullable @Override - public AuctionResult apply(List input) { + public AuctionResult apply(List input) { input.removeAll(Collections.singleton(null)); - return buildAuctionResult(input, auction.getImpression().bidfloor, auction.getBidders()); + return buildAuctionResult(input, auction.getImpression().bidfloor); } }).get(); } @@ -56,35 +57,33 @@ public AuctionResult apply(List input) { return resultFuture; } - private static AuctionResult buildAuctionResult(Collection responses, float floor, Collection bidders) { + private static AuctionResult buildAuctionResult(Collection responses, float floor) { float secondPrice; - long runnerUp = 0l; - BidResponse winningBid; - SortedSet sortedResponses; - Iterator iterator; + ContextualizedBidResponse runnerUp = null; + ContextualizedBidResponse winningBid; + SortedSet sortedResponses; + Iterator iterator; sortedResponses = new TreeSet<>(responses); iterator = sortedResponses.iterator(); if (!iterator.hasNext()) - return new AuctionResult(null, 0, null, responses, 0); + return new AuctionResult(); winningBid = iterator.next(); if (iterator.hasNext()){ - BidResponse second = iterator.next(); - secondPrice = second.getPrice(); - runnerUp = second.getBidderId(); - } - else + ContextualizedBidResponse second = iterator.next(); + runnerUp = second; + secondPrice = runnerUp.getBidResponse().getPrice(); + } else secondPrice = floor; - return new AuctionResult(winningBid, secondPrice, getBidderById(winningBid.getBidderId(), bidders), sortedResponses, runnerUp); + return new AuctionResult(winningBid, sortedResponses, runnerUp, secondPrice); } - private static Collection> pushResponseFutures(Imp impression, List bidders) - { - Collection> responseFutures; + private static Collection> pushResponseFutures(Imp impression, List bidders) { + Collection> responseFutures; responseFutures = new ArrayList<>(bidders.size()); @@ -101,17 +100,7 @@ public void processError(Exception e) { } }; - private static ListenableFuture> getBidResponses(Collection> responseFutures) - { + private static ListenableFuture> getBidResponses(Collection> responseFutures) { return Futures.successfulAsList(responseFutures); } - - private static IBidder getBidderById(long bidderId, Collection bidders) { - for (IBidder bidder : bidders) { - if (bidder.getId() == bidderId) - return bidder; - } - - return null; - } } diff --git a/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java b/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java old mode 100644 new mode 100755 index d266487..e81a5e4 --- a/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java @@ -1,14 +1,11 @@ package com.bidtorrent.bidding; -import com.bidtorrent.bidding.messages.BidResponse; import com.bidtorrent.bidding.messages.Imp; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.google.common.util.concurrent.ListenableFuture; - import java.io.Serializable; -import java.util.concurrent.Callable; public interface IBidder extends Serializable{ - ListenableFuture bid(Imp impression, IErrorCallback errorCallback); - + ListenableFuture bid(Imp impression, IErrorCallback errorCallback); long getId(); } diff --git a/bidding/src/main/java/com/bidtorrent/bidding/Notificator.java b/bidding/src/main/java/com/bidtorrent/bidding/Notificator.java index 608f46d..dfb15fd 100755 --- a/bidding/src/main/java/com/bidtorrent/bidding/Notificator.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/Notificator.java @@ -1,16 +1,5 @@ package com.bidtorrent.bidding; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.scheme.PlainSocketFactory; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; - import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/bidding/src/main/java/com/bidtorrent/bidding/bidders/ConstantBidder.java b/bidding/src/main/java/com/bidtorrent/bidding/bidders/ConstantBidder.java old mode 100644 new mode 100755 index 80ed2bf..975be9f --- a/bidding/src/main/java/com/bidtorrent/bidding/bidders/ConstantBidder.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/bidders/ConstantBidder.java @@ -3,7 +3,9 @@ import com.bidtorrent.bidding.IBidder; import com.bidtorrent.bidding.IErrorCallback; import com.bidtorrent.bidding.messages.BidResponse; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.bidtorrent.bidding.messages.Imp; +import com.bidtorrent.bidding.messages.configuration.BidderConfiguration; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -18,12 +20,14 @@ public ConstantBidder(long id, BidResponse response) { } @Override - public ListenableFuture bid(Imp impression, IErrorCallback errorCallback) { - return Futures.immediateFuture(response); + public ListenableFuture bid(Imp impression, IErrorCallback errorCallback) { + BidderConfiguration bidderConfiguration = new BidderConfiguration(); + bidderConfiguration.id = id; + return Futures.immediateFuture(new ContextualizedBidResponse(response, bidderConfiguration)); } @Override public long getId() { return this.id; } -} +} \ No newline at end of file diff --git a/bidding/src/main/java/com/bidtorrent/bidding/bidders/HttpBidder.java b/bidding/src/main/java/com/bidtorrent/bidding/bidders/HttpBidder.java old mode 100644 new mode 100755 index 10dab9b..05d9596 --- a/bidding/src/main/java/com/bidtorrent/bidding/bidders/HttpBidder.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/bidders/HttpBidder.java @@ -6,42 +6,52 @@ import com.bidtorrent.bidding.messages.App; import com.bidtorrent.bidding.messages.BidRequest; import com.bidtorrent.bidding.messages.BidResponse; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.bidtorrent.bidding.messages.Device; import com.bidtorrent.bidding.messages.Ext; import com.bidtorrent.bidding.messages.Geo; import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.Publisher; import com.bidtorrent.bidding.messages.User; +import com.bidtorrent.bidding.messages.configuration.BidderConfiguration; +import com.google.common.base.Function; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.Arrays; +import javax.annotation.Nullable; + public class HttpBidder implements IBidder { - private long id; - private final String name; - private final String bidUrl; + private final BidderConfiguration bidderConfiguration; private final PooledHttpClient pooledHttpClient; - public HttpBidder(long id, String name, String bidUrl, PooledHttpClient pooledHttpClient) - { - this.id = id; - this.name = name; - this.bidUrl = bidUrl; + public HttpBidder(BidderConfiguration bidderConfiguration, PooledHttpClient pooledHttpClient) { + this.bidderConfiguration = bidderConfiguration; this.pooledHttpClient = pooledHttpClient; } @Override - public ListenableFuture bid(final Imp impression, IErrorCallback errorCallback) { - return pooledHttpClient.jsonPost(bidUrl, HttpBidder.createBidRequest(impression), BidResponse.class); + public ListenableFuture bid(final Imp impression, IErrorCallback errorCallback) { + return Futures.transform(pooledHttpClient.jsonPost(this.bidderConfiguration.bid_ep, HttpBidder.createBidRequest(impression), BidResponse.class), + new Function() { + @Nullable + @Override + public ContextualizedBidResponse apply(BidResponse input) { + if (input == null) return null; + + return new ContextualizedBidResponse(input, bidderConfiguration); + } + }); } public String getName() { - return name; + return this.bidderConfiguration.name; } public long getId() { - return id; + return this.bidderConfiguration.id; } private static BidRequest createBidRequest(Imp impression){ diff --git a/bidding/src/main/java/com/bidtorrent/bidding/messages/BidResponse.java b/bidding/src/main/java/com/bidtorrent/bidding/messages/BidResponse.java index f82f3d3..659ef4b 100755 --- a/bidding/src/main/java/com/bidtorrent/bidding/messages/BidResponse.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/messages/BidResponse.java @@ -1,5 +1,7 @@ package com.bidtorrent.bidding.messages; +import com.bidtorrent.bidding.messages.configuration.BidderConfiguration; + import java.io.Serializable; import java.util.ArrayList; @@ -10,6 +12,8 @@ public class BidResponse implements Comparable, Serializable { public String cur; public ArrayList seatbid; + private BidderConfiguration bidderConfiguration; + public BidResponse(long bidderId, float bidPrice, int bidId, String domain, String creative, String notificationUrl) { this.bidderId = bidderId; Bid bid = new Bid("" + bidId, "", bidPrice, "", notificationUrl, domain, creative); @@ -35,6 +39,14 @@ public void setBidderId(long bidderId) this.bidderId = bidderId; } + public void setBidderConfiguration(BidderConfiguration bidderConfiguration) { + this.bidderConfiguration = bidderConfiguration; + } + + public BidderConfiguration getBidderConfiguration() { + return bidderConfiguration; + } + @Override public int compareTo(Object o) { BidResponse s = (BidResponse) o; diff --git a/bidding/src/main/java/com/bidtorrent/bidding/messages/ContextualizedBidResponse.java b/bidding/src/main/java/com/bidtorrent/bidding/messages/ContextualizedBidResponse.java new file mode 100755 index 0000000..c8150aa --- /dev/null +++ b/bidding/src/main/java/com/bidtorrent/bidding/messages/ContextualizedBidResponse.java @@ -0,0 +1,29 @@ +package com.bidtorrent.bidding.messages; + +import com.bidtorrent.bidding.messages.configuration.BidderConfiguration; + +import java.io.Serializable; + +public class ContextualizedBidResponse implements Comparable, Serializable{ + + private BidResponse bidResponse; + private BidderConfiguration bidderConfiguration; + + public ContextualizedBidResponse(BidResponse bidResponse, BidderConfiguration bidderConfiguration) { + this.bidResponse = bidResponse; + this.bidderConfiguration = bidderConfiguration; + } + + public BidderConfiguration getBidderConfiguration() { + return bidderConfiguration; + } + + public BidResponse getBidResponse() { + return bidResponse; + } + + @Override + public int compareTo(Object o) { + return this.bidResponse.compareTo(((ContextualizedBidResponse)o).bidResponse); + } +} diff --git a/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfiguration.java b/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfiguration.java old mode 100644 new mode 100755 index de1d14b..79834cc --- a/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfiguration.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfiguration.java @@ -1,9 +1,8 @@ package com.bidtorrent.bidding.messages.configuration; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; +import java.io.Serializable; -public class BidderConfiguration { +public class BidderConfiguration implements Serializable { public Long id; public String bid_ep; public String name; diff --git a/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfigurationFilters.java b/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfigurationFilters.java old mode 100644 new mode 100755 index 49212d5..a077af5 --- a/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfigurationFilters.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/messages/configuration/BidderConfigurationFilters.java @@ -1,12 +1,13 @@ package com.bidtorrent.bidding.messages.configuration; +import java.io.Serializable; import java.util.Collection; import java.util.Collections; /** * Created by x.noelle on 30/06/2015. */ -public class BidderConfigurationFilters { +public class BidderConfigurationFilters implements Serializable{ public Float sampling; public Collection pub_ctry; public Boolean pub_ctry_wl; diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java old mode 100644 new mode 100755 index 795e4bf..f381f4a --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java @@ -165,19 +165,16 @@ public void apply(WaitingClient client, ReadyAd ad) { public void apply(Imp impression, AuctionResult auctionResult, Long auctionId) { sendItToPrefetch(auctionResult, impression, auctionId); } - }, 5 * 60 * 1000, this.isNetworkAvailable(), new Function(){ + }, 5 * 60 * 1000, this.isNetworkAvailable(), new Function() { @Override public Boolean apply(WaitingClient waitingClient) { Intent fallbackIntent = new Intent(Constants.DISPLAY_PASSBACK_AD_INTENT); fallbackIntent.putExtra(Constants.PASSBACK_URL_ARG, publisherConfiguration.passback); fallbackIntent.putExtra(Constants.REQUESTER_ID_ARG, waitingClient.getId()); sendBroadcast(fallbackIntent); - return true; } }); - //Timeouts? 150000, 5 * 60 * 1000); - } @Override @@ -251,7 +248,7 @@ private void sendItToPrefetch(AuctionResult auctionResult, Imp impression, Long Intent responseAvailableIntent = new Intent(Constants.BID_AVAILABLE_INTENT); responseAvailableIntent - .putExtra(Constants.CREATIVE_CODE_ARG, auctionResult.getWinningBid().seatbid.get(0).bid.get(0).creative) + .putExtra(Constants.CREATIVE_CODE_ARG, auctionResult.getWinningBid().getBidResponse().seatbid.get(0).bid.get(0).creative) .putExtra(Constants.IMPRESSION_ID_ARG, impression.id) .putExtra(Constants.AUCTION_ID_ARG, auctionId); diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java old mode 100644 new mode 100755 index 31f441e..2ccec15 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java @@ -4,8 +4,8 @@ import com.bidtorrent.bidding.AuctionResult; import com.bidtorrent.bidding.Notificator; -import com.bidtorrent.bidding.messages.BidResponse; import com.bidtorrent.bidding.messages.Imp; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.bidtorrent.bidding.messages.configuration.PublisherConfiguration; import com.bidtorrent.biddingservice.Constants; @@ -24,7 +24,7 @@ public void handleIntent(Intent intent) { AuctionResult result = (AuctionResult) intent.getSerializableExtra(Constants.AUCTION_RESULT_ARG); String impressionId = ActionHelper.getImpressionId(intent); - String notificationUrl = result.getWinningBid().buildNotificationUrl(result.getWinningBid().id, "", result.getRunnerUp()); + String notificationUrl = result.getWinningBid().getBidResponse().buildNotificationUrl(result.getWinningBid().getBidResponse().id, "", result.getRunnerUp().getBidderConfiguration().id); this.notificator.notify(notificationUrl); try { @@ -40,10 +40,10 @@ private String getLoggingUrl(AuctionResult result, String impressionId) { String a = ""; builder.append("log.bidtorrent.io/imp?"); - for (BidResponse response : result.getResponses()){ - a = response.id + "-" + response.seatbid.get(0).bid.get(0).impid; + for (ContextualizedBidResponse response : result.getResponses()){ + a = response.getBidResponse().id + "-" + response.getBidResponse().seatbid.get(0).bid.get(0).impid; //FIXME: We need to send the entire bidder - builder.append(String.format("d[%s]=%.2f-%s&", response.id, response.getPrice(), response.getBidderId())); + builder.append(String.format("d[%s]=%.2f-%s&", response.getBidResponse().id, response.getBidResponse().getPrice(), response.getBidderConfiguration().key)); } Imp impression = this.publisherConfiguration.getImpressionById(impressionId); diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/debug/ListViewAdapter.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/debug/ListViewAdapter.java index 55a38bc..dcf8751 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/debug/ListViewAdapter.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/debug/ListViewAdapter.java @@ -11,23 +11,24 @@ import android.widget.TextView; import com.bidtorrent.bidding.messages.BidResponse; +import com.bidtorrent.bidding.messages.ContextualizedBidResponse; import com.bidtorrent.biddingservice.R; import java.text.NumberFormat; import java.util.List; import java.util.Locale; -public class ListViewAdapter extends ArrayAdapter { +public class ListViewAdapter extends ArrayAdapter { private final int resource; // Declare Variables Context context; LayoutInflater inflater; - List bidresponseslist; + List bidresponseslist; private SparseBooleanArray mSelectedItemsIds; public ListViewAdapter(Context context, int resourceId, - List bidresponseslist) { + List bidresponseslist) { super(context, resourceId, bidresponseslist); mSelectedItemsIds = new SparseBooleanArray(); this.context = context; @@ -56,11 +57,11 @@ public View getView(int position, View view, ViewGroup parent) { } // Capture position and set to the TextViews - long bidderId = bidresponseslist.get(position).bidderId; + long bidderId = bidresponseslist.get(position).getBidderConfiguration().id; holder.bidderuri.setText("BidderId: " + bidderId); if (bidresponseslist.get(position) != null) - holder.price.setText(NumberFormat.getCurrencyInstance(new Locale("en", "US")).format(bidresponseslist.get(position).getPrice())); + holder.price.setText(NumberFormat.getCurrencyInstance(new Locale("en", "US")).format(bidresponseslist.get(position).getBidResponse().getPrice())); else holder.price.setText("TIMEOUT"); diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java old mode 100644 new mode 100755 diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/receivers/CreativeDisplayReceiver.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/receivers/CreativeDisplayReceiver.java index 50b5a4c..23f512d 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/receivers/CreativeDisplayReceiver.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/receivers/CreativeDisplayReceiver.java @@ -3,28 +3,20 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.database.DataSetObserver; import android.view.View; import android.view.ViewGroup; -import android.webkit.JavascriptInterface; import android.webkit.WebView; import android.webkit.WebViewClient; -import android.widget.ArrayAdapter; -import android.widget.ListAdapter; import android.widget.ListView; import android.widget.Toast; import com.bidtorrent.bidding.AuctionResult; -import com.bidtorrent.bidding.Notificator; -import com.bidtorrent.bidding.messages.BidResponse; import com.bidtorrent.biddingservice.BiddingIntentService; import com.bidtorrent.biddingservice.Constants; import com.bidtorrent.biddingservice.R; import com.bidtorrent.biddingservice.debug.ListViewAdapter; -import java.io.Serializable; import java.util.ArrayList; -import java.util.Objects; public class CreativeDisplayReceiver extends BroadcastReceiver { private ViewGroup debugView; @@ -78,7 +70,7 @@ private void showDebugInfo(Context context, AuctionResult result) { if (this.debugView == null) return; ListView listView = new ListView(context); - listView.setAdapter(new ListViewAdapter(context, R.layout.debug, new ArrayList(result.getResponses()))); + listView.setAdapter(new ListViewAdapter(context, R.layout.debug, new ArrayList<>(result.getResponses()))); debugView.addView(listView); } From 91a461a5c893a7e6c4a38039fa6d8826d99dc0d7 Mon Sep 17 00:00:00 2001 From: Matias Waisgold Date: Fri, 25 Sep 2015 11:15:18 +0200 Subject: [PATCH 2/2] Cleanup --- .../src/main/java/com/bidtorrent/bidding/Auctioneer.java | 3 +-- bidding/src/main/java/com/bidtorrent/bidding/IBidder.java | 3 ++- .../bidtorrent/biddingservice/BiddingIntentService.java | 1 - .../biddingservice/actions/NotificationsAction.java | 2 +- .../configuration/PublisherConfigurationLoader.java | 3 --- .../biddingservice/functions/TriggerBidFunction.java | 7 +------ 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java b/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java index c4ed347..b3d3c98 100755 --- a/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/Auctioneer.java @@ -1,8 +1,7 @@ package com.bidtorrent.bidding; -import com.bidtorrent.bidding.messages.BidResponse; -import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.ContextualizedBidResponse; +import com.bidtorrent.bidding.messages.Imp; import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java b/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java index e81a5e4..9d9968d 100755 --- a/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java +++ b/bidding/src/main/java/com/bidtorrent/bidding/IBidder.java @@ -1,8 +1,9 @@ package com.bidtorrent.bidding; -import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.ContextualizedBidResponse; +import com.bidtorrent.bidding.messages.Imp; import com.google.common.util.concurrent.ListenableFuture; + import java.io.Serializable; public interface IBidder extends Serializable{ diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java index f381f4a..692a7c0 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/BiddingIntentService.java @@ -156,7 +156,6 @@ public void apply(WaitingClient client, ReadyAd ad) { }, new TriggerBidFunction( this.selector, - this.publisherConfiguration, this.pooledHttpClient, this.executor, this.auctioneer), diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java index 2ccec15..36124cb 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/actions/NotificationsAction.java @@ -4,8 +4,8 @@ import com.bidtorrent.bidding.AuctionResult; import com.bidtorrent.bidding.Notificator; -import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.ContextualizedBidResponse; +import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.configuration.PublisherConfiguration; import com.bidtorrent.biddingservice.Constants; diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/configuration/PublisherConfigurationLoader.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/configuration/PublisherConfigurationLoader.java index 439db56..5ade7b0 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/configuration/PublisherConfigurationLoader.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/configuration/PublisherConfigurationLoader.java @@ -1,7 +1,6 @@ package com.bidtorrent.biddingservice.configuration; import android.content.res.AssetManager; -import android.net.Uri; import android.util.Log; import com.bidtorrent.bidding.PooledHttpClient; @@ -10,10 +9,8 @@ import com.bidtorrent.bidding.messages.Ext; import com.bidtorrent.bidding.messages.Imp; import com.bidtorrent.bidding.messages.Publisher; -import com.bidtorrent.bidding.messages.configuration.BidderConfiguration; import com.bidtorrent.bidding.messages.configuration.PublisherConfiguration; import com.google.common.base.Function; -import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java b/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java index 1e6c17b..5823345 100755 --- a/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java +++ b/biddingservice/src/main/java/com/bidtorrent/biddingservice/functions/TriggerBidFunction.java @@ -26,20 +26,17 @@ public class TriggerBidFunction implements Function"; private BidderSelector selector; - private PublisherConfiguration publisherConfiguration; private PooledHttpClient pooledHttpClient; private ListeningExecutorService executor; private Auctioneer auctioneer; public TriggerBidFunction( BidderSelector selector, - PublisherConfiguration publisherConfiguration, PooledHttpClient pooledHttpClient, ListeningExecutorService executor, Auctioneer auctioneer) { this.selector = selector; - this.publisherConfiguration = publisherConfiguration; this.pooledHttpClient = pooledHttpClient; this.executor = executor; this.auctioneer = auctioneer; @@ -56,9 +53,7 @@ public ListenableFuture apply(final Imp impression) { for (BidderConfiguration config : selector.getAvailableBidders()) { bidders.add( new HttpBidder( - 1, - "Kitten", - config.bid_ep, + config, pooledHttpClient)); }