From 9d891b120069fd2029c4743c14bc7df248e2e14b Mon Sep 17 00:00:00 2001
From: hhughes <Henry.hughes@datastax.com>
Date: Thu, 13 Jul 2023 17:33:57 -0700
Subject: [PATCH] JAVA-3089: Forbid wildcard imports (#1680)

---
 .../type/codec/registry/CachingCodecRegistry.java     | 11 ++++++++++-
 .../oss/driver/internal/core/os/JnrLibcTest.java      |  2 +-
 .../datastax/oss/driver/mapper/DefaultKeyspaceIT.java |  4 ++--
 pom.xml                                               |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java
index cb5d45255e1..34c503bfce5 100644
--- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java
+++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java
@@ -19,7 +19,16 @@
 import com.datastax.oss.driver.api.core.data.CqlVector;
 import com.datastax.oss.driver.api.core.data.TupleValue;
 import com.datastax.oss.driver.api.core.data.UdtValue;
-import com.datastax.oss.driver.api.core.type.*;
+import com.datastax.oss.driver.api.core.type.ContainerType;
+import com.datastax.oss.driver.api.core.type.CustomType;
+import com.datastax.oss.driver.api.core.type.DataType;
+import com.datastax.oss.driver.api.core.type.DataTypes;
+import com.datastax.oss.driver.api.core.type.ListType;
+import com.datastax.oss.driver.api.core.type.MapType;
+import com.datastax.oss.driver.api.core.type.SetType;
+import com.datastax.oss.driver.api.core.type.TupleType;
+import com.datastax.oss.driver.api.core.type.UserDefinedType;
+import com.datastax.oss.driver.api.core.type.VectorType;
 import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/os/JnrLibcTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/os/JnrLibcTest.java
index e3bf9a876db..9fd58a2b163 100644
--- a/core/src/test/java/com/datastax/oss/driver/internal/core/os/JnrLibcTest.java
+++ b/core/src/test/java/com/datastax/oss/driver/internal/core/os/JnrLibcTest.java
@@ -15,7 +15,7 @@
  */
 package com.datastax.oss.driver.internal.core.os;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DefaultKeyspaceIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DefaultKeyspaceIT.java
index 55f7aff9b62..8d9614bf97c 100644
--- a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DefaultKeyspaceIT.java
+++ b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DefaultKeyspaceIT.java
@@ -15,7 +15,6 @@
  */
 package com.datastax.oss.driver.mapper;
 
-import static com.datastax.oss.driver.api.mapper.MapperBuilder.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -25,6 +24,7 @@
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
+import com.datastax.oss.driver.api.mapper.MapperBuilder;
 import com.datastax.oss.driver.api.mapper.MapperException;
 import com.datastax.oss.driver.api.mapper.annotations.Dao;
 import com.datastax.oss.driver.api.mapper.annotations.DaoFactory;
@@ -122,7 +122,7 @@ public void should_fail_to_insert_if_default_ks_and_dao_ks_not_provided() {
             () -> {
               InventoryMapperKsNotSet mapper =
                   new DefaultKeyspaceIT_InventoryMapperKsNotSetBuilder(SESSION_RULE.session())
-                      .withCustomState(SCHEMA_VALIDATION_ENABLED_SETTING, false)
+                      .withCustomState(MapperBuilder.SCHEMA_VALIDATION_ENABLED_SETTING, false)
                       .build();
               mapper.productDaoDefaultKsNotSet();
             })
diff --git a/pom.xml b/pom.xml
index 0c20405b68e..19adba12170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,6 +588,7 @@
             <compilerArg>-Xep:FutureReturnValueIgnored:OFF</compilerArg>
             <compilerArg>-Xep:PreferJavaTimeOverload:OFF</compilerArg>
             <compilerArg>-Xep:AnnotateFormatMethod:OFF</compilerArg>
+            <compilerArg>-Xep:WildcardImport:WARN</compilerArg>
             <compilerArg>-XepExcludedPaths:.*/target/(?:generated-sources|generated-test-sources)/.*</compilerArg>
           </compilerArgs>
           <showWarnings>true</showWarnings>