|
33 | 33 | import java.security.SecureRandom; |
34 | 34 | import java.security.cert.Certificate; |
35 | 35 | import java.security.cert.CertificateFactory; |
| 36 | +import java.security.cert.X509Certificate; |
36 | 37 | import java.util.ArrayList; |
37 | 38 | import java.util.List; |
38 | 39 | import java.util.Map; |
@@ -64,16 +65,16 @@ final class RestClient implements AutoCloseable { |
64 | 65 |
|
65 | 66 | private static final TrustManager[] TRUST_ALL_CERTS = new TrustManager[]{ |
66 | 67 | new X509TrustManager() { |
67 | | - public java.security.cert.X509Certificate[] getAcceptedIssuers() { |
| 68 | + public X509Certificate[] getAcceptedIssuers() { |
68 | 69 | return null; |
69 | 70 | } |
70 | 71 |
|
71 | 72 | public void checkClientTrusted( |
72 | | - final java.security.cert.X509Certificate[] certs, final String authType) { |
| 73 | + final X509Certificate[] certs, final String authType) { |
73 | 74 | } |
74 | 75 |
|
75 | 76 | public void checkServerTrusted( |
76 | | - final java.security.cert.X509Certificate[] certs, final String authType) { |
| 77 | + final X509Certificate[] certs, final String authType) { |
77 | 78 | } |
78 | 79 | } |
79 | 80 | }; |
@@ -141,29 +142,22 @@ public void checkServerTrusted( |
141 | 142 | this.client = builder.build(); |
142 | 143 | } |
143 | 144 |
|
144 | | - public String getServerVersion() throws InfluxDBApiException { |
| 145 | + public String getServerVersion() { |
145 | 146 | String influxdbVersion; |
146 | 147 | HttpResponse<String> response = request("ping", HttpMethod.GET, null, null, null); |
147 | 148 | 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 | + } |
149 | 154 | } catch (JsonProcessingException e) { |
150 | | - influxdbVersion = null; |
151 | | - } catch (Exception e) { |
152 | | - throw new InfluxDBApiException(e); |
| 155 | + return null; |
153 | 156 | } |
154 | 157 |
|
155 | 158 | return influxdbVersion; |
156 | 159 | } |
157 | 160 |
|
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 | | - |
167 | 161 | HttpResponse<String> request(@Nonnull final String path, |
168 | 162 | @Nonnull final HttpMethod method, |
169 | 163 | @Nullable final byte[] data, |
|
0 commit comments