Skip to content

Commit a40b3b4

Browse files
feat: get server version
1 parent f810ae7 commit a40b3b4

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

src/main/java/com/influxdb/v3/client/internal/RestClient.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.security.SecureRandom;
3434
import java.security.cert.Certificate;
3535
import java.security.cert.CertificateFactory;
36+
import java.security.cert.X509Certificate;
3637
import java.util.ArrayList;
3738
import java.util.List;
3839
import java.util.Map;
@@ -64,16 +65,16 @@ final class RestClient implements AutoCloseable {
6465

6566
private static final TrustManager[] TRUST_ALL_CERTS = new TrustManager[]{
6667
new X509TrustManager() {
67-
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
68+
public X509Certificate[] getAcceptedIssuers() {
6869
return null;
6970
}
7071

7172
public void checkClientTrusted(
72-
final java.security.cert.X509Certificate[] certs, final String authType) {
73+
final X509Certificate[] certs, final String authType) {
7374
}
7475

7576
public void checkServerTrusted(
76-
final java.security.cert.X509Certificate[] certs, final String authType) {
77+
final X509Certificate[] certs, final String authType) {
7778
}
7879
}
7980
};
@@ -141,29 +142,22 @@ public void checkServerTrusted(
141142
this.client = builder.build();
142143
}
143144

144-
public String getServerVersion() throws InfluxDBApiException {
145+
public String getServerVersion() {
145146
String influxdbVersion;
146147
HttpResponse<String> response = request("ping", HttpMethod.GET, null, null, null);
147148
try {
148-
influxdbVersion = extractServerVersion(response);
149+
influxdbVersion = response.headers().firstValue("X-Influxdb-Version").orElse(null);
150+
if (influxdbVersion == null) {
151+
JsonNode jsonNode = objectMapper.readTree(response.body());
152+
influxdbVersion = Optional.ofNullable(jsonNode.get("version")).map(JsonNode::asText).orElse(null);
153+
}
149154
} catch (JsonProcessingException e) {
150-
influxdbVersion = null;
151-
} catch (Exception e) {
152-
throw new InfluxDBApiException(e);
155+
return null;
153156
}
154157

155158
return influxdbVersion;
156159
}
157160

158-
private String extractServerVersion(final HttpResponse<String> response) throws JsonProcessingException {
159-
String version = response.headers().firstValue("X-Influxdb-Version").orElse(null);
160-
if (version == null) {
161-
JsonNode jsonNode = objectMapper.readTree(response.body());
162-
version = Optional.ofNullable(jsonNode.get("version")).map(JsonNode::asText).orElse(null);
163-
}
164-
return version;
165-
}
166-
167161
HttpResponse<String> request(@Nonnull final String path,
168162
@Nonnull final HttpMethod method,
169163
@Nullable final byte[] data,

0 commit comments

Comments
 (0)