v3.2.0-SNAPSHOT

Refactored to use com.amilesend:okhttp-client-extensions:1.0

Author: andy-miles

README.md

@@ -85,7 +85,7 @@ requires these APIs.
    <dependency>
        <groupId>com.amilesend</groupId>
        <artifactId>tmdb-java-client</artifactId>
-       <version>3.1.1</version>
+       <version>3.2</version>
    </dependency>
    ```
 3. Instantiate the client with the read access token:

pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>com.amilesend</groupId>
     <artifactId>tmdb-java-client</artifactId>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <name>tmdb-java-client</name>
     <description>A client to access the TMDB API</description>
@@ -159,62 +159,24 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- JSON -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.13.1</version>
-        </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
             <artifactId>gson-fire</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <!-- Guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.4.8-jre</version>
-        </dependency>
-        <!-- Apache Commons -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.17.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.5.0</version>
-        </dependency>
         <!-- HttpClient -->
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp-jvm</artifactId>
-            <version>${okhttp.version}</version>
+            <groupId>com.amilesend</groupId>
+            <artifactId>okhttp-client-extensions</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver3-junit5</artifactId>
             <version>${okhttp.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okio</groupId>
-            <artifactId>okio</artifactId>
-            <version>3.15.0</version>
-        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/amilesend/tmdb/client/Tmdb.java

@@ -17,6 +17,8 @@
  */
 package com.amilesend.tmdb.client;
 
+import com.amilesend.client.connection.Connection;
+import com.amilesend.client.connection.DefaultConnectionBuilder;
 import com.amilesend.tmdb.client.api.AccountApi;
 import com.amilesend.tmdb.client.api.AuthenticationApi;
 import com.amilesend.tmdb.client.api.CertificationsApi;
@@ -45,15 +47,21 @@
 import com.amilesend.tmdb.client.api.TvSeriesApi;
 import com.amilesend.tmdb.client.api.TvSeriesListsApi;
 import com.amilesend.tmdb.client.api.WatchProvidersApi;
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.tmdb.client.connection.auth.TokenAuthInfo;
+import com.amilesend.tmdb.client.connection.auth.TokenAuthManager;
+import com.amilesend.tmdb.client.parse.GsonFactory;
 import lombok.Getter;
+import okhttp3.OkHttpClient;
 
 /**
  * A helper class to vend API classes that are associated with a {@link Connection} to TMDB service.
  *
  * @see Connection
  */
 public class Tmdb {
+    public static final String API_URL = "https://api.themoviedb.org/3";
+    public static final String USER_AGENT = "TMDBJavaClient/3.2";
+
     @Getter
     private final Connection connection;
 
@@ -63,7 +71,25 @@ public class Tmdb {
      * @param readAccessToken the authenticated read access token
      */
     public Tmdb(final String readAccessToken) {
-        connection = Connection.newDefaultInstance(readAccessToken);
+       this(readAccessToken, USER_AGENT);
+    }
+
+    /**
+     * Creates a new {@code Tmdb} object that is configured with the default settings.
+     *
+     * @param readAccessToken the authenticated read access token
+     * @param userAgent the user agent to define in requests made to the service
+     */
+    public Tmdb(final String readAccessToken, final String userAgent) {
+        final TokenAuthInfo authInfo = new TokenAuthInfo(readAccessToken);
+        connection = new DefaultConnectionBuilder()
+                .userAgent(userAgent)
+                .baseUrl(API_URL)
+                .httpClient(new OkHttpClient.Builder().build())
+                .authManager(new TokenAuthManager(authInfo))
+                .gsonFactory(new GsonFactory())
+                .isGzipContentEncodingEnabled(false)
+                .build();
     }
 
     /**

src/main/java/com/amilesend/tmdb/client/api/AccountApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.acount.AddFavoriteRequest;
 import com.amilesend.tmdb.client.model.acount.AddFavoriteResponse;
 import com.amilesend.tmdb.client.model.acount.AddWatchlistRequest;

src/main/java/com/amilesend/tmdb/client/api/ApiBase.java

@@ -17,10 +17,11 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
+import com.amilesend.client.parse.parser.BasicParser;
 import com.amilesend.tmdb.client.model.BodyBasedRequest;
 import com.amilesend.tmdb.client.model.QueryParameterBasedRequest;
-import com.amilesend.tmdb.client.parse.parser.BasicParser;
+import com.amilesend.tmdb.client.parse.GsonFactory;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +30,7 @@
 import okhttp3.RequestBody;
 import org.apache.commons.lang3.Validate;
 
-import static com.amilesend.tmdb.client.connection.Connection.JSON_MEDIA_TYPE;
+import static com.amilesend.client.connection.Connection.JSON_MEDIA_TYPE;
 
 /**
  * The API Base class used to simplify the construction of API URLs for the {@link Connection}.
@@ -41,7 +42,7 @@ public abstract class ApiBase {
     /** The connection that wraps the underlying HTTP client. */
     @NonNull
     @Getter
-    private final Connection connection;
+    private final Connection<GsonFactory> connection;
 
     /**
      * Executes a GET request for the given URL path and expected response type class.
@@ -109,7 +110,9 @@ protected <T> T executePost(
         final HttpUrl.Builder urlBuilder = HttpUrl.parse(urlPath).newBuilder();
         final Request httpRequest = connection.newRequestBuilder()
                 .url(request.populateQueryParameters(urlBuilder).build())
-                .post(RequestBody.create(connection.getGson().toJson(request), JSON_MEDIA_TYPE))
+                .post(RequestBody.create(
+                        connection.getGsonFactory().getInstance(connection).toJson(request),
+                        JSON_MEDIA_TYPE))
                 .build();
         return connection.execute(httpRequest, new BasicParser<>(responseType));
     }
@@ -135,7 +138,9 @@ protected <T> T executeDelete(
 
         final Request.Builder requestBuilder =  connection.newRequestBuilder().url(httpUrl);
         if (request instanceof BodyBasedRequest) {
-            requestBuilder.delete(RequestBody.create(connection.getGson().toJson(request), JSON_MEDIA_TYPE));
+            requestBuilder.delete(RequestBody.create(
+                    connection.getGsonFactory().getInstance(connection).toJson(request),
+                    JSON_MEDIA_TYPE));
         } else {
             requestBuilder.delete();
         }

src/main/java/com/amilesend/tmdb/client/api/AuthenticationApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.auth.CreateGuestSessionResponse;
 import com.amilesend.tmdb.client.model.auth.CreateRequestTokenResponse;
 import com.amilesend.tmdb.client.model.auth.CreateSessionRequest;

src/main/java/com/amilesend/tmdb/client/api/CertificationsApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.certification.GetMovieCertificationsResponse;
 import com.amilesend.tmdb.client.model.certification.GetTVCertificationsResponse;
 

src/main/java/com/amilesend/tmdb/client/api/ChangesApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.change.GetMovieChangesRequest;
 import com.amilesend.tmdb.client.model.change.GetMovieChangesResponse;
 import com.amilesend.tmdb.client.model.change.GetPersonChangesRequest;

src/main/java/com/amilesend/tmdb/client/api/CollectionsApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.collection.GetCollectionDetailsRequest;
 import com.amilesend.tmdb.client.model.collection.GetCollectionDetailsResponse;
 import com.amilesend.tmdb.client.model.collection.GetCollectionImagesRequest;

src/main/java/com/amilesend/tmdb/client/api/CompaniesApi.java

@@ -17,7 +17,7 @@
  */
 package com.amilesend.tmdb.client.api;
 
-import com.amilesend.tmdb.client.connection.Connection;
+import com.amilesend.client.connection.Connection;
 import com.amilesend.tmdb.client.model.company.GetAlternativeNamesRequest;
 import com.amilesend.tmdb.client.model.company.GetAlternativeNamesResponse;
 import com.amilesend.tmdb.client.model.company.GetCompanyDetailsRequest;