Skip to content

Commit d0d2d4c

Browse files
karel-rehorkarel-rehor
committed
chore: checkstyle cleanup
1 parent e4fed9b commit d0d2d4c

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
package com.influxdb.v3.client.internal;
2323

2424
import java.util.ArrayList;
25-
import java.util.Collections;
2625
import java.util.List;
2726
import java.util.Objects;
2827
import java.util.concurrent.Executor;
2928
import javax.annotation.Nonnull;
3029
import javax.annotation.Nullable;
31-
import javax.annotation.Tainted;
3230

3331
import io.grpc.CompressorRegistry;
3432
import io.grpc.Deadline;
@@ -291,12 +289,12 @@ public Builder withMaxInboundMessageSize(@Nonnull final Integer maxInboundMessag
291289
}
292290

293291
/**
294-
* Helper method to clone already existing options
292+
* Helper method to clone already existing options.
295293
*
296294
* @param grpcCallOptions = options to copy
297295
* @return this
298296
*/
299-
public Builder fromGrpcCallOptions(@Nonnull GrpcCallOptions grpcCallOptions) {
297+
public Builder fromGrpcCallOptions(@Nonnull final GrpcCallOptions grpcCallOptions) {
300298
if (grpcCallOptions.getDeadline() != null) {
301299
this.deadline = grpcCallOptions.getDeadline();
302300
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.io.ByteArrayOutputStream;
2525
import java.io.IOException;
2626
import java.nio.charset.StandardCharsets;
27-
import java.util.Arrays;
2827
import java.util.Collections;
2928
import java.util.HashMap;
3029
import java.util.List;
@@ -399,7 +398,7 @@ private Stream<VectorSchemaRoot> queryData(@Nonnull final String query,
399398
Arguments.checkNotNull(parameters, "parameters");
400399
Arguments.checkNotNull(options, "options");
401400

402-
if( options.grpcCallOptions().getDeadline() == null && config.getQueryTimeout() != null) {
401+
if (options.grpcCallOptions().getDeadline() == null && config.getQueryTimeout() != null) {
403402
options.setGrpcCallOptions(new GrpcCallOptions.Builder()
404403
.fromGrpcCallOptions(options.grpcCallOptions())
405404
.withDeadline(Deadline.after(config.getQueryTimeout().toMillis(), TimeUnit.MILLISECONDS))

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.stream.Collectors;
3535
import java.util.stream.Stream;
3636

37-
import com.influxdb.v3.client.internal.GrpcCallOptions;
3837
import io.grpc.Deadline;
3938
import org.apache.arrow.flight.CallStatus;
4039
import org.apache.arrow.flight.FlightRuntimeException;
@@ -48,6 +47,7 @@
4847
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
4948

5049
import com.influxdb.v3.client.config.ClientConfig;
50+
import com.influxdb.v3.client.internal.GrpcCallOptions;
5151
import com.influxdb.v3.client.query.QueryOptions;
5252
import com.influxdb.v3.client.write.WriteOptions;
5353
import com.influxdb.v3.client.write.WritePrecision;
@@ -356,7 +356,7 @@ public void queryTimeoutOKTest() {
356356

357357
String sql = String.format("SELECT value FROM %s WHERE \"testId\"=%d", measurement, testId);
358358

359-
try(Stream<Object[]> stream = client.query(sql)) {
359+
try (Stream<Object[]> stream = client.query(sql)) {
360360
stream.forEach(row -> {
361361
Assertions.assertThat(row).hasSize(1);
362362
Assertions.assertThat(row[0]).isEqualTo(123.0);
@@ -440,7 +440,7 @@ public void queryTimeoutSuperceededByGrpcOptTest() {
440440
}
441441

442442
@Test
443-
public void repeatQueryWithTimeoutTest(){
443+
public void repeatQueryWithTimeoutTest() {
444444
long timeout = 1000;
445445
client = InfluxDBClient.getInstance(new ClientConfig.Builder()
446446
.host(System.getenv("TESTING_INFLUXDB_URL"))
@@ -455,8 +455,8 @@ public void repeatQueryWithTimeoutTest(){
455455

456456
String sql = String.format("SELECT value FROM %s WHERE \"testId\"=%d", measurement, testId);
457457

458-
for (int i = 0; i < 3; i++){
459-
try(Stream<Object[]> stream = client.query(sql)) {
458+
for (int i = 0; i < 3; i++) {
459+
try (Stream<Object[]> stream = client.query(sql)) {
460460
stream.forEach(row -> {
461461
Assertions.assertThat(row).hasSize(1);
462462
Assertions.assertThat(row[0]).isEqualTo(123.0);
@@ -492,7 +492,7 @@ public void queryGrpcMaxOutSizeTest() {
492492
.build()
493493
);
494494

495-
try(Stream<Object[]> stream = client.query(sql, queryOptions)) {
495+
try (Stream<Object[]> stream = client.query(sql, queryOptions)) {
496496
stream.forEach(row -> {
497497
Assertions.assertThat(row).hasSize(1);
498498
Assertions.assertThat(row[0]).isEqualTo(123.0);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ public void timeoutExceededTest() {
553553

554554

555555

556-
try(InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
556+
try (InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
557557

558558
Point point = Point.measurement("mem")
559559
.setTag("tag", "one")
@@ -572,7 +572,7 @@ public void timeoutExceededTest() {
572572
}
573573

574574
@Test
575-
public void writeTimeoutExceededTest(){
575+
public void writeTimeoutExceededTest() {
576576

577577
ClientConfig config = new ClientConfig.Builder()
578578
.host(baseURL)
@@ -581,7 +581,7 @@ public void writeTimeoutExceededTest(){
581581
.writeTimeout(Duration.ofMillis(1))
582582
.build();
583583

584-
try(InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
584+
try (InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
585585

586586
Point point = Point.measurement("mem")
587587
.setTag("tag", "one")
@@ -600,7 +600,7 @@ public void writeTimeoutExceededTest(){
600600
}
601601

602602
@Test
603-
public void writeTimeoutOKTest(){
603+
public void writeTimeoutOKTest() {
604604
mockServer.enqueue(createResponse(200));
605605

606606
Duration testDuration = Duration.ofMillis(2000);
@@ -612,7 +612,7 @@ public void writeTimeoutOKTest(){
612612
.writeTimeout(testDuration)
613613
.build();
614614

615-
try(InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
615+
try (InfluxDBClient toClient = InfluxDBClient.getInstance(config)) {
616616

617617
Point point = Point.measurement("mem")
618618
.setTag("tag", "one")

‎src/test/java/com/influxdb/v3/client/config/ClientConfigTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ void timeoutDefaultsTest() {
395395
}
396396

397397
@Test
398-
void StandardTimeoutUsedWhenWriteTimeoutUndefinedTest(){
398+
void standardTimeoutUsedWhenWriteTimeoutUndefinedTest() {
399399
int testTimeout = 7;
400400
ClientConfig config = new ClientConfig.Builder()
401401
.host("http://localhost:8086")

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

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

24+
25+
import java.util.concurrent.TimeUnit;
26+
2427
import io.grpc.Deadline;
2528
import io.grpc.stub.AbstractStub;
2629
import org.apache.arrow.flight.CallOption;
2730
import org.apache.arrow.flight.CallOptions;
2831
import org.junit.jupiter.api.Assertions;
2932
import org.junit.jupiter.api.Test;
3033

31-
import java.util.concurrent.TimeUnit;
32-
3334
import static org.junit.jupiter.api.Assertions.assertEquals;
3435
import static org.junit.jupiter.api.Assertions.assertNotEquals;
3536
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -115,7 +116,7 @@ void testMergeCallOptionsWithEmptyArrays() {
115116
}
116117

117118
@Test
118-
void grpcOptionsCloneTest(){
119+
void grpcOptionsCloneTest() {
119120
GrpcCallOptions origOptions = new GrpcCallOptions.Builder()
120121
.withMaxInboundMessageSize(2000)
121122
.withMaxOutboundMessageSize(1000)
@@ -131,7 +132,7 @@ void grpcOptionsCloneTest(){
131132
}
132133

133134
@Test
134-
void grpcOptionsFromCloneWithUpdateTest(){
135+
void grpcOptionsFromCloneWithUpdateTest() {
135136
GrpcCallOptions origOptions = new GrpcCallOptions.Builder()
136137
.withMaxInboundMessageSize(2000)
137138
.withMaxOutboundMessageSize(1000)

0 commit comments

Comments
 (0)