Skip to content

Commit a59941a

Browse files
LuciferYangdongjoon-hyun
authored andcommitted
[SPARK-50678][BUILD] Clean up outdated style check rules related to Guava
### What changes were proposed in this pull request? The version of Guava being used by Spark is 33.3.1 now, so this pr cleans up the outdated check rules from `dev/checkstyle.xml` and `scalastyle-config.xml` - The current version of Guava no longer has the `Objects.toStringHelper` method, so this check rule is no longer needed - CVE-2020-8908 has been fixed after version 32.0.0, so the related check is no longer needed - CVE-2023-2976 has been fixed after version 32.0.0, so the related check is no longer needed - CVE-2018-10237 has been fixed after version 24.1.1, so the related check is no longer needed ### Why are the changes needed? Clean up outdated style check rules related to Guava ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass Github Actions ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#49302 from LuciferYang/checkstyle-outdated. Lead-authored-by: YangJie <yangjie01@baidu.com> Co-authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 580b3c0 commit a59941a

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

dev/checkstyle.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -172,32 +172,10 @@
172172
<property name="format" value="throw new \w+Error\("/>
173173
<property name="message" value="Avoid throwing error in application code."/>
174174
</module>
175-
<module name="RegexpSinglelineJava">
176-
<property name="format" value="Objects\.toStringHelper"/>
177-
<property name="message" value="Avoid using Object.toStringHelper. Use ToStringBuilder instead." />
178-
</module>
179175
<module name="RegexpSinglelineJava">
180176
<property name="format" value="new (java\.lang\.)?(Byte|Integer|Long|Short)\("/>
181177
<property name="message" value="Use static factory 'valueOf' or 'parseXXX' instead of the deprecated constructors." />
182178
</module>
183-
<module name="RegexpSinglelineJava">
184-
<property name="format" value="Files\.createTempDir\("/>
185-
<property name="message"
186-
value="Avoid using com.google.common.io.Files.createTempDir() due to CVE-2020-8908.
187-
Use org.apache.spark.network.util.JavaUtils.createTempDir() instead." />
188-
</module>
189-
<module name="RegexpSinglelineJava">
190-
<property name="format" value="FileBackedOutputStream"/>
191-
<property name="message" value="Avoid using FileBackedOutputStream due to CVE-2023-2976." />
192-
</module>
193-
<module name="RegexpSinglelineJava">
194-
<property name="format" value="AtomicDoubleArray"/>
195-
<property name="message" value="Avoid using AtomicDoubleArray due to CVE-2018-10237." />
196-
</module>
197-
<module name="RegexpSinglelineJava">
198-
<property name="format" value="CompoundOrdering"/>
199-
<property name="message" value="Avoid using CompoundOrdering due to CVE-2018-10237." />
200-
</module>
201179
<module name="RegexpSinglelineJava">
202180
<property name="format" value="@Test\(expected"/>
203181
<property name="message" value="Please use the `assertThrows` method to test for exceptions." />

scalastyle-config.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -460,33 +460,6 @@ This file is divided into 3 sections:
460460
<parameters><parameter name="ignore">-1,0,1,2,3</parameter></parameters>
461461
</check>
462462

463-
<check customId="GuavaToStringHelper" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
464-
<parameters><parameter name="regex">Objects.toStringHelper</parameter></parameters>
465-
<customMessage>Avoid using Object.toStringHelper. Use ToStringBuilder instead.</customMessage>
466-
</check>
467-
468-
<check customId="GuavaFilesCreateTempDir" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
469-
<parameters><parameter name="regex">Files\.createTempDir\(</parameter></parameters>
470-
<customMessage>Avoid using com.google.common.io.Files.createTempDir due to CVE-2020-8908.
471-
Use org.apache.spark.util.Utils.createTempDir instead.
472-
</customMessage>
473-
</check>
474-
475-
<check customId="GuavaFileBackedOutputStream" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
476-
<parameters><parameter name="regex">FileBackedOutputStream</parameter></parameters>
477-
<customMessage>Avoid using FileBackedOutputStream due to CVE-2023-2976.</customMessage>
478-
</check>
479-
480-
<check customId="GuavaAtomicDoubleArray" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
481-
<parameters><parameter name="regex">AtomicDoubleArray</parameter></parameters>
482-
<customMessage>Avoid using AtomicDoubleArray due to CVE-2018-10237.</customMessage>
483-
</check>
484-
485-
<check customId="GuavaCompoundOrdering" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
486-
<parameters><parameter name="regex">CompoundOrdering</parameter></parameters>
487-
<customMessage>Avoid using CompoundOrdering due to CVE-2018-10237.</customMessage>
488-
</check>
489-
490463
<check customId="byteCountToDisplaySize" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
491464
<parameters><parameter name="regex">byteCountToDisplaySize</parameter></parameters>
492465
<customMessage>Use Utils.bytesToString instead of byteCountToDisplaySize for consistency.</customMessage>

0 commit comments

Comments
 (0)