Skip to content

Commit de4e783

Browse files
authored
fix: use http1.1 by default (#148)
* fix: use http1.1 by default * fmt fix
1 parent 44a62f3 commit de4e783

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

src/main/java/dev/openfga/sdk/api/client/ApiClient.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,24 @@ public ApiClient() {
6767
asyncResponseInterceptor = null;
6868
}
6969

70+
/**
71+
* Create an instance of ApiClient.
72+
* <p>
73+
* In other contexts, note that any settings in a {@link Configuration}
74+
* will take precedence over equivalent settings in the
75+
* {@link HttpClient.Builder} here.
76+
*
77+
* @param builder Http client builder.
78+
*/
79+
public ApiClient(HttpClient.Builder builder) {
80+
this.builder = builder;
81+
this.mapper = createDefaultObjectMapper();
82+
this.client = this.builder.build();
83+
interceptor = null;
84+
responseInterceptor = null;
85+
asyncResponseInterceptor = null;
86+
}
87+
7088
/**
7189
* Create an instance of ApiClient.
7290
* <p>
@@ -177,7 +195,7 @@ protected String getDefaultBaseUri() {
177195
}
178196

179197
protected HttpClient.Builder createDefaultHttpClientBuilder() {
180-
return HttpClient.newBuilder();
198+
return HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1);
181199
}
182200

183201
/**

src/test/java/dev/openfga/sdk/api/client/ApiClientTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,18 @@ public void newHttpClientWhenBuilderModified() {
3535

3636
assertNotEquals(client1, apiClient.getHttpClient());
3737
}
38+
39+
@Test
40+
public void httpClientShouldUseHttp1ByDefault() {
41+
ApiClient apiClient = new ApiClient();
42+
assertEquals(apiClient.getHttpClient().version(), HttpClient.Version.HTTP_1_1);
43+
}
44+
45+
@Test
46+
public void customHttpClientWithHttp2() {
47+
HttpClient.Builder builder = HttpClient.newBuilder().version(HttpClient.Version.HTTP_2);
48+
ApiClient apiClient = new ApiClient(builder);
49+
;
50+
assertEquals(apiClient.getHttpClient().version(), HttpClient.Version.HTTP_2);
51+
}
3852
}

0 commit comments

Comments
 (0)