Skip to content

Commit 98f63ad

Browse files
NguyenHoangSon96NguyenHoangSon96
committed
wip
1 parent 37f7d76 commit 98f63ad

File tree

7 files changed

+90
-58
lines changed

7 files changed

+90
-58
lines changed

‎src/main/java/com/influxdb/v3/client/internal/ClientChannelInitializer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
*/
2222
package com.influxdb.v3.client.internal;
2323

24+
import javax.annotation.Nonnull;
25+
import javax.annotation.Nullable;
26+
2427
import io.netty.channel.ChannelHandler;
2528
import io.netty.channel.ChannelInitializer;
2629
import io.netty.channel.ChannelPipeline;
@@ -33,9 +36,6 @@
3336
import io.netty.handler.proxy.ProxyHandler;
3437
import io.netty.handler.ssl.SslContext;
3538

36-
import javax.annotation.Nonnull;
37-
import javax.annotation.Nullable;
38-
3939
public class ClientChannelInitializer extends ChannelInitializer<OioSocketChannel> {
4040

4141
private final SslContext sslCtx;

‎src/main/java/com/influxdb/v3/client/internal/ClientHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
package com.influxdb.v3.client.internal;
2323

24+
import java.util.concurrent.CompletableFuture;
25+
2426
import io.netty.channel.ChannelHandler;
2527
import io.netty.channel.ChannelHandlerContext;
2628
import io.netty.channel.SimpleChannelInboundHandler;
@@ -30,8 +32,6 @@
3032
import io.netty.handler.codec.http.LastHttpContent;
3133
import io.netty.util.CharsetUtil;
3234

33-
import java.util.concurrent.CompletableFuture;
34-
3535
@ChannelHandler.Sharable
3636
public class ClientHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
3737

‎src/main/java/com/influxdb/v3/client/internal/FlightSqlClient.java‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,51 @@
2121
*/
2222
package com.influxdb.v3.client.internal;
2323

24+
import java.net.InetSocketAddress;
25+
import java.net.URI;
26+
import java.net.URISyntaxException;
27+
import java.nio.charset.StandardCharsets;
28+
import java.util.ArrayList;
29+
import java.util.HashMap;
30+
import java.util.Iterator;
31+
import java.util.List;
32+
import java.util.Map;
33+
import java.util.NoSuchElementException;
34+
import java.util.Spliterator;
35+
import java.util.Spliterators;
36+
import java.util.stream.Stream;
37+
import java.util.stream.StreamSupport;
38+
import javax.annotation.Nonnull;
39+
import javax.annotation.Nullable;
40+
import javax.net.ssl.SSLException;
41+
2442
import com.fasterxml.jackson.core.JsonProcessingException;
2543
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import com.influxdb.v3.client.config.ClientConfig;
27-
import com.influxdb.v3.client.query.QueryType;
28-
import io.grpc.*;
44+
import io.grpc.Codec;
45+
import io.grpc.DecompressorRegistry;
46+
import io.grpc.HttpConnectProxiedSocketAddress;
47+
import io.grpc.Metadata;
48+
import io.grpc.ProxyDetector;
2949
import io.grpc.netty.GrpcSslContexts;
3050
import io.grpc.netty.NettyChannelBuilder;
3151
import io.netty.handler.ssl.SslContext;
32-
import org.apache.arrow.flight.*;
52+
import org.apache.arrow.flight.CallOption;
53+
import org.apache.arrow.flight.FlightClient;
54+
import org.apache.arrow.flight.FlightGrpcUtils;
55+
import org.apache.arrow.flight.FlightStream;
56+
import org.apache.arrow.flight.HeaderCallOption;
57+
import org.apache.arrow.flight.Location;
58+
import org.apache.arrow.flight.LocationSchemes;
59+
import org.apache.arrow.flight.Ticket;
3360
import org.apache.arrow.flight.grpc.MetadataAdapter;
3461
import org.apache.arrow.memory.RootAllocator;
3562
import org.apache.arrow.util.AutoCloseables;
3663
import org.apache.arrow.vector.VectorSchemaRoot;
3764
import org.slf4j.Logger;
3865
import org.slf4j.LoggerFactory;
3966

40-
import javax.annotation.Nonnull;
41-
import javax.annotation.Nullable;
42-
import javax.net.ssl.SSLException;
43-
import java.net.InetSocketAddress;
44-
import java.net.URI;
45-
import java.net.URISyntaxException;
46-
import java.nio.charset.StandardCharsets;
47-
import java.util.*;
48-
import java.util.stream.Stream;
49-
import java.util.stream.StreamSupport;
67+
import com.influxdb.v3.client.config.ClientConfig;
68+
import com.influxdb.v3.client.query.QueryType;
5069

5170
final class FlightSqlClient implements AutoCloseable {
5271

‎src/main/java/com/influxdb/v3/client/internal/InfluxDBClientImpl.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
import java.io.IOException;
2626
import java.net.URISyntaxException;
2727
import java.nio.charset.StandardCharsets;
28-
import java.util.*;
28+
import java.util.Collections;
29+
import java.util.HashMap;
30+
import java.util.List;
31+
import java.util.Map;
32+
import java.util.Objects;
2933
import java.util.concurrent.ExecutionException;
3034
import java.util.concurrent.TimeUnit;
3135
import java.util.logging.Logger;
@@ -38,14 +42,18 @@
3842
import javax.net.ssl.SSLException;
3943

4044
import com.fasterxml.jackson.core.JsonProcessingException;
41-
import com.influxdb.v3.client.*;
4245
import io.grpc.Deadline;
4346
import io.netty.handler.codec.http.HttpMethod;
4447
import io.netty.handler.codec.http.HttpResponseStatus;
4548
import org.apache.arrow.flight.CallOption;
4649
import org.apache.arrow.vector.FieldVector;
4750
import org.apache.arrow.vector.VectorSchemaRoot;
4851

52+
import com.influxdb.v3.client.InfluxDBApiException;
53+
import com.influxdb.v3.client.InfluxDBApiNettyException;
54+
import com.influxdb.v3.client.InfluxDBClient;
55+
import com.influxdb.v3.client.Point;
56+
import com.influxdb.v3.client.PointValues;
4957
import com.influxdb.v3.client.config.ClientConfig;
5058
import com.influxdb.v3.client.query.QueryOptions;
5159
import com.influxdb.v3.client.write.WriteOptions;

‎src/test/java/com/influxdb/v3/client/TestUtils.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,23 @@
2121
*/
2222
package com.influxdb.v3.client;
2323

24+
import java.io.FileInputStream;
25+
import java.io.IOException;
26+
import java.net.InetSocketAddress;
27+
import java.net.URI;
28+
import java.nio.charset.StandardCharsets;
29+
import java.security.KeyStore;
30+
import java.security.KeyStoreException;
31+
import java.security.NoSuchAlgorithmException;
32+
import java.security.UnrecoverableKeyException;
33+
import java.security.cert.CertificateException;
34+
import java.util.ArrayList;
35+
import java.util.List;
36+
import javax.annotation.Nonnull;
37+
import javax.annotation.Nullable;
38+
import javax.net.ssl.KeyManagerFactory;
39+
import javax.net.ssl.TrustManagerFactory;
40+
2441
import io.grpc.HttpConnectProxiedSocketAddress;
2542
import io.grpc.ProxyDetector;
2643
import io.netty.handler.ssl.ClientAuth;
@@ -41,23 +58,6 @@
4158
import org.apache.arrow.vector.types.pojo.Schema;
4259
import org.jetbrains.annotations.NotNull;
4360

44-
import javax.annotation.Nonnull;
45-
import javax.annotation.Nullable;
46-
import javax.net.ssl.KeyManagerFactory;
47-
import javax.net.ssl.TrustManagerFactory;
48-
import java.io.FileInputStream;
49-
import java.io.IOException;
50-
import java.net.InetSocketAddress;
51-
import java.net.URI;
52-
import java.nio.charset.StandardCharsets;
53-
import java.security.KeyStore;
54-
import java.security.KeyStoreException;
55-
import java.security.NoSuchAlgorithmException;
56-
import java.security.UnrecoverableKeyException;
57-
import java.security.cert.CertificateException;
58-
import java.util.ArrayList;
59-
import java.util.List;
60-
6161
public final class TestUtils {
6262

6363
private TestUtils() {

‎src/test/java/com/influxdb/v3/client/integration/E2ETest.java‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,12 @@
2121
*/
2222
package com.influxdb.v3.client.integration;
2323

24-
import com.influxdb.v3.client.InfluxDBClient;
25-
import com.influxdb.v3.client.Point;
26-
import com.influxdb.v3.client.PointValues;
27-
import com.influxdb.v3.client.TestUtils;
28-
import com.influxdb.v3.client.config.ClientConfig;
29-
import com.influxdb.v3.client.config.NettyHttpClientConfig;
30-
import com.influxdb.v3.client.query.QueryOptions;
31-
import com.influxdb.v3.client.write.WriteOptions;
32-
import com.influxdb.v3.client.write.WritePrecision;
33-
import io.grpc.ProxyDetector;
34-
import io.netty.handler.proxy.HttpProxyHandler;
35-
import org.apache.arrow.flight.FlightRuntimeException;
36-
import org.assertj.core.api.Assertions;
37-
import org.junit.jupiter.api.Test;
38-
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
39-
40-
import javax.annotation.Nonnull;
41-
import javax.net.ssl.SSLException;
4224
import java.math.BigInteger;
43-
import java.net.*;
25+
import java.net.ConnectException;
26+
import java.net.InetSocketAddress;
27+
import java.net.URISyntaxException;
28+
import java.net.URL;
29+
import java.net.URLConnection;
4430
import java.time.Instant;
4531
import java.time.temporal.ChronoUnit;
4632
import java.util.ArrayList;
@@ -51,6 +37,25 @@
5137
import java.util.logging.Logger;
5238
import java.util.stream.Collectors;
5339
import java.util.stream.Stream;
40+
import javax.annotation.Nonnull;
41+
import javax.net.ssl.SSLException;
42+
43+
import io.grpc.ProxyDetector;
44+
import io.netty.handler.proxy.HttpProxyHandler;
45+
import org.apache.arrow.flight.FlightRuntimeException;
46+
import org.assertj.core.api.Assertions;
47+
import org.junit.jupiter.api.Test;
48+
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
49+
50+
import com.influxdb.v3.client.InfluxDBClient;
51+
import com.influxdb.v3.client.Point;
52+
import com.influxdb.v3.client.PointValues;
53+
import com.influxdb.v3.client.TestUtils;
54+
import com.influxdb.v3.client.config.ClientConfig;
55+
import com.influxdb.v3.client.config.NettyHttpClientConfig;
56+
import com.influxdb.v3.client.query.QueryOptions;
57+
import com.influxdb.v3.client.write.WriteOptions;
58+
import com.influxdb.v3.client.write.WritePrecision;
5459

5560
import static org.junit.jupiter.api.Assumptions.assumeFalse;
5661

‎src/test/java/com/influxdb/v3/client/internal/FlightSqlClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.stream.IntStream;
3131
import java.util.stream.Stream;
3232

33-
import com.influxdb.v3.client.config.NettyHttpClientConfig;
3433
import io.grpc.HttpConnectProxiedSocketAddress;
3534
import io.grpc.ProxyDetector;
3635
import io.grpc.internal.GrpcUtil;
@@ -53,6 +52,7 @@
5352
import com.influxdb.v3.client.InfluxDBClient;
5453
import com.influxdb.v3.client.TestUtils;
5554
import com.influxdb.v3.client.config.ClientConfig;
55+
import com.influxdb.v3.client.config.NettyHttpClientConfig;
5656
import com.influxdb.v3.client.query.QueryOptions;
5757
import com.influxdb.v3.client.query.QueryType;
5858

0 commit comments

Comments
 (0)