From 288fd4902b91c8c42a3bc9232e4036efb09a33e2 Mon Sep 17 00:00:00 2001 From: AnasNaouchi Date: Thu, 12 Sep 2024 17:45:25 +0700 Subject: [PATCH 1/2] Update okhttp --- build.gradle | 2 +- src/main/java/co/omise/Configurer.java | 3 +++ src/main/java/co/omise/models/Params.java | 2 +- src/main/java/co/omise/requests/RequestBuilder.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f4a484d5..dc2a1ecd 100644 --- a/build.gradle +++ b/build.gradle @@ -164,7 +164,7 @@ dependencies { implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1' // networking - implementation 'com.squareup.okhttp3:okhttp:3.7.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' // test testImplementation 'junit:junit:4.12' diff --git a/src/main/java/co/omise/Configurer.java b/src/main/java/co/omise/Configurer.java index 279b7a25..8022b60a 100644 --- a/src/main/java/co/omise/Configurer.java +++ b/src/main/java/co/omise/Configurer.java @@ -1,5 +1,7 @@ package co.omise; +import org.jetbrains.annotations.NotNull; + import okhttp3.Credentials; import okhttp3.Interceptor; import okhttp3.Request; @@ -46,6 +48,7 @@ public static Request configure(Config config, Request request) { return builder.build(); } + @NotNull @Override public Response intercept(Chain chain) throws IOException { return chain.proceed(configure(config, chain.request())); diff --git a/src/main/java/co/omise/models/Params.java b/src/main/java/co/omise/models/Params.java index 3b521bf6..2e0fa318 100644 --- a/src/main/java/co/omise/models/Params.java +++ b/src/main/java/co/omise/models/Params.java @@ -58,6 +58,6 @@ public RequestBody body(Serializer serializer) throws IOException { ByteArrayOutputStream stream = new ByteArrayOutputStream(4096); serializer.serializeParams(stream, this); - return RequestBody.create(JSON_MEDIA_TYPE, stream.toByteArray()); + return RequestBody.Companion.create(stream.toByteArray(), JSON_MEDIA_TYPE); } } diff --git a/src/main/java/co/omise/requests/RequestBuilder.java b/src/main/java/co/omise/requests/RequestBuilder.java index 34f61b98..c9c69405 100644 --- a/src/main/java/co/omise/requests/RequestBuilder.java +++ b/src/main/java/co/omise/requests/RequestBuilder.java @@ -91,7 +91,7 @@ protected RequestBody payload() throws IOException { protected RequestBody serialize() throws IOException { ByteArrayOutputStream stream = new ByteArrayOutputStream(4096); serializer().serializeRequestBuilder(stream, this); - return RequestBody.create(JSON_MEDIA_TYPE, stream.toByteArray()); + return RequestBody.Companion.create(stream.toByteArray(), JSON_MEDIA_TYPE); } /** From 7cc3108d0bac8ba9846c9a4864ea96411b4ff4c6 Mon Sep 17 00:00:00 2001 From: AnasNaouchi Date: Thu, 12 Sep 2024 17:45:34 +0700 Subject: [PATCH 2/2] Fix test --- src/test/java/co/omise/testutils/TestInterceptor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/co/omise/testutils/TestInterceptor.java b/src/test/java/co/omise/testutils/TestInterceptor.java index 56d4fad8..d270cc2c 100644 --- a/src/test/java/co/omise/testutils/TestInterceptor.java +++ b/src/test/java/co/omise/testutils/TestInterceptor.java @@ -1,5 +1,7 @@ package co.omise.testutils; +import org.jetbrains.annotations.NotNull; + import co.omise.OmiseTest; import okhttp3.*; @@ -16,6 +18,7 @@ public TestInterceptor(OmiseTest test) { this.test = test; } + @NotNull @Override public Response intercept(Chain chain) { Request request = chain.request(); @@ -32,10 +35,12 @@ public Response intercept(Chain chain) { Response.Builder builder = new Response.Builder() .request(request) .protocol(Protocol.HTTP_1_1) + // Message is not optional anymore and this is only for testing + .message("") .code(code); if (responseData != null) { - builder = builder.body(ResponseBody.create(jsonMediaType, responseData)); + builder = builder.body(ResponseBody.Companion.create(responseData, jsonMediaType)); } return lastResponse = builder.build();