Skip to content

Commit 557659e

Browse files
SNOW-1037802: Remove wildcard imports (#1635)
1 parent 829618a commit 557659e

File tree

139 files changed

+1570
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1570
-271
lines changed

.github/pull_request_template.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
SNOW-XXXXX
44

5-
## External contributors - please answer these questions before submitting a pull request. Thanks!
5+
## Pre-review self checklist
6+
- [ ] The code is correctly formatted (run `mvn -P check-style validate`)
7+
- [ ] I don't expose unnecessary new public API (run `mvn verify` and inspect `target/japicmp/japicmp.html`)
8+
- [ ] Pull request name is prefixed with `SNOW-XXXX: `
69

7-
Please answer these questions before submitting your pull requests. Thanks!
10+
## External contributors - please answer these questions before submitting a pull request. Thanks!
811

912
1. What GitHub issue is this PR addressing? Make sure that there is an accompanying issue to your PR.
1013

@@ -18,13 +21,9 @@ Please answer these questions before submitting your pull requests. Thanks!
1821
- [ ] I am modifying authorization mechanisms
1922
- [ ] I am adding new credentials
2023
- [ ] I am modifying OCSP code
21-
- [ ] I am adding a new dependency
24+
- [ ] I am adding a new dependency or upgrading an existing one
25+
- [ ] I am adding new public/protected component not marked with `@SnowflakeJdbcInternalApi` (note that public/protected methods/fields in classes marked with this annotation are already internal)
2226

2327
3. Please describe how your code solves the related issue.
2428

2529
Please write a short description of how your code change solves the related issue.
26-
27-
## Pre-review checklist
28-
- [ ] This change has passed precommit
29-
- [ ] I have reviewed code coverage report for my PR in ([Sonarqube](https://sonarqube.int.snowflakecomputing.com/project/branches?id=snowflake-jdbc))
30-

.github/workflows/check-style.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
- uses: actions/checkout@v1
1313
- name: Check Style
1414
shell: bash
15-
run: mvn clean verify --batch-mode --show-version -P check-style
15+
run: mvn clean validate --batch-mode --show-version -P check-style

README.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Run the maven command to check the coding style.
138138

139139
.. code-block:: bash
140140
141-
mvn -P check-style verify
141+
mvn -P check-style validate
142142
143143
Follow the instruction if any error occurs or run this command to fix the formats.
144144

@@ -151,6 +151,10 @@ You may import the coding style from IntelliJ so that the coding style can be ap
151151
- In the **File** -> **Settings/Plugins**, and install `google-java-format` plugin.
152152
- Enable `google-java-format` for the JDBC project.
153153
- In the source code window, select **Code** -> **Reformat** to apply the coding style.
154+
- Additionally configure IDE to not use wildcard imports in **File** -> **Ecitor** -> **Code Style** -> **Java** set:
155+
- **Use single class import**
156+
- **Class count to use import with '*'** to 1000
157+
- **Names count to use static import with '*'** to 1000
154158

155159
Tests
156160
=====

parent-pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<version.maven>3.6.3</version.maven>
8080
<version.plugin.antrun>3.1.0</version.plugin.antrun>
8181
<version.plugin.buildnumber>3.0.0</version.plugin.buildnumber>
82+
<version.plugin.checkstyle>3.3.1</version.plugin.checkstyle>
8283
<version.plugin.clean>3.2.0</version.plugin.clean>
8384
<version.plugin.compiler>3.11.0</version.plugin.compiler>
8485
<version.plugin.dependency>3.5.0</version.plugin.dependency>

pom.xml

+33
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
<artifactId>maven-antrun-plugin</artifactId>
6969
<version>${version.plugin.antrun}</version>
7070
</plugin>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-checkstyle-plugin</artifactId>
74+
<version>${version.plugin.checkstyle}</version>
75+
</plugin>
7176
<plugin>
7277
<groupId>org.apache.maven.plugins</groupId>
7378
<artifactId>maven-clean-plugin</artifactId>
@@ -574,9 +579,37 @@
574579
<artifactId>fmt-maven-plugin</artifactId>
575580
<executions>
576581
<execution>
582+
<id>fmt</id>
583+
<goals>
584+
<goal>check</goal>
585+
</goals>
586+
<phase>validate</phase>
587+
</execution>
588+
</executions>
589+
</plugin>
590+
<plugin>
591+
<groupId>org.apache.maven.plugins</groupId>
592+
<artifactId>maven-checkstyle-plugin</artifactId>
593+
<configuration>
594+
<checkstyleRules>
595+
<module name="Checker">
596+
<module name="TreeWalker">
597+
<module name="AvoidStarImport"/>
598+
</module>
599+
</module>
600+
</checkstyleRules>
601+
<consoleOutput>true</consoleOutput>
602+
<failsOnError>true</failsOnError>
603+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
604+
<violationSeverity>warning</violationSeverity>
605+
</configuration>
606+
<executions>
607+
<execution>
608+
<id>checkstyle</id>
577609
<goals>
578610
<goal>check</goal>
579611
</goals>
612+
<phase>validate</phase>
580613
</execution>
581614
</executions>
582615
</plugin>

src/main/java/net/snowflake/client/core/Event.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
package net.snowflake.client.core;
66

77
import com.google.common.base.Preconditions;
8-
import java.io.*;
8+
import java.io.File;
9+
import java.io.FileOutputStream;
10+
import java.io.IOException;
11+
import java.io.OutputStream;
12+
import java.io.PrintWriter;
913
import java.util.zip.GZIPOutputStream;
1014
import net.snowflake.client.log.SFLogger;
1115
import net.snowflake.client.log.SFLoggerFactory;

src/main/java/net/snowflake/client/core/EventHandler.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@
66

77
import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
88

9-
import java.io.*;
9+
import java.io.File;
10+
import java.io.FileOutputStream;
11+
import java.io.IOException;
12+
import java.io.OutputStream;
13+
import java.io.PrintWriter;
1014
import java.text.DateFormat;
1115
import java.text.SimpleDateFormat;
12-
import java.util.*;
16+
import java.util.ArrayList;
17+
import java.util.Comparator;
18+
import java.util.Date;
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
import java.util.TimeZone;
22+
import java.util.TreeSet;
1323
import java.util.concurrent.Executors;
1424
import java.util.concurrent.ScheduledExecutorService;
1525
import java.util.concurrent.ThreadFactory;

src/main/java/net/snowflake/client/core/FileCacheManager.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99

1010
import com.fasterxml.jackson.databind.JsonNode;
1111
import com.fasterxml.jackson.databind.ObjectMapper;
12-
import java.io.*;
12+
import java.io.File;
13+
import java.io.FileInputStream;
14+
import java.io.FileOutputStream;
15+
import java.io.IOException;
16+
import java.io.InputStreamReader;
17+
import java.io.OutputStreamWriter;
18+
import java.io.Reader;
19+
import java.io.Writer;
1320
import java.nio.charset.Charset;
1421
import java.nio.charset.StandardCharsets;
1522
import java.nio.file.Files;

src/main/java/net/snowflake/client/core/HttpUtil.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
import com.google.common.annotations.VisibleForTesting;
1414
import com.google.common.base.Strings;
1515
import com.microsoft.azure.storage.OperationContext;
16-
import java.io.*;
16+
import java.io.File;
17+
import java.io.IOException;
18+
import java.io.InputStream;
19+
import java.io.PrintWriter;
20+
import java.io.StringWriter;
1721
import java.net.InetSocketAddress;
1822
import java.net.Proxy;
1923
import java.net.Socket;

src/main/java/net/snowflake/client/core/IncidentUtil.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
import com.yammer.metrics.core.Clock;
1515
import com.yammer.metrics.core.VirtualMachineMetrics;
1616
import com.yammer.metrics.reporting.MetricsServlet;
17-
import java.io.*;
17+
import java.io.File;
18+
import java.io.FileOutputStream;
19+
import java.io.IOException;
20+
import java.io.OutputStream;
21+
import java.io.PrintWriter;
1822
import java.util.Map;
1923
import java.util.concurrent.TimeUnit;
2024
import java.util.zip.GZIPOutputStream;

src/main/java/net/snowflake/client/core/QueryContextCache.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
import com.fasterxml.jackson.databind.JsonNode;
88
import com.fasterxml.jackson.databind.ObjectMapper;
99
import java.io.IOException;
10-
import java.util.*;
10+
import java.util.ArrayList;
11+
import java.util.Comparator;
12+
import java.util.HashMap;
13+
import java.util.List;
14+
import java.util.Map;
15+
import java.util.TreeSet;
1116
import net.snowflake.client.log.SFLogger;
1217
import net.snowflake.client.log.SFLoggerFactory;
1318

src/main/java/net/snowflake/client/core/ResultUtil.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
import java.sql.SQLException;
1111
import java.sql.Timestamp;
1212
import java.sql.Types;
13-
import java.util.*;
13+
import java.util.ArrayList;
14+
import java.util.Arrays;
15+
import java.util.Calendar;
16+
import java.util.Collections;
17+
import java.util.HashMap;
18+
import java.util.List;
19+
import java.util.Map;
20+
import java.util.TimeZone;
1421
import net.snowflake.client.jdbc.ErrorCode;
1522
import net.snowflake.client.jdbc.SnowflakeUtil;
1623
import net.snowflake.client.log.ArgSupplier;

src/main/java/net/snowflake/client/core/SFArrowResultSet.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
import java.sql.Timestamp;
1717
import java.util.TimeZone;
1818
import net.snowflake.client.core.arrow.ArrowVectorConverter;
19-
import net.snowflake.client.jdbc.*;
19+
import net.snowflake.client.jdbc.ArrowResultChunk;
2020
import net.snowflake.client.jdbc.ArrowResultChunk.ArrowChunkIterator;
21+
import net.snowflake.client.jdbc.ErrorCode;
22+
import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;
23+
import net.snowflake.client.jdbc.SnowflakeSQLException;
24+
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
2125
import net.snowflake.client.jdbc.telemetry.Telemetry;
2226
import net.snowflake.client.jdbc.telemetry.TelemetryData;
2327
import net.snowflake.client.jdbc.telemetry.TelemetryField;

src/main/java/net/snowflake/client/core/SFBaseResultSet.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
import java.sql.SQLException;
1010
import java.sql.Time;
1111
import java.sql.Timestamp;
12-
import java.util.*;
12+
import java.util.ArrayList;
13+
import java.util.HashMap;
14+
import java.util.List;
15+
import java.util.Map;
16+
import java.util.TimeZone;
1317
import net.snowflake.client.jdbc.ErrorCode;
1418
import net.snowflake.client.jdbc.SnowflakeResultSetSerializable;
1519
import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;

src/main/java/net/snowflake/client/core/SFBaseSession.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@
1010
import com.google.common.base.Strings;
1111
import java.sql.DriverPropertyInfo;
1212
import java.sql.SQLException;
13-
import java.util.*;
13+
import java.util.ArrayList;
14+
import java.util.HashMap;
15+
import java.util.List;
16+
import java.util.Map;
17+
import java.util.Properties;
1418
import java.util.concurrent.atomic.AtomicBoolean;
1519
import java.util.concurrent.atomic.AtomicInteger;
16-
import net.snowflake.client.jdbc.*;
20+
import net.snowflake.client.jdbc.ErrorCode;
21+
import net.snowflake.client.jdbc.QueryStatusV2;
22+
import net.snowflake.client.jdbc.SFConnectionHandler;
23+
import net.snowflake.client.jdbc.SnowflakeConnectString;
24+
import net.snowflake.client.jdbc.SnowflakeSQLException;
25+
import net.snowflake.client.jdbc.SnowflakeType;
1726
import net.snowflake.client.jdbc.telemetry.Telemetry;
1827
import net.snowflake.client.log.SFLogger;
1928
import net.snowflake.client.log.SFLoggerFactory;

src/main/java/net/snowflake/client/core/SFFixedViewResultSet.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
import java.sql.SQLException;
88
import java.util.List;
99
import net.snowflake.client.core.json.Converters;
10-
import net.snowflake.client.jdbc.*;
10+
import net.snowflake.client.jdbc.ErrorCode;
11+
import net.snowflake.client.jdbc.SFBaseFileTransferAgent;
1112
import net.snowflake.client.jdbc.SFBaseFileTransferAgent.CommandType;
13+
import net.snowflake.client.jdbc.SnowflakeFixedView;
14+
import net.snowflake.client.jdbc.SnowflakeLoggedFeatureNotSupportedException;
15+
import net.snowflake.client.jdbc.SnowflakeSQLException;
16+
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
1217
import net.snowflake.client.log.SFLogger;
1318
import net.snowflake.client.log.SFLoggerFactory;
1419
import net.snowflake.common.core.SFBinaryFormat;

src/main/java/net/snowflake/client/core/SFResultSet.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
import java.util.Comparator;
1414
import net.snowflake.client.core.BasicEvent.QueryState;
1515
import net.snowflake.client.core.json.Converters;
16-
import net.snowflake.client.jdbc.*;
16+
import net.snowflake.client.jdbc.ErrorCode;
17+
import net.snowflake.client.jdbc.JsonResultChunk;
18+
import net.snowflake.client.jdbc.SnowflakeResultChunk;
19+
import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;
20+
import net.snowflake.client.jdbc.SnowflakeSQLException;
21+
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
1722
import net.snowflake.client.jdbc.telemetry.Telemetry;
1823
import net.snowflake.client.jdbc.telemetry.TelemetryData;
1924
import net.snowflake.client.jdbc.telemetry.TelemetryField;

src/main/java/net/snowflake/client/core/SFResultSetMetaData.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
import java.sql.Date;
88
import java.sql.ResultSetMetaData;
99
import java.sql.Types;
10-
import java.util.*;
10+
import java.util.ArrayList;
11+
import java.util.Calendar;
12+
import java.util.HashMap;
13+
import java.util.List;
14+
import java.util.Map;
15+
import java.util.TimeZone;
1116
import net.snowflake.client.jdbc.ErrorCode;
1217
import net.snowflake.client.jdbc.SnowflakeColumnMetadata;
1318
import net.snowflake.client.jdbc.SnowflakeUtil;

src/main/java/net/snowflake/client/core/SFSession.java

+23-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
package net.snowflake.client.core;
66

7-
import static net.snowflake.client.core.QueryStatus.*;
7+
import static net.snowflake.client.core.QueryStatus.getStatusFromString;
8+
import static net.snowflake.client.core.QueryStatus.isAnError;
9+
import static net.snowflake.client.core.QueryStatus.isStillRunning;
810
import static net.snowflake.client.core.SFLoginInput.getBooleanValue;
911

1012
import com.fasterxml.jackson.databind.JsonNode;
@@ -15,12 +17,29 @@
1517
import java.sql.DriverPropertyInfo;
1618
import java.sql.SQLException;
1719
import java.time.Duration;
18-
import java.util.*;
19-
import java.util.concurrent.*;
20+
import java.util.ArrayList;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
24+
import java.util.Set;
25+
import java.util.concurrent.Callable;
26+
import java.util.concurrent.ConcurrentHashMap;
27+
import java.util.concurrent.ExecutorService;
28+
import java.util.concurrent.Executors;
29+
import java.util.concurrent.Future;
30+
import java.util.concurrent.TimeUnit;
31+
import java.util.concurrent.TimeoutException;
2032
import java.util.concurrent.atomic.AtomicInteger;
2133
import java.util.logging.Level;
2234
import net.snowflake.client.config.SFClientConfig;
23-
import net.snowflake.client.jdbc.*;
35+
import net.snowflake.client.jdbc.DefaultSFConnectionHandler;
36+
import net.snowflake.client.jdbc.ErrorCode;
37+
import net.snowflake.client.jdbc.QueryStatusV2;
38+
import net.snowflake.client.jdbc.SnowflakeConnectString;
39+
import net.snowflake.client.jdbc.SnowflakeReauthenticationRequest;
40+
import net.snowflake.client.jdbc.SnowflakeSQLException;
41+
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
42+
import net.snowflake.client.jdbc.SnowflakeUtil;
2443
import net.snowflake.client.jdbc.telemetry.Telemetry;
2544
import net.snowflake.client.jdbc.telemetry.TelemetryClient;
2645
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;

src/main/java/net/snowflake/client/core/SFStatement.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
package net.snowflake.client.core;
66

7-
import static net.snowflake.client.core.SessionUtil.*;
7+
import static net.snowflake.client.core.SessionUtil.DEFAULT_CLIENT_MEMORY_LIMIT;
8+
import static net.snowflake.client.core.SessionUtil.DEFAULT_CLIENT_PREFETCH_THREADS;
9+
import static net.snowflake.client.core.SessionUtil.MAX_CLIENT_CHUNK_SIZE;
10+
import static net.snowflake.client.core.SessionUtil.MIN_CLIENT_CHUNK_SIZE;
811
import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
912

1013
import com.fasterxml.jackson.databind.JsonNode;
1114
import java.sql.SQLException;
1215
import java.sql.Statement;
13-
import java.util.*;
1416
import java.util.ArrayList;
1517
import java.util.Collections;
1618
import java.util.List;
@@ -23,7 +25,13 @@
2325
import net.snowflake.client.core.BasicEvent.QueryState;
2426
import net.snowflake.client.core.bind.BindException;
2527
import net.snowflake.client.core.bind.BindUploader;
26-
import net.snowflake.client.jdbc.*;
28+
import net.snowflake.client.jdbc.ErrorCode;
29+
import net.snowflake.client.jdbc.QueryStatusV2;
30+
import net.snowflake.client.jdbc.SnowflakeDriver;
31+
import net.snowflake.client.jdbc.SnowflakeFileTransferAgent;
32+
import net.snowflake.client.jdbc.SnowflakeReauthenticationRequest;
33+
import net.snowflake.client.jdbc.SnowflakeSQLException;
34+
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
2735
import net.snowflake.client.jdbc.telemetry.TelemetryData;
2836
import net.snowflake.client.jdbc.telemetry.TelemetryField;
2937
import net.snowflake.client.jdbc.telemetry.TelemetryUtil;

0 commit comments

Comments
 (0)