Skip to content

Commit f984428

Browse files
committed
chore: Enforce HTTP 1.1
1 parent deabee9 commit f984428

File tree

3 files changed

+0
-34
lines changed

3 files changed

+0
-34
lines changed

src/main/java/dev/tomr/hcloud/HetznerCloud.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,4 @@ public boolean hasApiKey() {
115115
public Server getServer(Integer id) {
116116
return serviceManager.getServerService().getServer(id);
117117
}
118-
119-
/**
120-
* Returns the HETZNER_CLOUD_HOST constant
121-
* @return String with the hetzner cloud host
122-
*/
123-
public static String getHetznerCloudHost() {
124-
return HETZNER_CLOUD_HOST;
125-
}
126118
}

src/main/java/dev/tomr/hcloud/http/HetznerCloudHttpClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,7 @@ public <T extends HetznerJsonObject> T sendHttpRequest(Class<T> clazz, String en
8888
}
8989

9090
private HttpRequest createHttpRequest(String uri, RequestVerb requestVerb, String apiKey, String body) {
91-
// wiremock seems to have problems with using HTTP/2 sometimes (seems like a bug in the http client) - therefore if we know it's Hetzner,
92-
// we'll enforce HTTP/2 - otherwise HTTP/1.1
9391
HttpClient.Version version = HttpClient.Version.HTTP_1_1;
94-
if (HetznerCloud.getInstance().getHttpDetails().get(0).equals(HetznerCloud.getHetznerCloudHost())) {
95-
version = HttpClient.Version.HTTP_2;
96-
}
9792
HttpRequest.Builder builder = HttpRequest.newBuilder()
9893
.uri(URI.create(uri))
9994
.version(version)

src/test/java/dev/tomr/hcloud/component/http/HttpClientComponentTest.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,4 @@ void httpClientHandles204NoContent() {
129129

130130
assertDoesNotThrow(() -> client.sendHttpRequest(TestModel.class, HOST + "test", RequestVerb.GET, ""));
131131
}
132-
133-
// @Test
134-
// @DisplayName("Request uses HTTP/2 when targeting Hetzner, instead of HTTP/1.1 by default")
135-
// void requestUsesHttp2WhenTargetingHetznerHost() throws IOException, InterruptedException, IllegalAccessException {
136-
// wireMockExtension.stubFor(get("/test").willReturn(ok(objectMapper.writeValueAsString(new TestModel(1, 1, "sunt aut facere repellat provident occaecati excepturi optio reprehenderit", "quia et suscipit\nsuscipit recusandae consequuntur expedita et cum\nreprehenderit molestiae ut ut quas totam\nnostrum rerum est autem sunt rem eveniet architecto")))));
137-
// HetznerCloud hetznerCloud = mock(HetznerCloud.class);
138-
// try (MockedStatic<HetznerCloud> hetznerCloudMockedStatic = mockStatic(HetznerCloud.class)) {
139-
// hetznerCloudMockedStatic.when(HetznerCloud::getHetznerCloudHost).thenReturn(HOST);
140-
// hetznerCloudMockedStatic.when(HetznerCloud::getInstance).thenReturn(hetznerCloud);
141-
// when(hetznerCloud.getHttpDetails()).thenReturn(List.of(HOST, ""));
142-
//
143-
// HetznerCloudHttpClient client = new HetznerCloudHttpClient();
144-
//
145-
// TestModel testModel = client.sendHttpRequest(TestModel.class, HOST + "test", RequestVerb.GET, "");
146-
//
147-
// assertEquals(1, testModel.getId());
148-
// assertEquals(1, testModel.getUserId());
149-
// assertEquals("sunt aut facere repellat provident occaecati excepturi optio reprehenderit", testModel.getTitle());
150-
// assertEquals("quia et suscipit\nsuscipit recusandae consequuntur expedita et cum\nreprehenderit molestiae ut ut quas totam\nnostrum rerum est autem sunt rem eveniet architecto", testModel.getBody());
151-
// }
152-
// }
153132
}

0 commit comments

Comments
 (0)