From 9ae72b8c154195e5a1ca6c62033ae879da98c444 Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Wed, 11 Oct 2023 23:06:39 +0000 Subject: [PATCH] Fixing merge conflicts and build Signed-off-by: Vacha Shah --- .../transport/endpoints/SimpleEndpoint.java | 2 +- .../rest_client/RestClientTransport.java | 37 +++++++++++-------- .../client/transport/RequestOptionsTest.java | 22 +++++------ 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/java-client/src/main/java/org/opensearch/client/transport/endpoints/SimpleEndpoint.java b/java-client/src/main/java/org/opensearch/client/transport/endpoints/SimpleEndpoint.java index b428cfaeec..b440c3bc1d 100644 --- a/java-client/src/main/java/org/opensearch/client/transport/endpoints/SimpleEndpoint.java +++ b/java-client/src/main/java/org/opensearch/client/transport/endpoints/SimpleEndpoint.java @@ -35,10 +35,10 @@ import java.util.Collections; import java.util.Map; import java.util.function.Function; +import org.apache.http.client.utils.URLEncodedUtils; import org.opensearch.client.json.JsonpDeserializer; import org.opensearch.client.opensearch._types.ErrorResponse; import org.opensearch.client.transport.JsonEndpoint; -import org.apache.http.client.utils.URLEncodedUtils; public class SimpleEndpoint implements JsonEndpoint { diff --git a/java-client/src/main/java/org/opensearch/client/transport/rest_client/RestClientTransport.java b/java-client/src/main/java/org/opensearch/client/transport/rest_client/RestClientTransport.java index f86a14250d..fd5731e8c0 100644 --- a/java-client/src/main/java/org/opensearch/client/transport/rest_client/RestClientTransport.java +++ b/java-client/src/main/java/org/opensearch/client/transport/rest_client/RestClientTransport.java @@ -32,24 +32,17 @@ package org.opensearch.client.transport.rest_client; -import org.apache.http.HttpStatus; -import org.opensearch.client.opensearch._types.OpenSearchException; -import org.opensearch.client.opensearch._types.ErrorResponse; -import org.opensearch.client.json.JsonpDeserializer; -import org.opensearch.client.json.JsonpMapper; -import org.opensearch.client.json.NdJsonpSerializable; -import org.opensearch.client.transport.JsonEndpoint; -import org.opensearch.client.transport.TransportException; -import org.opensearch.client.transport.endpoints.BooleanEndpoint; -import org.opensearch.client.transport.endpoints.BooleanResponse; -import org.opensearch.client.transport.OpenSearchTransport; -import org.opensearch.client.transport.Endpoint; -import org.opensearch.client.transport.TransportOptions; -import org.opensearch.client.util.ApiTypeHelper; -import org.opensearch.client.util.MissingRequiredPropertyException; import jakarta.json.stream.JsonGenerator; import jakarta.json.stream.JsonParser; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import javax.annotation.Nullable; import org.apache.http.HttpEntity; +import org.apache.http.HttpStatus; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.ContentType; @@ -60,6 +53,20 @@ import org.opensearch.client.ResponseException; import org.opensearch.client.ResponseListener; import org.opensearch.client.RestClient; +import org.opensearch.client.json.JsonpDeserializer; +import org.opensearch.client.json.JsonpMapper; +import org.opensearch.client.json.NdJsonpSerializable; +import org.opensearch.client.opensearch._types.ErrorResponse; +import org.opensearch.client.opensearch._types.OpenSearchException; +import org.opensearch.client.transport.Endpoint; +import org.opensearch.client.transport.JsonEndpoint; +import org.opensearch.client.transport.OpenSearchTransport; +import org.opensearch.client.transport.TransportException; +import org.opensearch.client.transport.TransportOptions; +import org.opensearch.client.transport.endpoints.BooleanEndpoint; +import org.opensearch.client.transport.endpoints.BooleanResponse; +import org.opensearch.client.util.ApiTypeHelper; +import org.opensearch.client.util.MissingRequiredPropertyException; public class RestClientTransport implements OpenSearchTransport { diff --git a/java-client/src/test/java/org/opensearch/client/transport/RequestOptionsTest.java b/java-client/src/test/java/org/opensearch/client/transport/RequestOptionsTest.java index 161bf64787..b62ed1ef83 100644 --- a/java-client/src/test/java/org/opensearch/client/transport/RequestOptionsTest.java +++ b/java-client/src/test/java/org/opensearch/client/transport/RequestOptionsTest.java @@ -33,16 +33,6 @@ package org.opensearch.client.transport; import com.sun.net.httpserver.HttpServer; -import org.apache.http.HttpHost; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; -import org.opensearch.client.ResponseException; -import org.opensearch.client.RestClient; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import java.io.IOException; import java.io.OutputStreamWriter; import java.net.InetAddress; @@ -52,6 +42,15 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.apache.http.HttpHost; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URLEncodedUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; import org.opensearch.client.json.jsonb.JsonbJsonpMapper; import org.opensearch.client.opensearch.OpenSearchClient; import org.opensearch.client.transport.rest_client.RestClientTransport; @@ -95,8 +94,7 @@ public void classSetup() throws IOException { httpServer.start(); InetSocketAddress address = httpServer.getAddress(); - restClient = RestClient.builder(new HttpHost(address.getHostString(), address.getPort(), "http")) - .build(); + restClient = RestClient.builder(new HttpHost(address.getHostString(), address.getPort(), "http")).build(); } @After