You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/04/10 16:18:27 UTC
[shardingsphere] branch master updated: Remove MagicNumber check of checkstyle (#25088)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c44ea0f87a7 Remove MagicNumber check of checkstyle (#25088)
c44ea0f87a7 is described below
commit c44ea0f87a7ac05df696f25b2b35b1002b2edf32
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Apr 11 00:18:12 2023 +0800
Remove MagicNumber check of checkstyle (#25088)
---
.../algorithm/traffic/segment/SQLMatchTrafficAlgorithmTest.java | 2 +-
.../algorithm/traffic/segment/SQLRegexTrafficAlgorithmTest.java | 4 ++--
pom.xml | 2 +-
src/resources/checkstyle.xml | 3 ---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithmTest.java b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithmTest.java
index 55579f8302c..5f9d23932a1 100644
--- a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithmTest.java
+++ b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithmTest.java
@@ -60,7 +60,7 @@ class SQLMatchTrafficAlgorithmTest {
assertFalse(sqlMatchAlgorithm.match(new SegmentTrafficValue(sqlStatement, "UPDATE `t_order` SET `order_id` = ?;")));
assertFalse(sqlMatchAlgorithm.match(new SegmentTrafficValue(sqlStatement, "UPDATE `t_order_item` SET `order_id` = ? WHERE user_id = ?;")));
}
-
+
@Test
void assertInitWithIllegalProps() {
assertThrows(IllegalArgumentException.class, () -> TypedSPILoader.getService(SQLMatchTrafficAlgorithm.class, "SQL_MATCH",
diff --git a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithmTest.java b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithmTest.java
index 87020291f85..ca2f484deb5 100644
--- a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithmTest.java
+++ b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithmTest.java
@@ -41,7 +41,7 @@ class SQLRegexTrafficAlgorithmTest {
sqlRegexAlgorithm = (SQLRegexTrafficAlgorithm) TypedSPILoader.getService(
TrafficAlgorithm.class, "SQL_REGEX", PropertiesBuilder.build(new Property("regex", "(?i)^(UPDATE|SELECT).*WHERE user_id.*")));
}
-
+
@Test
void assertMatchWhenExistSQLRegexMatch() {
SQLStatement sqlStatement = mock(SelectStatement.class);
@@ -50,7 +50,7 @@ class SQLRegexTrafficAlgorithmTest {
assertTrue(sqlRegexAlgorithm.match(new SegmentTrafficValue(sqlStatement, "select * from `t_order` where user_id = ?;")));
assertTrue(sqlRegexAlgorithm.match(new SegmentTrafficValue(sqlStatement, "UPDATE `t_order_item` SET `order_id` = ? WHERE user_id = ?;")));
}
-
+
@Test
void assertMatchWhenNotExistSQLRegexMatch() {
SQLStatement sqlStatement = mock(SelectStatement.class);
diff --git a/pom.xml b/pom.xml
index 1ef549a8de3..d37200b6bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
<spotless-maven-plugin.version>2.22.1</spotless-maven-plugin.version>
<maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
- <maven-pmd-plugin.version>3.5</maven-pmd-plugin.version>
+ <maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
<spotbugs-maven-plugin.version>4.7.2.1</spotbugs-maven-plugin.version>
<fb-contrib.version>7.6.0</fb-contrib.version>
<findsecbugs.version>1.12.0</findsecbugs.version>
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index a934ef0bb5a..e4d5abe2290 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -106,9 +106,6 @@
<property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value." />
</module>
<module name="IllegalType" />
- <module name="MagicNumber">
- <property name="severity" value="warning" />
- </module>
<module name="MissingSwitchDefault" />
<module name="ModifiedControlVariable" />
<module name="MultipleVariableDeclarations" />