Merge pull request #202 from oaplatform/single-client

use single OkHttp client
oaplatform · Sep 7, 2023 · 57cd5e5 · 57cd5e5
2 parents 15f4f1d + 93cba07
commit 57cd5e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/oap-stdlib/src/main/java/oap/http/Client.java b/oap-stdlib/src/main/java/oap/http/Client.java
@@ -43,8 +43,6 @@
 import oap.util.Throwables;
 import oap.util.function.Try;
 import oap.util.function.Try.ThrowingRunnable;
-import okhttp3.RequestBody;
-import okio.Buffer;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -309,12 +307,12 @@ public Response post( String uri, byte[] content, String contentType, Map<String
             .orElseThrow( () -> new RuntimeException( NO_RESPONSE ) );
     }
 
-    @SneakyThrows
-    public Response uploadFile( String uri, RequestBody body, Map<String, Object> headers ) {
-        Buffer sink = new Buffer();
-        body.writeTo( sink );
-        return post( uri, sink.readByteArray(), ContentType.MULTIPART_FORM_DATA.getMimeType(), headers );
-    }
+//    @SneakyThrows
+//    public Response uploadFile( String uri, okhttp3.RequestBody body, Map<String, Object> headers ) {
+//        okio.Buffer sink = new okio.Buffer();
+//        body.writeTo( sink );
+//        return post( uri, sink.readByteArray(), ContentType.MULTIPART_FORM_DATA.getMimeType(), headers );
+//    }
 
     private Optional<Response> getResponse( HttpRequestBase request, long timeout, CompletableFuture<Response> future ) {
         try {

diff --git a/oap-stdlib/src/main/java/oap/http/testng/HttpAsserts.java b/oap-stdlib/src/main/java/oap/http/testng/HttpAsserts.java
@@ -33,7 +33,6 @@
 import oap.util.BiStream;
 import oap.util.Pair;
 import oap.util.Stream;
-import okhttp3.RequestBody;
 import org.joda.time.DateTime;
 
 import java.io.InputStream;
@@ -117,13 +116,13 @@ public static HttpAssertion assertPost( String uri, InputStream content, String
         return assertHttpResponse( client.post( uri, content, contentType, headers ) );
     }
 
-    public static HttpAssertion assertUploadFile( String uri, RequestBody body ) {
-        return new HttpAssertion( client.uploadFile( uri, body, Map.of() ) );
-    }
+//    public static HttpAssertion assertUploadFile( String uri, RequestBody body ) {
+//        return new HttpAssertion( client.uploadFile( uri, body, Map.of() ) );
+//    }
 
-    public static HttpAssertion assertUploadFile( String uri, RequestBody body, Map<String, Object> headers ) {
-        return new HttpAssertion( client.uploadFile( uri, body, headers ) );
-    }
+//    public static HttpAssertion assertUploadFile( String uri, RequestBody body, Map<String, Object> headers ) {
+//        return new HttpAssertion( client.uploadFile( uri, body, headers ) );
+//    }
 
     public static HttpAssertion assertPut( String uri, String content, String contentType ) {
         return assertHttpResponse( client.put( uri, content, contentType ) );

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
 
-        <oap.project.version>18.11.6.1</oap.project.version>
+        <oap.project.version>18.11.6.2</oap.project.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>