Skip to content

Keep safe response consumer when converting transport options #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RaphaelFakhri wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep safe response consumer when converting transport options #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/transport/rest5_client/Rest5ClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static Rest5ClientOptions of(@Nullable TransportOptions options) {
return (Rest5ClientOptions) options;
}

final Builder builder = new Builder(RequestOptions.DEFAULT.toBuilder());
final Builder builder = new Builder(SafeResponseConsumer.DEFAULT_REQUEST_OPTIONS.toBuilder());
options.headers().forEach(h -> builder.addHeader(h.getKey(), h.getValue()));
options.queryParameters().forEach(builder::setParameter);
builder.onWarnings(options.onWarnings());
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/transport/rest_client/RestClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static RestClientOptions of(@Nullable TransportOptions options) {
return (RestClientOptions)options;
}

final Builder builder = new Builder(RequestOptions.DEFAULT.toBuilder());
final Builder builder = new Builder(SafeResponseConsumer.DEFAULT_REQUEST_OPTIONS.toBuilder());
options.headers().forEach(h -> builder.addHeader(h.getKey(), h.getValue()));
options.queryParameters().forEach(builder::setParameter);
builder.onWarnings(options.onWarnings());
Expand Down
15 changes: 15 additions & 0 deletions ...lient/src/test/java/co/elastic/clients/transport/rest5_client/Rest5ClientOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,19 @@ void testRequestOptionsOverridingBuiltin() throws Exception {
// overriding user-agent is ok
checkUserAgent(id, "FooBarAgent/1.0");
}

@Test
void testConvertedOptionsUseSafeResponseConsumer() throws Exception {
// Transport options set on the client builder are converted from DefaultTransportOptions
ElasticsearchClient esClient = ElasticsearchClient.of(b -> b
.host("http://example.com")
.transportOptions(o -> o.addHeader("Foo", "bar"))
);

Rest5ClientOptions options = (Rest5ClientOptions) esClient._transportOptions();
assertSame(SafeResponseConsumer.DEFAULT_FACTORY,
options.restClientRequestOptions().getHttpAsyncResponseConsumerFactory());

esClient._transport().close();
}
}
16 changes: 16 additions & 0 deletions ...-client/src/test/java/co/elastic/clients/transport/rest_client/RestClientOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,20 @@ void testRequestOptionsOverridingBuiltin() throws Exception {
// overriding user-agent is ok
checkUserAgent(id, "FooBarAgent/1.0");
}

@Test
void testConvertedOptionsUseSafeResponseConsumer() throws Exception {
// Transport options set on the client builder are converted from DefaultTransportOptions
ElasticsearchClient esClient = ElasticsearchClient.of(b -> b
.host("http://example.com")
.useLegacyTransport(true)
.transportOptions(o -> o.addHeader("Foo", "bar"))
);

RestClientOptions options = (RestClientOptions) esClient._transportOptions();
assertSame(SafeResponseConsumer.DEFAULT_FACTORY,
options.restClientRequestOptions().getHttpAsyncResponseConsumerFactory());

esClient._transport().close();
}
}