Skip to content

Commit d920bff

Browse files
authored
Add HTTP/2 protocol support to HttpRequest.HttpVersion (#17248)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 7c7d868 commit d920bff

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

CHANGELOG-3.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5757
- Fix compression support for h2c protocol ([#4944](https://github.com/opensearch-project/OpenSearch/pull/4944))
5858
- Don't over-allocate in HeapBufferedAsyncEntityConsumer in order to consume the response ([#9993](https://github.com/opensearch-project/OpenSearch/pull/9993))
5959
- Fix swapped field formats in nodes API where `total_indexing_buffer_in_bytes` and `total_indexing_buffer` values were reversed ([#17070](https://github.com/opensearch-project/OpenSearch/pull/17070))
60-
60+
- Add HTTP/2 protocol support to HttpRequest.HttpVersion ([#17248](https://github.com/opensearch-project/OpenSearch/pull/17248))
6161

6262
### Security
6363

modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@ public HttpVersion protocolVersion() {
217217
return HttpRequest.HttpVersion.HTTP_1_0;
218218
} else if (request.protocolVersion().equals(io.netty.handler.codec.http.HttpVersion.HTTP_1_1)) {
219219
return HttpRequest.HttpVersion.HTTP_1_1;
220+
} else if (request.protocolVersion().equals("HTTP/2.0")) {
221+
return HttpRequest.HttpVersion.HTTP_2_0;
220222
} else {
221223
throw new IllegalArgumentException("Unexpected http protocol version: " + request.protocolVersion());
222224
}

plugins/transport-reactor-netty4/src/main/java/org/opensearch/http/reactor/netty4/ReactorNetty4HttpRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ public HttpVersion protocolVersion() {
156156
return HttpRequest.HttpVersion.HTTP_1_0;
157157
} else if (protocol.equals(io.netty.handler.codec.http.HttpVersion.HTTP_1_1.toString())) {
158158
return HttpRequest.HttpVersion.HTTP_1_1;
159+
} else if (protocol.equals("HTTP/2.0")) {
160+
return HttpRequest.HttpVersion.HTTP_2_0;
159161
} else {
160162
throw new IllegalArgumentException("Unexpected http protocol version: " + protocol);
161163
}

server/src/main/java/org/opensearch/http/HttpRequest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ public interface HttpRequest {
5959
@PublicApi(since = "1.0.0")
6060
enum HttpVersion {
6161
HTTP_1_0,
62-
HTTP_1_1
62+
HTTP_1_1,
63+
HTTP_2_0
6364
}
6465

6566
/**

0 commit comments

Comments
 (0)