This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 6d08b5f36 [checkstyle] Improved validation scope of MagicNumber (#2194)
6d08b5f36 is described below
commit 6d08b5f369a5c2f07f14c9a41acac68123b4d137
Author: Zongwen Li <[email protected]>
AuthorDate: Tue Jul 19 10:03:08 2022 +0800
[checkstyle] Improved validation scope of MagicNumber (#2194)
---
.../java/org/apache/seatunnel/api/table/type/SeaTunnelRow.java | 1 -
.../org/apache/seatunnel/api/table/type/SeaTunnelRowType.java | 1 -
.../apache/seatunnel/common/utils/VariablesSubstituteTest.java | 1 -
.../org/apache/seatunnel/flink/assertion/AssertExecutorTest.java | 1 -
.../seatunnel/flink/assertion/rule/AssertRuleParserTest.java | 1 -
.../file/sink/hdfs/FileSinkAggregatedCommitterTest.java | 2 +-
.../file/sink/local/FileSinkAggregatedCommitterTest.java | 2 +-
.../org/apache/seatunnel/flink/assertion/AssertExecutorTest.java | 1 -
.../seatunnel/flink/assertion/rule/AssertRuleParserTest.java | 1 -
.../java/org/apache/seatunnel/flink/clickhouse/pojo/Shard.java | 1 -
.../apache/seatunnel/flink/clickhouse/pojo/ShardMetadata.java | 1 -
.../seatunnel/e2e/flink/v2/fake/FakeSourceToConsoleIT.java | 1 -
.../seatunnel/e2e/flink/clickhouse/FakeSourceToClickhouseIT.java | 1 -
.../seatunnel/e2e/spark/v2/fake/FakeSourceToConsoleIT.java | 1 -
.../apache/seatunnel/e2e/spark/v2/file/FakeSourceToFileIT.java | 1 -
.../org/apache/seatunnel/plugin/discovery/PluginIdentifier.java | 1 -
.../translation/flink/utils/TypeConverterUtilsTest.java | 1 -
tools/checkstyle/checkStyle.xml | 9 ++++++++-
18 files changed, 10 insertions(+), 18 deletions(-)
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRow.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRow.java
index de82a639b..aa5923ec1 100644
---
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRow.java
+++
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRow.java
@@ -87,7 +87,6 @@ public final class SeaTunnelRow implements Serializable {
return tableId == that.tableId && kind == that.kind &&
Arrays.deepEquals(fields, that.fields);
}
- @SuppressWarnings("magicnumber")
@Override
public int hashCode() {
int result = Objects.hash(tableId, kind);
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRowType.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRowType.java
index 45164c246..cb94bba00 100644
---
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRowType.java
+++
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/table/type/SeaTunnelRowType.java
@@ -98,7 +98,6 @@ public class SeaTunnelRowType implements
CompositeType<SeaTunnelRow> {
}
@Override
- @SuppressWarnings("MagicNumber")
public int hashCode() {
int result = Arrays.hashCode(fieldNames);
result = 31 * result + Arrays.hashCode(fieldTypes);
diff --git
a/seatunnel-common/src/test/java/org/apache/seatunnel/common/utils/VariablesSubstituteTest.java
b/seatunnel-common/src/test/java/org/apache/seatunnel/common/utils/VariablesSubstituteTest.java
index 33d721ae8..09d044a53 100644
---
a/seatunnel-common/src/test/java/org/apache/seatunnel/common/utils/VariablesSubstituteTest.java
+++
b/seatunnel-common/src/test/java/org/apache/seatunnel/common/utils/VariablesSubstituteTest.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
public class VariablesSubstituteTest {
- @SuppressWarnings("checkstyle:MagicNumber")
@Test
public void testSubstitute() {
String timeFormat = "yyyyMMddHHmmss";
diff --git
a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
index c5d30f3b1..fa9fee209 100644
---
a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
+++
b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
@@ -29,7 +29,6 @@ import junit.framework.TestCase;
import java.util.List;
-@SuppressWarnings("magicnumber")
public class AssertExecutorTest extends TestCase {
SeaTunnelRow row = new SeaTunnelRow(new Object[]{"jared", 17});
SeaTunnelRowType rowType = new SeaTunnelRowType(new String[]{"name",
"age"}, new SeaTunnelDataType[]{BasicType.STRING_TYPE, BasicType.INT_TYPE});
diff --git
a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
index 9a9628ded..5c1bb650c 100644
---
a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
+++
b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
@@ -28,7 +28,6 @@ import junit.framework.TestCase;
import java.util.List;
-@SuppressWarnings("magicnumber")
public class AssertRuleParserTest extends TestCase {
AssertRuleParser parser = new AssertRuleParser();
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/hdfs/FileSinkAggregatedCommitterTest.java
b/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/hdfs/FileSinkAggregatedCommitterTest.java
index 7554cee09..3262ccd1c 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/hdfs/FileSinkAggregatedCommitterTest.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/hdfs/FileSinkAggregatedCommitterTest.java
@@ -64,7 +64,7 @@ public class FileSinkAggregatedCommitterTest {
Assert.assertTrue(!HdfsUtils.fileExist(transactionDir));
}
- @SuppressWarnings({"checkstyle:MagicNumber",
"checkstyle:UnnecessaryParentheses"})
+ @SuppressWarnings("checkstyle:UnnecessaryParentheses")
@Test
public void testCombine() throws Exception {
FileSinkAggregatedCommitter fileSinkAggregatedCommitter = new
FileSinkAggregatedCommitter(new HdfsFileSystemCommitter());
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-local/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/local/FileSinkAggregatedCommitterTest.java
b/seatunnel-connectors-v2/connector-file/connector-file-local/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/local/FileSinkAggregatedCommitterTest.java
index 6b82041b1..720ad3eba 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-local/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/local/FileSinkAggregatedCommitterTest.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-local/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/sink/local/FileSinkAggregatedCommitterTest.java
@@ -64,7 +64,7 @@ public class FileSinkAggregatedCommitterTest {
Assert.assertTrue(!FileUtils.fileExist(transactionDir));
}
- @SuppressWarnings({"checkstyle:UnnecessaryParentheses",
"checkstyle:MagicNumber"})
+ @SuppressWarnings("checkstyle:UnnecessaryParentheses")
@Test
public void testCombine() throws Exception {
FileSinkAggregatedCommitter fileSinkAggregatedCommitter = new
FileSinkAggregatedCommitter(new LocalFileSystemCommitter());
diff --git
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
index 34c533cfc..1ddd866b9 100644
---
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
+++
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
@@ -26,7 +26,6 @@ import org.apache.flink.types.Row;
import java.util.List;
-@SuppressWarnings("magicnumber")
public class AssertExecutorTest extends TestCase {
Row row = Row.withNames();
AssertExecutor assertExecutor = new AssertExecutor();
diff --git
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
index fad5ed322..1df875e9d 100644
---
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
+++
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/rule/AssertRuleParserTest.java
@@ -25,7 +25,6 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
import java.util.List;
-@SuppressWarnings("magicnumber")
public class AssertRuleParserTest extends TestCase {
AssertRuleParser parser = new AssertRuleParser();
diff --git
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/Shard.java
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/Shard.java
index 20f34be1e..e2d1394df 100644
---
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/Shard.java
+++
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/Shard.java
@@ -114,7 +114,6 @@ public class Shard implements Serializable {
}
@Override
- @SuppressWarnings("magicnumber")
public int hashCode() {
if (hashCode != -1) {
return hashCode;
diff --git
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/ShardMetadata.java
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/ShardMetadata.java
index 96e273364..033c99d90 100644
---
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/ShardMetadata.java
+++
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-clickhouse/src/main/java/org/apache/seatunnel/flink/clickhouse/pojo/ShardMetadata.java
@@ -122,7 +122,6 @@ public class ShardMetadata implements Serializable {
}
@Override
- @SuppressWarnings("magicnumber")
public int hashCode() {
int result = shardKey.hashCode();
result = 31 * result + shardKeyType.hashCode();
diff --git
a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/fake/FakeSourceToConsoleIT.java
b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/fake/FakeSourceToConsoleIT.java
index f715c4e79..d480fc946 100644
---
a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/fake/FakeSourceToConsoleIT.java
+++
b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/fake/FakeSourceToConsoleIT.java
@@ -28,7 +28,6 @@ import java.io.IOException;
public class FakeSourceToConsoleIT extends FlinkContainer {
@Test
- @SuppressWarnings("magicnumber")
public void testFakeSourceToConsoleSink() throws IOException,
InterruptedException {
Container.ExecResult execResult =
executeSeaTunnelFlinkJob("/fake/fakesource_to_console.conf");
Assert.assertEquals(0, execResult.getExitCode());
diff --git
a/seatunnel-e2e/seatunnel-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/clickhouse/FakeSourceToClickhouseIT.java
b/seatunnel-e2e/seatunnel-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/clickhouse/FakeSourceToClickhouseIT.java
index adbea7806..1bf0fc6e5 100644
---
a/seatunnel-e2e/seatunnel-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/clickhouse/FakeSourceToClickhouseIT.java
+++
b/seatunnel-e2e/seatunnel-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/clickhouse/FakeSourceToClickhouseIT.java
@@ -50,7 +50,6 @@ public class FakeSourceToClickhouseIT extends FlinkContainer {
private static final Logger LOGGER =
LoggerFactory.getLogger(FakeSourceToClickhouseIT.class);
@Before
- @SuppressWarnings("magicnumber")
public void startClickhouseContainer() throws InterruptedException {
clickhouseServer = new GenericContainer<>(CLICKHOUSE_DOCKER_IMAGE)
.withNetwork(NETWORK)
diff --git
a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/fake/FakeSourceToConsoleIT.java
b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/fake/FakeSourceToConsoleIT.java
index 5f35135bb..0749ec06f 100644
---
a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/fake/FakeSourceToConsoleIT.java
+++
b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/fake/FakeSourceToConsoleIT.java
@@ -32,7 +32,6 @@ import java.io.IOException;
public class FakeSourceToConsoleIT extends SparkContainer {
@Test
- @SuppressWarnings("magicnumber")
public void testFakeSourceToConsoleSine() throws IOException,
InterruptedException {
Container.ExecResult execResult =
executeSeaTunnelSparkJob("/fake/fakesource_to_console.conf");
Assert.assertEquals(0, execResult.getExitCode());
diff --git
a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/file/FakeSourceToFileIT.java
b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/file/FakeSourceToFileIT.java
index 5ebe51d47..c2aeec513 100644
---
a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/file/FakeSourceToFileIT.java
+++
b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/file/FakeSourceToFileIT.java
@@ -32,7 +32,6 @@ import java.io.IOException;
public class FakeSourceToFileIT extends SparkContainer {
@Test
- @SuppressWarnings("magicnumber")
public void testFakeSourceToFile() throws IOException,
InterruptedException {
Container.ExecResult execResult =
executeSeaTunnelSparkJob("/file/fakesource_to_file.conf");
Assert.assertEquals(0, execResult.getExitCode());
diff --git
a/seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/PluginIdentifier.java
b/seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/PluginIdentifier.java
index 97d6e9f81..37e322b73 100644
---
a/seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/PluginIdentifier.java
+++
b/seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/PluginIdentifier.java
@@ -70,7 +70,6 @@ public class PluginIdentifier {
}
@Override
- @SuppressWarnings("checkstyle:magicnumber")
public int hashCode() {
int result = engineType != null ? engineType.hashCode() : 0;
result = 31 * result + (pluginType != null ? pluginType.hashCode() :
0);
diff --git
a/seatunnel-translation/seatunnel-translation-flink/src/test/java/org/apache/seatunnel/translation/flink/utils/TypeConverterUtilsTest.java
b/seatunnel-translation/seatunnel-translation-flink/src/test/java/org/apache/seatunnel/translation/flink/utils/TypeConverterUtilsTest.java
index 9eb6f959f..b5343fb92 100644
---
a/seatunnel-translation/seatunnel-translation-flink/src/test/java/org/apache/seatunnel/translation/flink/utils/TypeConverterUtilsTest.java
+++
b/seatunnel-translation/seatunnel-translation-flink/src/test/java/org/apache/seatunnel/translation/flink/utils/TypeConverterUtilsTest.java
@@ -73,7 +73,6 @@ public class TypeConverterUtilsTest {
}
@Test
- @SuppressWarnings("MagicNumber")
public void convertBigDecimalType() {
Assert.assertEquals(new BigDecimalTypeInfo(30, 2),
TypeConverterUtils.convert(new DecimalType(30, 2)));
}
diff --git a/tools/checkstyle/checkStyle.xml b/tools/checkstyle/checkStyle.xml
index ebbc1f258..ddff7c20f 100755
--- a/tools/checkstyle/checkStyle.xml
+++ b/tools/checkstyle/checkStyle.xml
@@ -85,6 +85,11 @@
<property name="ignorePattern" value="^package.*|^import.*|a
href|href|http://|https://|ftp://"/>
</module>
+ <module name="SuppressionSingleFilter">
+ <property name="files" value=".*(IT|Test).java"/>
+ <property name="checks" value="MagicNumber"/>
+ </module>
+
<module name="SuppressWarningsFilter"/>
<module name="TreeWalker">
<module name="SuppressWarningsHolder"/>
@@ -207,7 +212,9 @@
<module name="OneStatementPerLine"/>
- <module name="MagicNumber"/>
+ <module name="MagicNumber">
+ <property name="ignoreHashCodeMethod" value="true"/>
+ </module>
<module name="MultipleVariableDeclarations"/>
