Skip to content

Commit 0faf948

Browse files
authored
Removing star import and adding errorprone rule (apache#1831)
Fixes apache#1100
1 parent 9463a61 commit 0faf948

File tree

13 files changed

+47
-12
lines changed

13 files changed

+47
-12
lines changed

codestyle/errorprone-rules.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,6 @@ UnnecessaryBoxedVariable=ERROR
294294

295295
UseEnumSwitch=ERROR
296296
# Prefer using a switch instead of a chained if-else for enums
297+
298+
WildcardImport=ERROR
299+
# Wildcard imports, static or otherwise, should not be used

persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.apache.polaris.extension.persistence.impl.eclipselink;
2020

21-
import jakarta.persistence.*;
21+
import jakarta.persistence.EntityManager;
2222
import java.util.Optional;
2323
import java.util.concurrent.atomic.AtomicBoolean;
2424
import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId;

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/QueryGenerator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020

2121
import com.google.common.annotations.VisibleForTesting;
2222
import jakarta.annotation.Nonnull;
23-
import java.util.*;
23+
import java.util.ArrayList;
24+
import java.util.Arrays;
25+
import java.util.Collections;
26+
import java.util.HashSet;
27+
import java.util.List;
28+
import java.util.Map;
29+
import java.util.Set;
2430
import java.util.stream.Collectors;
2531
import org.apache.polaris.core.entity.PolarisEntityCore;
2632
import org.apache.polaris.core.entity.PolarisEntityId;

persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/QueryGeneratorTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
import static org.mockito.Mockito.mock;
2424
import static org.mockito.Mockito.when;
2525

26-
import java.util.*;
26+
import java.util.Arrays;
27+
import java.util.Collections;
28+
import java.util.HashMap;
29+
import java.util.List;
30+
import java.util.Map;
31+
import java.util.Set;
2732
import org.apache.polaris.core.entity.PolarisEntityCore;
2833
import org.apache.polaris.core.entity.PolarisEntityId;
2934
import org.apache.polaris.persistence.relational.jdbc.models.ModelEntity;

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkCatalogBaseIT.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@
3131
import org.apache.iceberg.spark.SupportsReplaceView;
3232
import org.apache.spark.sql.catalyst.analysis.NoSuchNamespaceException;
3333
import org.apache.spark.sql.catalyst.analysis.NoSuchViewException;
34-
import org.apache.spark.sql.connector.catalog.*;
34+
import org.apache.spark.sql.connector.catalog.CatalogPlugin;
35+
import org.apache.spark.sql.connector.catalog.Identifier;
36+
import org.apache.spark.sql.connector.catalog.NamespaceChange;
37+
import org.apache.spark.sql.connector.catalog.StagingTableCatalog;
38+
import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
39+
import org.apache.spark.sql.connector.catalog.View;
40+
import org.apache.spark.sql.connector.catalog.ViewCatalog;
41+
import org.apache.spark.sql.connector.catalog.ViewChange;
3542
import org.apache.spark.sql.types.StructType;
3643
import org.junit.jupiter.api.BeforeEach;
3744
import org.junit.jupiter.api.Test;

polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@
4747
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
4848
import org.apache.polaris.core.entity.PolarisPrivilege;
4949
import org.apache.polaris.core.entity.PolarisTaskConstants;
50-
import org.apache.polaris.core.persistence.*;
50+
import org.apache.polaris.core.persistence.BaseMetaStoreManager;
51+
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
52+
import org.apache.polaris.core.persistence.PolarisObjectMapperUtil;
53+
import org.apache.polaris.core.persistence.PolicyMappingAlreadyExistsException;
54+
import org.apache.polaris.core.persistence.RetryOnConcurrencyException;
5155
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
5256
import org.apache.polaris.core.persistence.dao.entity.ChangeTrackingResult;
5357
import org.apache.polaris.core.persistence.dao.entity.CreateCatalogResult;

quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.smallrye.config.ConfigMapping;
2222
import io.smallrye.config.WithName;
2323
import java.time.Duration;
24-
import java.util.*;
24+
import java.util.Optional;
2525
import org.apache.polaris.service.storage.StorageConfiguration;
2626

2727
@ConfigMapping(prefix = "polaris.storage")

quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
package org.apache.polaris.service.quarkus.catalog;
2020

21-
import static org.apache.polaris.service.catalog.AccessDelegationMode.*;
2221
import static org.apache.polaris.service.catalog.AccessDelegationMode.REMOTE_SIGNING;
22+
import static org.apache.polaris.service.catalog.AccessDelegationMode.UNKNOWN;
2323
import static org.apache.polaris.service.catalog.AccessDelegationMode.VENDED_CREDENTIALS;
2424
import static org.apache.polaris.service.catalog.AccessDelegationMode.fromProtocolValuesList;
2525
import static org.assertj.core.api.Assertions.assertThat;

quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/GetConfigTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@
2626
import java.util.Map;
2727
import java.util.UUID;
2828
import org.apache.iceberg.rest.responses.ConfigResponse;
29-
import org.apache.polaris.core.admin.model.*;
29+
import org.apache.polaris.core.admin.model.Catalog;
30+
import org.apache.polaris.core.admin.model.CatalogProperties;
31+
import org.apache.polaris.core.admin.model.CreateCatalogRequest;
32+
import org.apache.polaris.core.admin.model.FileStorageConfigInfo;
33+
import org.apache.polaris.core.admin.model.PolarisCatalog;
34+
import org.apache.polaris.core.admin.model.StorageConfigInfo;
3035
import org.apache.polaris.core.rest.PolarisEndpoints;
3136
import org.apache.polaris.service.TestServices;
3237
import org.junit.jupiter.params.ParameterizedTest;

service/common/src/main/java/org/apache/polaris/service/storage/StorageConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import java.io.IOException;
2525
import java.time.Duration;
2626
import java.time.Instant;
27-
import java.util.*;
27+
import java.util.Date;
28+
import java.util.Optional;
2829
import java.util.function.Supplier;
2930
import org.slf4j.LoggerFactory;
3031
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;

0 commit comments

Comments
 (0)