Initial, Add parameterization to avoid scala/bug#6617

Author: snuyanzin

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java

@@ -37,8 +37,8 @@
 
 /**
  * This rule is copied from Calcite's {@link org.apache.calcite.rel.rules.AggregateRemoveRule}.
- * Modification: - only matches aggregate with with SIMPLE group and non-empty group - supports SUM,
- * MIN, MAX, AUXILIARY_GROUP aggregate functions with no filterArgs
+ * Modification: - only matches aggregate with SIMPLE group and non-empty group - supports SUM, MIN,
+ * MAX, AUXILIARY_GROUP aggregate functions with no filterArgs
  */
 
 /**

flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala

@@ -17,7 +17,7 @@
  */
 package org.apache.flink.table.planner.plan.nodes.logical
 
-import org.apache.flink.table.catalog.{CatalogTable, ContextResolvedTable, ObjectIdentifier, ResolvedCatalogTable}
+import org.apache.flink.table.catalog.ContextResolvedTable
 import org.apache.flink.table.connector.sink.DynamicTableSink
 import org.apache.flink.table.planner.plan.abilities.sink.SinkAbilitySpec
 import org.apache.flink.table.planner.plan.nodes.FlinkConventions

flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/AggregateJoinTransposeITCase.scala

@@ -35,7 +35,6 @@ import org.apache.calcite.tools.RuleSets
 import org.junit.{Before, Test}
 
 import scala.collection.JavaConverters._
-import scala.collection.Seq
 
 class AggregateJoinTransposeITCase extends BatchTestBase {