From 6004e39540a1e469176be08000249866aa416c44 Mon Sep 17 00:00:00 2001
From: Gera Shegalov <gera@apache.org>
Date: Fri, 1 Nov 2024 15:00:22 -0700
Subject: [PATCH] Exclude shimplify-generated files from scalastyle

- Simplify the scalastyle pattern since it processes all scala files
  under a root regardless of shim
- Move Scala files previously not check-styled because under
  src/main/*java

Signed-off-by: Gera Shegalov <gera@apache.org>
---
 pom.xml                                             | 13 +++++--------
 .../spark/rapids/GpuExecutedCommandExec.scala       |  0
 .../nvidia/spark/rapids/shims/XxHash64Shims.scala   |  0
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename sql-plugin/src/main/{java => scala}/com/nvidia/spark/rapids/GpuExecutedCommandExec.scala (100%)
 rename sql-plugin/src/main/spark320/{java => scala}/com/nvidia/spark/rapids/shims/XxHash64Shims.scala (100%)

diff --git a/pom.xml b/pom.xml
index 893af998540..ebc33b045c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1589,14 +1589,11 @@ This will force full Scala code rebuild in downstream modules.
                             <skip>${maven.scalastyle.skip}</skip>
                             <target>
                                 <pathconvert property="scalastyle.dirs" pathsep=" ">
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/*/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/*/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/*/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/*/scala-${scala.binary.version}"/>
+                                    <dirset dir="${spark.rapids.source.basedir}">
+                                        <include name="**/src/main"/>
+                                        <include name="**/src/test"/>
+                                        <exclude name="**/target/*/generated/src/**"/>
+                                    </dirset>
                                 </pathconvert>
                                 <echo>Checking scalastyle for all modules using following paths:
                                     ${scalastyle.dirs}
diff --git a/sql-plugin/src/main/java/com/nvidia/spark/rapids/GpuExecutedCommandExec.scala b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuExecutedCommandExec.scala
similarity index 100%
rename from sql-plugin/src/main/java/com/nvidia/spark/rapids/GpuExecutedCommandExec.scala
rename to sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuExecutedCommandExec.scala
diff --git a/sql-plugin/src/main/spark320/java/com/nvidia/spark/rapids/shims/XxHash64Shims.scala b/sql-plugin/src/main/spark320/scala/com/nvidia/spark/rapids/shims/XxHash64Shims.scala
similarity index 100%
rename from sql-plugin/src/main/spark320/java/com/nvidia/spark/rapids/shims/XxHash64Shims.scala
rename to sql-plugin/src/main/spark320/scala/com/nvidia/spark/rapids/shims/XxHash64Shims.scala