style: avoid using star imports

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
   id("java")
   id("idea")
   id("com.github.vlsi.gradle-extensions") version "1.74"
-  id("com.diffplug.spotless") version "6.19.0"
+  id("com.diffplug.spotless") version "7.1.0"
   id("org.jreleaser") version "1.18.0" apply false
 }
 
@@ -55,6 +55,7 @@ allprojects {
         googleJavaFormat()
         removeUnusedImports()
         trimTrailingWhitespace()
+        removeWildcardImports()
       }
     }
   }

core/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
   id("idea")
   id("antlr")
   id("com.google.protobuf") version "0.9.4"
-  id("com.diffplug.spotless") version "6.19.0"
+  id("com.diffplug.spotless") version "7.1.0"
   id("com.gradleup.shadow") version "8.3.6"
   id("org.jreleaser")
 }
@@ -261,7 +261,7 @@ project.configure<IdeaModel> {
     generatedSourceDirs.addAll(
       listOf(
         file("build/generated/sources/antlr/main"),
-        file("build/generated/source/proto/main/java")
+        file("build/generated/source/proto/main/java"),
       )
     )
   }

core/src/main/java/io/substrait/expression/proto/ProtoExpressionConverter.java

@@ -258,7 +258,7 @@ public Type visit(Type.Struct type) throws RuntimeException {
           }
         }
 
-        // TODO enum.
+      // TODO enum.
       case ENUM:
         throw new UnsupportedOperationException("Unsupported type: " + expr.getRexTypeCase());
       default:

core/src/main/java/io/substrait/extension/ExtensionCollector.java

@@ -4,7 +4,9 @@
 import io.substrait.proto.Plan;
 import io.substrait.proto.SimpleExtensionDeclaration;
 import io.substrait.proto.SimpleExtensionURI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

core/src/main/java/io/substrait/extension/SimpleExtension.java

@@ -21,7 +21,12 @@
 import io.substrait.util.Util;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;

core/src/main/java/io/substrait/type/YamlRead.java

@@ -6,7 +6,10 @@
 import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.slf4j.Logger;

core/src/main/java/io/substrait/type/proto/TypeExpressionProtoVisitor.java

@@ -52,11 +52,11 @@ private DerivationExpression.BinaryOp.BinaryOpType getDerivationOpType(
         return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MAX;
       case LT:
         return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
-        // case LTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
+      // case LTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
       case GT:
         return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_GREATER_THAN;
-        // case GTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MINUS;
-        // case NOT_EQ -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQ;
+      // case GTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MINUS;
+      // case NOT_EQ -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQ;
       case EQ:
         return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQUALS;
       case COVERS:

core/src/test/java/io/substrait/extendedexpression/ExtendedExpressionRoundTripTest.java

@@ -2,7 +2,11 @@
 
 import io.substrait.TestBase;
 import io.substrait.dsl.SubstraitBuilder;
-import io.substrait.expression.*;
+import io.substrait.expression.AggregateFunctionInvocation;
+import io.substrait.expression.Expression;
+import io.substrait.expression.ExpressionCreator;
+import io.substrait.expression.FieldReference;
+import io.substrait.expression.ImmutableFieldReference;
 import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.relation.Aggregate;
 import io.substrait.type.NamedStruct;

core/src/test/java/io/substrait/relation/SetTest.java

@@ -1,12 +1,15 @@
 package io.substrait.relation;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import io.substrait.type.NamedStruct;
 import io.substrait.type.Type;
 import io.substrait.type.TypeCreator;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class SetTest {

core/src/test/java/io/substrait/type/proto/GenericRoundtripTest.java

@@ -19,8 +19,8 @@
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.util.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;

examples/substrait-spark/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   // Apply the application plugin to add support for building a CLI application in Java.
   id("java")
-  id("com.diffplug.spotless") version "6.19.0"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 repositories {

isthmus-cli/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   id("java")
   id("idea")
   id("com.palantir.graal") version "0.10.0"
-  id("com.diffplug.spotless") version "6.19.0"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 java {

isthmus-cli/src/main/java/io/substrait/isthmus/cli/RegisterAtRuntime.java

@@ -7,7 +7,31 @@
 import io.substrait.extension.SimpleExtension;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
-import org.apache.calcite.rel.metadata.*;
+import org.apache.calcite.rel.metadata.BuiltInMetadata;
+import org.apache.calcite.rel.metadata.Metadata;
+import org.apache.calcite.rel.metadata.MetadataHandler;
+import org.apache.calcite.rel.metadata.RelMdAllPredicates;
+import org.apache.calcite.rel.metadata.RelMdCollation;
+import org.apache.calcite.rel.metadata.RelMdColumnOrigins;
+import org.apache.calcite.rel.metadata.RelMdColumnUniqueness;
+import org.apache.calcite.rel.metadata.RelMdDistinctRowCount;
+import org.apache.calcite.rel.metadata.RelMdDistribution;
+import org.apache.calcite.rel.metadata.RelMdExplainVisibility;
+import org.apache.calcite.rel.metadata.RelMdExpressionLineage;
+import org.apache.calcite.rel.metadata.RelMdLowerBoundCost;
+import org.apache.calcite.rel.metadata.RelMdMaxRowCount;
+import org.apache.calcite.rel.metadata.RelMdMemory;
+import org.apache.calcite.rel.metadata.RelMdMinRowCount;
+import org.apache.calcite.rel.metadata.RelMdNodeTypes;
+import org.apache.calcite.rel.metadata.RelMdParallelism;
+import org.apache.calcite.rel.metadata.RelMdPercentageOriginalRows;
+import org.apache.calcite.rel.metadata.RelMdPopulationSize;
+import org.apache.calcite.rel.metadata.RelMdPredicates;
+import org.apache.calcite.rel.metadata.RelMdRowCount;
+import org.apache.calcite.rel.metadata.RelMdSelectivity;
+import org.apache.calcite.rel.metadata.RelMdSize;
+import org.apache.calcite.rel.metadata.RelMdTableReferences;
+import org.apache.calcite.rel.metadata.RelMdUniqueKeys;
 import org.apache.calcite.runtime.CalciteContextException;
 import org.apache.calcite.runtime.Resources;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;

isthmus/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
   signing
   id("java-library")
   id("idea")
-  id("com.diffplug.spotless") version "6.19.0"
+  id("com.diffplug.spotless") version "7.1.0"
   id("com.gradleup.shadow") version "8.3.6"
   id("com.google.protobuf") version "0.9.4"
   id("org.jreleaser")

isthmus/src/main/java/io/substrait/isthmus/expression/FieldSelectionConverter.java

@@ -7,7 +7,9 @@
 import io.substrait.isthmus.TypeConverter;
 import java.util.Optional;
 import java.util.function.Function;
-import org.apache.calcite.rex.*;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.SqlKind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;