Cleanup

BidTorrent · Sep 25, 2015 · 91a461a · 91a461a
1 parent 8fad617
commit 91a461a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...c/main/java/com/bidtorrent/biddingservice/configuration/PublisherConfigurationLoader.java b/...c/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
@@ -26,20 +26,17 @@ public class TriggerBidFunction implements Function<Imp, ListenableFuture<Auctio
 
     public static final String DEFAULT_CREATIVE = "<html><head><meta name=\"viewport\" content=\"initial-scale=1, width=300, user-scalable=no\" /></head><body style=\"padding:0px; margin:0px\"><img width=\"100%\" src=\"http://adlb.me/bidder/Ads/kitten_ad-300x250.jpg\"/></body></html>";
     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<AuctionResult> apply(final Imp impression) {
         for (BidderConfiguration config : selector.getAvailableBidders()) {
             bidders.add(
                 new HttpBidder(
-                    1,
-                    "Kitten",
-                    config.bid_ep,
+                    config,
                     pooledHttpClient));
         }