Skip to content

Commit 8623f45

Browse files
committed
fix: code style optimize
Signed-off-by: wei <[email protected]>
1 parent 8b5527b commit 8623f45

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

opengemini-client-common/src/main/java/io/opengemini/client/common/BaseAsyncClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public CompletableFuture<Void> write(String database, Point point) {
107107
*/
108108
@Override
109109
public CompletableFuture<Void> writeBatch(String database, List<Point> points) {
110-
StringJoiner sj = new StringJoiner("\n");
110+
StringJoiner sj = new StringJoiner(System.lineSeparator());
111111
points.forEach(point -> sj.add(point.lineProtocol()));
112112
return executeWrite(database, sj.toString());
113113
}

opengemini-client-api/src/main/java/io/opengemini/client/api/InsecureTrustManager.java renamed to opengemini-client-common/src/main/java/io/opengemini/client/common/InsecureTrustManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opengemini.client.api;
1+
package io.opengemini.client.common;
22

33
import javax.net.ssl.X509TrustManager;
44
import java.security.cert.CertificateException;

opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/SslContextUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.opengemini.client.jdk;
22

3-
import io.opengemini.client.api.InsecureTrustManager;
3+
import io.opengemini.client.common.InsecureTrustManager;
44

55
import javax.net.ssl.KeyManagerFactory;
66
import javax.net.ssl.SSLContext;

opengemini-client-jdk/src/test/java/io/opengemini/client/jdk/OpenGeminiJdkClientTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ void testWritePoint() {
134134
dropdb.get();
135135

136136
Series x = queryResult.getResults().get(0).getSeries().get(0);
137-
System.out.println(x);
138137
Assertions.assertEquals(x.getValues().size(), 1);
139138
Assertions.assertTrue(x.getValues().get(0).contains("value1"));
140139
Assertions.assertTrue(x.getColumns().contains("field0"));
@@ -163,7 +162,6 @@ void testWritePointMoreFields() {
163162
dropdb.get();
164163

165164
Series x = queryResult.getResults().get(0).getSeries().get(0);
166-
System.out.println(x);
167165
Assertions.assertEquals(x.getValues().size(), 1);
168166
Assertions.assertTrue(x.getValues().get(0).contains("value1"));
169167
Assertions.assertTrue(x.getColumns().contains("field0"));
@@ -197,7 +195,6 @@ void testWriteBatchPoints() {
197195
dropdb.get();
198196

199197
Series x = queryResult.getResults().get(0).getSeries().get(0);
200-
System.out.println(x);
201198
Assertions.assertEquals(x.getValues().size(), 3);
202199
Assertions.assertTrue(x.getColumns().contains("field0"));
203200
Assertions.assertTrue(x.getColumns().contains("tag0"));

opengemini-client-okhttp/src/main/java/io/opengemini/client/okhttp/OkHttpSslContextFactory.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.opengemini.client.okhttp;
22

3-
import io.opengemini.client.api.InsecureTrustManager;
3+
import io.opengemini.client.common.InsecureTrustManager;
4+
import io.opengemini.client.api.OpenGeminiException;
45
import io.opengemini.client.api.TlsConfig;
56
import lombok.AllArgsConstructor;
67
import lombok.Getter;
@@ -28,7 +29,12 @@ static OkHttpSslContext createOkHttpSslContext(TlsConfig tlsConfig) {
2829
tlsConfig.tlsVerifyDisabled);
2930
SSLContext sslContext = SSLContext.getInstance("TLSv1.3");
3031
sslContext.init(keyManagers, trustManagers, new SecureRandom());
31-
X509TrustManager x509TrustManager = (X509TrustManager) trustManagers[0];
32+
X509TrustManager x509TrustManager;
33+
if (trustManagers[0] instanceof X509TrustManager) {
34+
x509TrustManager = (X509TrustManager) trustManagers[0];
35+
} else {
36+
throw new OpenGeminiException("The trust manager is not an instance of X509TrustManager");
37+
}
3238
return new OkHttpSslContext(sslContext.getSocketFactory(), x509TrustManager);
3339
} catch (Exception e) {
3440
throw new IllegalStateException(e);

0 commit comments

Comments
 (0)