Skip to content

Commit bcf0e27

Browse files
mzitnikmzitnik
mzitnik
and
mzitnik
authored
Remove WEB_CONTEXT support ClickHouse#1512 (ClickHouse#1513)
Co-authored-by: mzitnik <mark.zitnik@clickhouse.com>
1 parent 7c98c96 commit bcf0e27

File tree

4 files changed

+3
-93
lines changed

4 files changed

+3
-93
lines changed

‎clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,9 @@ static String buildQueryParams(ClickHouseRequest<?> request) {
164164
}
165165

166166
static String buildUrl(String baseUrl, ClickHouseRequest<?> request) {
167-
ClickHouseConfig config = request.getConfig();
168-
169167
StringBuilder builder = new StringBuilder().append(baseUrl);
170-
String context = config.getStrOption(ClickHouseHttpOption.WEB_CONTEXT);
168+
// TODO: Using default until we will remove
169+
String context = "/";
171170
if (!ClickHouseChecker.isNullOrEmpty(context)) {
172171
char prev = '/';
173172
for (int i = 0, len = context.length(); i < len; i++) {

‎clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@ public enum ClickHouseHttpOption implements ClickHouseOption {
4242
* headers.
4343
*/
4444
RECEIVE_QUERY_PROGRESS("receive_query_progress", true,
45-
"Whether to receive information about the progress of a query in response headers."),
45+
"Whether to receive information about the progress of a query in response headers.");
4646
// SEND_PROGRESS("send_progress_in_http_headers", false,
4747
// "Enables or disables X-ClickHouse-Progress HTTP response headers in
4848
// clickhouse-server responses."),
4949
// SEND_PROGRESS_INTERVAL("http_headers_progress_interval_ms", 3000, ""),
5050
// WAIT_END_OF_QUERY("wait_end_of_query", false, ""),
51-
/**
52-
* Web context.
53-
*/
54-
WEB_CONTEXT("web_context", "/", "Web context.");
5551

5652
private final String key;
5753
private final Serializable defaultValue;

‎clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -214,32 +214,6 @@ public void testPing() {
214214
.nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP)).build()) {
215215
Assert.assertTrue(client.ping(getServer(), 3000));
216216
}
217-
// Disable tests for ping
218-
// try (ClickHouseClient client = ClickHouseClient.builder().options(getClientOptions())
219-
// .nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP))
220-
// .option(ClickHouseHttpOption.WEB_CONTEXT, "a/b").build()) {
221-
// Assert.assertTrue(client.ping(getServer(), 3000));
222-
// }
223-
//
224-
// try (ClickHouseClient client = ClickHouseClient.builder().options(getClientOptions())
225-
// .nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP))
226-
// .option(ClickHouseHttpOption.WEB_CONTEXT, "a/b")
227-
// .option(ClickHouseClientOption.HEALTH_CHECK_METHOD, ClickHouseHealthCheckMethod.PING).build()) {
228-
// Assert.assertFalse(client.ping(getServer(), 3000));
229-
// }
230-
try (ClickHouseClient client = ClickHouseClient.builder().options(getClientOptions())
231-
.nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP))
232-
.option(ClickHouseHttpOption.WEB_CONTEXT, "/")
233-
.option(ClickHouseClientOption.HEALTH_CHECK_METHOD, ClickHouseHealthCheckMethod.PING).build()) {
234-
Assert.assertTrue(client.ping(getServer(), 3000));
235-
}
236-
237-
try (ClickHouseClient client = ClickHouseClient.builder().options(getClientOptions())
238-
.nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP))
239-
.option(ClickHouseClientOption.HEALTH_CHECK_METHOD, ClickHouseHealthCheckMethod.PING)
240-
.removeOption(ClickHouseHttpOption.WEB_CONTEXT).build()) {
241-
Assert.assertTrue(client.ping(getServer(), 3000));
242-
}
243217
}
244218

245219
@Test // (groups = "integration")

‎clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpConnectionTest.java‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -48,51 +48,6 @@ public void testBuildUrl() {
4848
ClickHouseNode s = request.getServer();
4949
Assert.assertEquals(ClickHouseHttpConnection.buildUrl(server.getBaseUri(), request),
5050
"http://localhost:8123/?compress=1&extremes=0");
51-
52-
Assert.assertEquals(
53-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
54-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "")),
55-
"http://localhost:8123/?compress=1&extremes=0");
56-
Assert.assertEquals(
57-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
58-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/")),
59-
"http://localhost:8123/?compress=1&extremes=0");
60-
Assert.assertEquals(
61-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
62-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "./")),
63-
"http://localhost:8123/./?compress=1&extremes=0");
64-
Assert.assertEquals(
65-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
66-
request.option(ClickHouseHttpOption.WEB_CONTEXT, ".")),
67-
"http://localhost:8123/.?compress=1&extremes=0");
68-
Assert.assertEquals(
69-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
70-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "?")),
71-
"http://localhost:8123/?compress=1&extremes=0");
72-
Assert.assertEquals(
73-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
74-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "#")),
75-
"http://localhost:8123/?compress=1&extremes=0");
76-
Assert.assertEquals(
77-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
78-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/a/b/c/d/")),
79-
"http://localhost:8123/a/b/c/d/?compress=1&extremes=0");
80-
Assert.assertEquals(
81-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
82-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/a?b=1#c")),
83-
"http://localhost:8123/a?compress=1&extremes=0");
84-
Assert.assertEquals(
85-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
86-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/a#c")),
87-
"http://localhost:8123/a?compress=1&extremes=0");
88-
Assert.assertEquals(
89-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
90-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/a%20c")),
91-
"http://localhost:8123/a%20c?compress=1&extremes=0");
92-
Assert.assertEquals(
93-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
94-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "///.//")),
95-
"http://localhost:8123/./?compress=1&extremes=0");
9651
}
9752

9853
@Test(groups = { "unit" })
@@ -117,19 +72,5 @@ public void testGetBaseUrl() {
11772
try (SimpleHttpConnection c = new SimpleHttpConnection(server, request)) {
11873
Assert.assertEquals(c.getBaseUrl(), "https://localhost:8443/");
11974
}
120-
Assert.assertEquals(
121-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
122-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "/a/b/c")),
123-
"https://localhost:8443/a/b/c?compress=1&extremes=0");
124-
try (SimpleHttpConnection c = new SimpleHttpConnection(server, request)) {
125-
Assert.assertEquals(c.getBaseUrl(), "https://localhost:8443/a/b/c/");
126-
}
127-
Assert.assertEquals(
128-
ClickHouseHttpConnection.buildUrl(server.getBaseUri(),
129-
request.option(ClickHouseHttpOption.WEB_CONTEXT, "a?b=1")),
130-
"https://localhost:8443/a?compress=1&extremes=0");
131-
try (SimpleHttpConnection c = new SimpleHttpConnection(server, request)) {
132-
Assert.assertEquals(c.getBaseUrl(), "https://localhost:8443/a/");
133-
}
13475
}
13576
}

0 commit comments

Comments
 (0)