From 051e90fa227f313e444366c07a86fae2f4cf19f7 Mon Sep 17 00:00:00 2001 From: Matt Brown Date: Tue, 3 May 2016 07:58:31 -0400 Subject: [PATCH] remove need for HttpClientProvider --- .../apollo/http/client/HttpClient.java | 3 +- .../http/client/HttpClientDecorator.java | 3 ++ .../apollo/http/client/HttpClientModule.java | 4 +- .../http/client/HttpClientProvider.java | 39 ------------------- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientProvider.java diff --git a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClient.java b/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClient.java index 44ae7c456..2273f64eb 100644 --- a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClient.java +++ b/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 { diff --git a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientDecorator.java b/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientDecorator.java index d8903ac5c..eb48fc09f 100644 --- a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientDecorator.java +++ b/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; } diff --git a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientModule.java b/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientModule.java index 41ca8c117..4dbf87d09 100644 --- a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientModule.java +++ b/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); } diff --git a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientProvider.java b/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientProvider.java deleted file mode 100644 index fa84bafca..000000000 --- a/modules/okhttp-client/src/main/java/com/spotify/apollo/http/client/HttpClientProvider.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * -\-\- - * Spotify Apollo okhttp Client Module - * -- - * Copyright (C) 2013 - 2015 Spotify AB - * -- - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * -/-/- - */ -package com.spotify.apollo.http.client; - -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.squareup.okhttp.OkHttpClient; - -class HttpClientProvider implements Provider { - - private final OkHttpClient okHttpClient; - - @Inject - HttpClientProvider(OkHttpClient okHttpClient) { - this.okHttpClient = okHttpClient; - } - - @Override - public HttpClient get() { - return new HttpClient(okHttpClient); - } -}