Updated okhttp to 5.0.0

Author: andy-miles

pom.xml

@@ -73,7 +73,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.7</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -119,7 +119,7 @@
         <maven.javadoc.plugin.version>3.11.2</maven.javadoc.plugin.version>
         <mockito.version>5.18.0</mockito.version>
         <slf4j.version>2.0.16</slf4j.version>
-        <okhttp.version>4.12.0</okhttp.version>
+        <okhttp.version>5.0.0</okhttp.version>
     </properties>
 
     <dependencies>
@@ -194,21 +194,27 @@
             <version>4.5.0</version>
         </dependency>
         <!-- HttpClient -->
+        <!-- HttpClient -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <artifactId>okhttp-jvm</artifactId>
+            <version>${okhttp.version}</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.14.0</version>
+            <version>3.15.0</version>
         </dependency>
     </dependencies>
 
@@ -217,7 +223,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>

src/test/java/com/amilesend/tmdb/client/FunctionalTestBase.java

@@ -23,9 +23,9 @@
 import com.amilesend.tmdb.client.parse.GsonFactory;
 import lombok.Getter;
 import lombok.SneakyThrows;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
 import okhttp3.OkHttpClient;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
 import okio.Buffer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -53,7 +53,7 @@ public void setUp() {
     @SneakyThrows
     @AfterEach
     public void cleanUp() {
-        mockWebServer.shutdown();
+        mockWebServer.close();
     }
 
     protected void setUpMockResponse(final int responseCode) {
@@ -63,14 +63,17 @@ protected void setUpMockResponse(final int responseCode) {
     @SneakyThrows
     protected void setUpMockResponse(final int responseCode, final SerializedResource responseBodyResource) {
         if (responseBodyResource == null) {
-            mockWebServer.enqueue(new MockResponse().setResponseCode(responseCode));
+            mockWebServer.enqueue(new MockResponse.Builder()
+                    .code(responseCode)
+                    .build());
             return;
         }
 
-        mockWebServer.enqueue(new MockResponse()
-                .setResponseCode(responseCode)
+        mockWebServer.enqueue(new MockResponse.Builder()
+                .code(responseCode)
                 .addHeader("Content-Type", "application/json; charset=utf-8")
-                .setBody(new Buffer().write(responseBodyResource.toBytes())));
+                .body(new Buffer().write(responseBodyResource.toBytes()))
+                .build());
     }
 
     protected String getMockWebServerUrl() {

src/test/java/com/amilesend/tmdb/client/api/AccountApiFunctionalTest.java

@@ -77,7 +77,7 @@
 import static com.amilesend.tmdb.client.data.account.AccountApiDataValidator.assertSameGetRatedTVResponse;
 import static com.amilesend.tmdb.client.data.account.AccountApiDataValidator.assertSameGetWatchlistMoviesResponse;
 import static com.amilesend.tmdb.client.data.account.AccountApiDataValidator.assertSameGetWatchlistTVResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AccountApiFunctionalTest extends FunctionalTestBase {
     private static final int ACCOUNT_ID = 1;

src/test/java/com/amilesend/tmdb/client/api/AuthenticationApiFunctionalTest.java

@@ -38,7 +38,7 @@
 import static com.amilesend.tmdb.client.data.auth.AuthenticationApiDataHelper.newCreateSessionResponse;
 import static com.amilesend.tmdb.client.data.auth.AuthenticationApiDataHelper.newDeleteSessionResponse;
 import static com.amilesend.tmdb.client.data.auth.AuthenticationApiDataHelper.newValidateKeyResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AuthenticationApiFunctionalTest extends FunctionalTestBase {
     private AuthenticationApi apiUnderTest;

src/test/java/com/amilesend/tmdb/client/api/MoviesApiFunctionalTest.java

@@ -116,7 +116,7 @@
 import static com.amilesend.tmdb.client.data.movie.MoviesApiDataValidator.assertSameGetVideosResponse;
 import static com.amilesend.tmdb.client.data.movie.MoviesApiDataValidator.assertSameGetWatchProvidersResponse;
 import static com.amilesend.tmdb.client.data.movie.MoviesApiDataValidator.assertSameMovieDetails;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MoviesApiFunctionalTest extends FunctionalTestBase {
     private MoviesApi apiUnderTest;

src/test/java/com/amilesend/tmdb/client/api/TvEpisodesApiFunctionalTest.java

@@ -73,7 +73,7 @@
 import static com.amilesend.tmdb.client.data.tv.TvEpisodesApiDataValidator.assertSameGetImagesResponse;
 import static com.amilesend.tmdb.client.data.tv.TvEpisodesApiDataValidator.assertSameGetTranslationsResponse;
 import static com.amilesend.tmdb.client.data.tv.TvEpisodesApiDataValidator.assertSameGetVideosResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TvEpisodesApiFunctionalTest extends FunctionalTestBase {
     private TvEpisodesApi apiUnderTest;

src/test/java/com/amilesend/tmdb/client/api/TvSeriesApiFunctionalTest.java

@@ -126,7 +126,7 @@
 import static com.amilesend.tmdb.client.data.tv.TvSeriesApiDataValidator.assertSameGetTranslationsResponse;
 import static com.amilesend.tmdb.client.data.tv.TvSeriesApiDataValidator.assertSameGetVideosResponse;
 import static com.amilesend.tmdb.client.data.tv.TvSeriesApiDataValidator.assertSameGetWatchProvidersResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TvSeriesApiFunctionalTest extends FunctionalTestBase {
     private TvSeriesApi apiUnderTest;

src/test/java/com/amilesend/tmdb/client/api/WatchProvidersApiFunctionalTest.java

@@ -35,7 +35,7 @@
 import static com.amilesend.tmdb.client.data.watch.WatchProvidersApiDataHelper.newGetAvailableRegionsResponse;
 import static com.amilesend.tmdb.client.data.watch.WatchProvidersApiDataHelper.newGetMovieProvidersResponse;
 import static com.amilesend.tmdb.client.data.watch.WatchProvidersApiDataHelper.newGetTvProvidersResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class WatchProvidersApiFunctionalTest extends FunctionalTestBase {
     private WatchProvidersApi apiUnderTest;

src/test/java/com/amilesend/tmdb/client/connection/auth/GuestSessionManagerTest.java

@@ -32,11 +32,11 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verifyNoInteractions;

src/test/java/com/amilesend/tmdb/client/data/search/SearchApiDataValidator.java

@@ -39,10 +39,10 @@
 import java.util.Objects;
 
 import static com.amilesend.tmdb.client.data.movie.MoviesApiDataValidator.assertSameKeywords;
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 @UtilityClass
 public class SearchApiDataValidator {