Skip to content

Use protocol version from response (rather from request) #2118

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
reta wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −4
Open

Use protocol version from response (rather from request) #2118

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Fix `unitTest` task not running the tests in the `test` source set ([#2074](https://github.com/opensearch-project/opensearch-java/pull/2074))
- Run model tests against both JSON mappers instead of picking one at random ([#2085](https://github.com/opensearch-project/opensearch-java/pull/2085))
- Fix currentSize calculation in BulkIngester ([#2113](https://github.com/opensearch-project/opensearch-java/pull/2113))
- Use protocol version from response (rather than request) ([#2118](https://github.com/opensearch-project/opensearch-java/pull/2118))

### Changed
- Updated API spec download URL to `https://api-spec.opensearch.org` ([#2116](https://github.com/opensearch-project/opensearch-java/pull/2116))
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ private <ResponseT> ResponseT decodeResponse(
return rawEndpoint.responseDeserializer(
requestLine.getUri(),
requestLine.getMethod(),
requestLine.getProtocolVersion().format(),
statusLine.getProtocolVersion().format(),
statusLine.getStatusCode(),
statusLine.getReasonPhrase(),
Arrays.stream(clientResp.getHeaders())
Expand Down
2 changes: 1 addition & 1 deletion ...client/src/main/java/org/opensearch/client/transport/rest_client/RestClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private <ResponseT, ErrorT> ResponseT getHighLevelResponse(
final ResponseT error = rawEndpoint.responseDeserializer(
requestLine.getUri(),
requestLine.getMethod(),
requestLine.getProtocolVersion().format(),
statusLine.getProtocolVersion().format(),
statusLine.getStatusCode(),
statusLine.getReasonPhrase(),
Arrays.stream(clientResp.getHeaders())
Expand Down
7 changes: 6 additions & 1 deletion ...ent/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractPingAndInfoIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.Collections;
import java.util.Map;
import org.opensearch.client.opensearch.OpenSearchClient;
import org.opensearch.client.opensearch._types.OpenSearchVersionInfo;
import org.opensearch.client.opensearch.core.InfoResponse;
import org.opensearch.client.opensearch.generic.Bodies;
import org.opensearch.client.opensearch.generic.Requests;
Expand All @@ -34,7 +35,7 @@ public void testInfo() throws IOException {
// compare with what the low level client outputs
try (Response response = javaClient().generic().execute(Requests.builder().endpoint("/").method("GET").build())) {
assertThat(response.getStatus(), equalTo(200));
assertThat(response.getProtocol(), equalTo("HTTP/1.1"));
assertThat(response.getProtocol(), equalTo(expectedHttpProtocol(info.version())));
assertThat(response.getBody().isEmpty(), is(false));

Map<String, Object> infoAsMap = response.getBody()
Expand All @@ -56,4 +57,8 @@ public void testInfo() throws IOException {
assertTrue(versionMap.get("number").toString().startsWith(info.version().number()));
}
}

protected String expectedHttpProtocol(OpenSearchVersionInfo version) {
return "HTTP/1.1";
}
}
8 changes: 7 additions & 1 deletion ...src/test/java11/org/opensearch/client/opensearch/integTest/httpclient5/PingAndInfoIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

package org.opensearch.client.opensearch.integTest.httpclient5;

import org.opensearch.client.opensearch._types.OpenSearchVersionInfo;
import org.opensearch.client.opensearch.integTest.AbstractPingAndInfoIT;

public class PingAndInfoIT extends AbstractPingAndInfoIT implements HttpClient5TransportSupport {}
public class PingAndInfoIT extends AbstractPingAndInfoIT implements HttpClient5TransportSupport {
@Override
protected String expectedHttpProtocol(OpenSearchVersionInfo version) {
return isHttps() && version.number().startsWith("3") ? "HTTP/2.0" : "HTTP/1.1";
}
}
Loading