remove need for HttpClientProvider

modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClient.java

@@ -21,7 +21,6 @@
 
 import com.spotify.apollo.environment.IncomingRequestAwareClient;
 
-import com.google.inject.Inject;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
@@ -32,6 +31,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import okio.ByteString;
 
 class HttpClient implements IncomingRequestAwareClient {

modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientDecorator.java

@@ -22,10 +22,13 @@
 import com.spotify.apollo.environment.ClientDecorator;
 import com.spotify.apollo.environment.IncomingRequestAwareClient;
 
+import javax.inject.Inject;
+
 class HttpClientDecorator implements ClientDecorator {
 
   private final HttpClient httpClient;
 
+  @Inject
   HttpClientDecorator(HttpClient httpClient) {
     this.httpClient = httpClient;
   }

modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientModule.java

@@ -28,7 +28,7 @@
 
 public class HttpClientModule extends AbstractApolloModule {
 
-  HttpClientModule() {
+  private HttpClientModule() {
   }
 
   public static ApolloModule create() {
@@ -40,7 +40,7 @@ protected void configure() {
     Multibinder.newSetBinder(binder(), ClientDecorator.class)
         .addBinding().toProvider(HttpClientDecoratorProvider.class);
 
-    bind(HttpClient.class).toProvider(HttpClientProvider.class);
+    bind(HttpClient.class);
     bind(OkHttpClient.class).toProvider(OkHttpClientProvider.class);
   }