wip

Author: NguyenHoangSon96

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

@@ -260,24 +260,24 @@ public FullHttpResponse request(@Nonnull HttpMethod method,
             }
 
 
-//        if (this.channel == null || !this.channel.isOpen()) {
-//            ChannelFuture channelFuture = getBootstrap().connect();
-//            if (!channelFuture.await(this.timeout.toMillis(), TimeUnit.MILLISECONDS)) {
-//                throw new InfluxDBApiException(new ConnectTimeoutException());
-//            }
-//            this.channel = channelFuture.channel();
-//
-//            //fixme remove syncUninterruptibly
-//            this.channel.writeAndFlush(request).sync();
-//        }
-
-            //fixme refactor
             if (this.channel == null || !this.channel.isOpen()) {
-                this.channel = getBootstrap().connect().syncUninterruptibly().channel();
-            }
+                ChannelFuture channelFuture = getBootstrap().connect();
+                if (!channelFuture.await(this.timeout.toMillis(), TimeUnit.MILLISECONDS)) {
+                    throw new InfluxDBApiException(new ConnectTimeoutException());
+                }
+                this.channel = channelFuture.channel();
 
+            }
             //fixme remove syncUninterruptibly
-            this.channel.writeAndFlush(request).syncUninterruptibly();
+            this.channel.writeAndFlush(request).sync();
+
+            //fixme refactor
+//            if (this.channel == null || !this.channel.isOpen()) {
+//                this.channel = getBootstrap().connect().syncUninterruptibly().channel();
+//            }
+//
+//            //fixme remove syncUninterruptibly
+//            this.channel.writeAndFlush(request).syncUninterruptibly();
 
             fullHttpResponse = this.clientHandler.getResponseFuture().get();
 

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

@@ -233,7 +233,7 @@ public void testQueryRows() throws Exception {
 
             //fixme Sleep 1s to make sure all data have completely written
             //fixme check if this because netty still running as NIO
-            Thread.sleep(1000);
+//            Thread.sleep(1000);
 
             Map<String, Object> parameters = Map.of("testId", uuid);
             // Result set much be ordered by time
@@ -316,7 +316,7 @@ public void testQueryRowWithOptions() throws Exception {
 
             //fixme Sleep 1s to make sure all data have completely written
             //fixme check if this because netty still running as NIO
-            Thread.sleep(1000);
+//            Thread.sleep(1000);
 
             // Result set much be ordered by time
             String sql = String.format("Select * from %s where \"testId\"='%s' order by time", measurement, uuid);