Skip to content

Commit aeeb564

Browse files
committed
okhttp-client-extensions 1.1 refactor
Removed dependencies on guava and apache-commons.
1 parent 0cc28f9 commit aeeb564

56 files changed

Lines changed: 79 additions & 80 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<dependency>
163163
<groupId>com.amilesend</groupId>
164164
<artifactId>okhttp-client-extensions</artifactId>
165-
<version>1.0.1</version>
165+
<version>1.1</version>
166166
</dependency>
167167
<dependency>
168168
<groupId>com.squareup.okhttp3</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.acount.AddFavoriteRequest;
2223
import com.amilesend.tmdb.client.model.acount.AddFavoriteResponse;
2324
import com.amilesend.tmdb.client.model.acount.AddWatchlistRequest;
@@ -43,7 +44,6 @@
4344
import com.amilesend.tmdb.client.model.acount.GetWatchlistTvResponse;
4445
import com.amilesend.tmdb.client.model.acount.type.AccountBasedRequest;
4546
import lombok.NonNull;
46-
import org.apache.commons.lang3.StringUtils;
4747

4848
/**
4949
* Defines APIs to access user account information. Note: A valid session must be authenticated and obtained. This

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.amilesend.client.connection.Connection;
2121
import com.amilesend.client.parse.parser.BasicParser;
22+
import com.amilesend.client.util.Validate;
2223
import com.amilesend.tmdb.client.model.BodyBasedRequest;
2324
import com.amilesend.tmdb.client.model.QueryParameterBasedRequest;
2425
import com.amilesend.tmdb.client.parse.GsonFactory;
@@ -28,7 +29,6 @@
2829
import okhttp3.HttpUrl;
2930
import okhttp3.Request;
3031
import okhttp3.RequestBody;
31-
import org.apache.commons.lang3.Validate;
3232

3333
import static com.amilesend.client.connection.Connection.JSON_MEDIA_TYPE;
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.auth.CreateGuestSessionResponse;
2223
import com.amilesend.tmdb.client.model.auth.CreateRequestTokenResponse;
2324
import com.amilesend.tmdb.client.model.auth.CreateSessionRequest;
@@ -26,7 +27,6 @@
2627
import com.amilesend.tmdb.client.model.auth.DeleteSessionResponse;
2728
import com.amilesend.tmdb.client.model.auth.ValidateKeyResponse;
2829
import lombok.NonNull;
29-
import org.apache.commons.lang3.StringUtils;
3030

3131
/** TMDB Authentication API. */
3232
public class AuthenticationApi extends ApiBase {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.list.GetListDetailsRequest;
2223
import com.amilesend.tmdb.client.model.list.GetListDetailsResponse;
2324
import com.amilesend.tmdb.client.model.network.GetAlternativeNamesRequest;
@@ -28,7 +29,6 @@
2829
import com.amilesend.tmdb.client.model.network.GetNetworkDetailsResponse;
2930
import com.amilesend.tmdb.client.model.network.type.NetworksRequestBase;
3031
import lombok.NonNull;
31-
import org.apache.commons.lang3.StringUtils;
3232

3333
/** TMDB Networks API. */
3434
public class NetworksApi extends ApiBase {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.people.GetChangesRequest;
2223
import com.amilesend.tmdb.client.model.people.GetChangesResponse;
2324
import com.amilesend.tmdb.client.model.people.GetCombinedCreditsRequest;
@@ -37,7 +38,6 @@
3738
import com.amilesend.tmdb.client.model.people.GetTvCreditsResponse;
3839
import com.amilesend.tmdb.client.model.people.type.PersonIdRequestBase;
3940
import lombok.NonNull;
40-
import org.apache.commons.lang3.StringUtils;
4141

4242
/** TMDB People API. */
4343
public class PeopleApi extends ApiBase {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.tv.episodes.AddRatingRequest;
2223
import com.amilesend.tmdb.client.model.tv.episodes.AddRatingResponse;
2324
import com.amilesend.tmdb.client.model.tv.episodes.DeleteRatingRequest;
@@ -40,7 +41,6 @@
4041
import com.amilesend.tmdb.client.model.tv.episodes.GetVideosResponse;
4142
import com.amilesend.tmdb.client.model.tv.episodes.type.EpisodeRequestBase;
4243
import lombok.NonNull;
43-
import org.apache.commons.lang3.StringUtils;
4444

4545
/** TMDB TV Episodes API. */
4646
public class TvEpisodesApi extends ApiBase {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.tv.seasons.GetAccountStatesRequest;
2223
import com.amilesend.tmdb.client.model.tv.seasons.GetAccountStatesResponse;
2324
import com.amilesend.tmdb.client.model.tv.seasons.GetAggregateCreditsRequest;
@@ -38,7 +39,6 @@
3839
import com.amilesend.tmdb.client.model.tv.seasons.GetWatchProvidersResponse;
3940
import com.amilesend.tmdb.client.model.tv.seasons.type.SeasonRequestBase;
4041
import lombok.NonNull;
41-
import org.apache.commons.lang3.StringUtils;
4242

4343
/** TMDB TV Seasons API. */
4444
public class TvSeasonsApi extends ApiBase {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.amilesend.tmdb.client.api;
1919

2020
import com.amilesend.client.connection.Connection;
21+
import com.amilesend.client.util.StringUtils;
2122
import com.amilesend.tmdb.client.model.tv.series.AddRatingRequest;
2223
import com.amilesend.tmdb.client.model.tv.series.AddRatingResponse;
2324
import com.amilesend.tmdb.client.model.tv.series.DeleteRatingRequest;
@@ -62,7 +63,6 @@
6263
import com.amilesend.tmdb.client.model.tv.series.GetWatchProvidersResponse;
6364
import com.amilesend.tmdb.client.model.tv.series.type.SeriesRequestBase;
6465
import lombok.NonNull;
65-
import org.apache.commons.lang3.StringUtils;
6666

6767
/** TMDB TV Series API. */
6868
public class TvSeriesApi extends ApiBase {

src/main/java/com/amilesend/tmdb/client/connection/auth/GuestSessionManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
package com.amilesend.tmdb.client.connection.auth;
1919

2020
import com.amilesend.client.connection.ResponseException;
21+
import com.amilesend.client.util.StringUtils;
22+
import com.amilesend.client.util.VisibleForTesting;
2123
import com.amilesend.tmdb.client.api.AuthenticationApi;
2224
import com.amilesend.tmdb.client.model.auth.CreateGuestSessionResponse;
2325
import com.amilesend.tmdb.client.model.auth.DeleteSessionRequest;
2426
import com.amilesend.tmdb.client.model.auth.DeleteSessionResponse;
25-
import com.google.common.annotations.VisibleForTesting;
2627
import lombok.Builder;
2728
import lombok.NonNull;
2829
import lombok.extern.slf4j.Slf4j;
29-
import org.apache.commons.lang3.StringUtils;
3030

3131
import java.util.concurrent.atomic.AtomicReference;
3232

0 commit comments

Comments
 (0)