Skip to content

Commit bb453ef

Browse files
committed
Make transport Closeable, move RestClientTransport to its own package
1 parent 2c52b4f commit bb453ef

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

java-client/src/main/java/co/elastic/clients/base/Transport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121

2222
import co.elastic.clients.json.JsonpMapper;
2323

24+
import java.io.Closeable;
2425
import java.io.IOException;
2526
import java.util.concurrent.CompletableFuture;
2627

2728
/**
2829
* The transport layer that allows {@link ApiClient}s to send requests.
2930
*/
30-
public interface Transport {
31+
public interface Transport extends Closeable {
3132

3233
<RequestT, ResponseT, ErrorT> ResponseT performRequest(
3334
RequestT request,

java-client/src/main/java/co/elastic/clients/base/rest_client/RestClientTransport.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package co.elastic.clients.base;
21-
20+
package co.elastic.clients.base.rest_client;
21+
22+
import co.elastic.clients.base.ApiException;
23+
import co.elastic.clients.base.BooleanEndpoint;
24+
import co.elastic.clients.base.BooleanResponse;
25+
import co.elastic.clients.base.ElasticsearchCatRequest;
26+
import co.elastic.clients.base.Endpoint;
27+
import co.elastic.clients.base.Transport;
2228
import co.elastic.clients.json.JsonpDeserializer;
2329
import co.elastic.clients.json.JsonpMapper;
2430
import co.elastic.clients.json.NdJsonpSerializable;
@@ -83,6 +89,11 @@ public JsonpMapper jsonpMapper() {
8389
return mapper;
8490
}
8591

92+
@Override
93+
public void close() throws IOException {
94+
this.restClient.close();
95+
}
96+
8697
public <RequestT, ResponseT, ErrorT> ResponseT performRequest(
8798
RequestT request,
8899
Endpoint<RequestT, ResponseT, ErrorT> endpoint

java-client/src/test/java/co/elastic/clients/elasticsearch/end_to_end/RequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import co.elastic.clients.base.ApiException;
2323
import co.elastic.clients.base.BooleanResponse;
2424
import co.elastic.clients.base.ElasticsearchError;
25-
import co.elastic.clients.base.RestClientTransport;
25+
import co.elastic.clients.base.rest_client.RestClientTransport;
2626
import co.elastic.clients.base.Transport;
2727
import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
2828
import co.elastic.clients.elasticsearch.ElasticsearchClient;

0 commit comments

Comments
 (0)