Skip to content

Commit 9d891b1

Browse files
authored
JAVA-3089: Forbid wildcard imports (apache#1680)
1 parent 8101fbf commit 9d891b1

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,16 @@
1919
import com.datastax.oss.driver.api.core.data.CqlVector;
2020
import com.datastax.oss.driver.api.core.data.TupleValue;
2121
import com.datastax.oss.driver.api.core.data.UdtValue;
22-
import com.datastax.oss.driver.api.core.type.*;
22+
import com.datastax.oss.driver.api.core.type.ContainerType;
23+
import com.datastax.oss.driver.api.core.type.CustomType;
24+
import com.datastax.oss.driver.api.core.type.DataType;
25+
import com.datastax.oss.driver.api.core.type.DataTypes;
26+
import com.datastax.oss.driver.api.core.type.ListType;
27+
import com.datastax.oss.driver.api.core.type.MapType;
28+
import com.datastax.oss.driver.api.core.type.SetType;
29+
import com.datastax.oss.driver.api.core.type.TupleType;
30+
import com.datastax.oss.driver.api.core.type.UserDefinedType;
31+
import com.datastax.oss.driver.api.core.type.VectorType;
2332
import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException;
2433
import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
2534
import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;

core/src/test/java/com/datastax/oss/driver/internal/core/os/JnrLibcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.datastax.oss.driver.internal.core.os;
1717

18-
import static org.assertj.core.api.Assertions.*;
18+
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import java.time.Instant;
2121
import java.time.temporal.ChronoUnit;

integration-tests/src/test/java/com/datastax/oss/driver/mapper/DefaultKeyspaceIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.datastax.oss.driver.mapper;
1717

18-
import static com.datastax.oss.driver.api.mapper.MapperBuilder.*;
1918
import static org.assertj.core.api.Assertions.assertThat;
2019
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2120

@@ -25,6 +24,7 @@
2524
import com.datastax.oss.driver.api.core.cql.Row;
2625
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
2726
import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
27+
import com.datastax.oss.driver.api.mapper.MapperBuilder;
2828
import com.datastax.oss.driver.api.mapper.MapperException;
2929
import com.datastax.oss.driver.api.mapper.annotations.Dao;
3030
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() {
122122
() -> {
123123
InventoryMapperKsNotSet mapper =
124124
new DefaultKeyspaceIT_InventoryMapperKsNotSetBuilder(SESSION_RULE.session())
125-
.withCustomState(SCHEMA_VALIDATION_ENABLED_SETTING, false)
125+
.withCustomState(MapperBuilder.SCHEMA_VALIDATION_ENABLED_SETTING, false)
126126
.build();
127127
mapper.productDaoDefaultKsNotSet();
128128
})

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@
588588
<compilerArg>-Xep:FutureReturnValueIgnored:OFF</compilerArg>
589589
<compilerArg>-Xep:PreferJavaTimeOverload:OFF</compilerArg>
590590
<compilerArg>-Xep:AnnotateFormatMethod:OFF</compilerArg>
591+
<compilerArg>-Xep:WildcardImport:WARN</compilerArg>
591592
<compilerArg>-XepExcludedPaths:.*/target/(?:generated-sources|generated-test-sources)/.*</compilerArg>
592593
</compilerArgs>
593594
<showWarnings>true</showWarnings>

0 commit comments

Comments
 (0)