Update to okhttp 5.x

Author: matthewelwell

pom.xml

@@ -53,8 +53,8 @@
   <dependencies>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>4.12.0</version>
+      <artifactId>okhttp-jvm</artifactId>
+      <version>5.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>3.10.0</version>
+      <version>5.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -173,9 +173,9 @@
         <version>1.14.17</version>
     </dependency>
     <dependency>
-      <groupId>com.github.gmazzo</groupId>
-      <artifactId>okhttp-mock</artifactId>
-      <version>1.4.1</version>
+      <groupId>com.github.gmazzo.okhttp.mock</groupId>
+      <artifactId>mock-client</artifactId>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/flagsmith/FlagsmithApiWrapper.java

@@ -201,7 +201,7 @@ public Flags identifyUserWithTraits(
       node.putPOJO("traits", traits);
     }
 
-    MediaType json = MediaType.parse("application/json; charset=utf-8");
+    MediaType json = MediaType.get("application/json; charset=utf-8");
     RequestBody body = RequestBody.create(node.toString(), json);
 
     HttpUrl url = defaultConfig.getIdentitiesUri();

src/main/java/com/flagsmith/config/FlagsmithConfig.java

@@ -28,7 +28,7 @@ public final class FlagsmithConfig {
   private static final int DEFAULT_READ_TIMEOUT_MILLIS = 5000;
   private static final int DEFAULT_ENVIRONMENT_REFRESH_SECONDS = 60;
   private static final HttpUrl DEFAULT_BASE_URI = HttpUrl
-      .parse("https://edge.api.flagsmith.com/api/v1/");
+      .get("https://edge.api.flagsmith.com/api/v1/");
   private final HttpUrl flagsUri;
   private final HttpUrl identitiesUri;
   private final HttpUrl traitsUri;
@@ -129,7 +129,7 @@ private Builder() {
      */
     public Builder baseUri(String baseUri) {
       if (baseUri != null) {
-        this.baseUri = HttpUrl.parse(baseUri);
+        this.baseUri = HttpUrl.get(baseUri);
       }
       return this;
     }

src/main/java/com/flagsmith/threads/AnalyticsProcessor.java

@@ -132,8 +132,8 @@ public void flush() {
         return;
       }
 
-      MediaType json = MediaType.parse("application/json; charset=utf-8");
-      RequestBody body = RequestBody.create(json, response);
+      MediaType json = MediaType.get("application/json; charset=utf-8");
+      RequestBody body = RequestBody.create(response, json);
 
       Request request = api.newPostRequest(getAnalyticsUrl(), body);