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/25 04:51:53 UTC
[shardingsphere] branch master updated: Add more error prone rules for pmd (#25312)
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 a46b96f3fb2 Add more error prone rules for pmd (#25312)
a46b96f3fb2 is described below
commit a46b96f3fb2aaa4b0cf925b91d3df7513cdf994b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Apr 25 12:51:38 2023 +0800
Add more error prone rules for pmd (#25312)
* Add more error prone rules for pmd
* Fix CI
---
.../infra/rewrite/sql/token/generator/SQLTokenGenerators.java | 8 ++++----
.../infra/rewrite/sql/token/generator/SQLTokenGeneratorsTest.java | 2 +-
src/resources/pmd.xml | 6 ++++++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
index 872dfbbfb00..0cd9aa0a3aa 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
@@ -37,7 +37,7 @@ import java.util.Map;
*/
public final class SQLTokenGenerators {
- private final Map<Class<?>, SQLTokenGenerator> sqlTokenGenerators = new LinkedHashMap<>();
+ private final Map<Class<?>, SQLTokenGenerator> generators = new LinkedHashMap<>();
/**
* Add all SQL token generators.
@@ -46,8 +46,8 @@ public final class SQLTokenGenerators {
*/
public void addAll(final Collection<SQLTokenGenerator> sqlTokenGenerators) {
for (SQLTokenGenerator each : sqlTokenGenerators) {
- if (!this.sqlTokenGenerators.containsKey(each.getClass())) {
- this.sqlTokenGenerators.put(each.getClass(), each);
+ if (!this.generators.containsKey(each.getClass())) {
+ this.generators.put(each.getClass(), each);
}
}
}
@@ -66,7 +66,7 @@ public final class SQLTokenGenerators {
public List<SQLToken> generateSQLTokens(final String databaseName, final Map<String, ShardingSphereSchema> schemas,
final SQLStatementContext sqlStatementContext, final List<Object> params, final ConnectionContext connectionContext) {
List<SQLToken> result = new LinkedList<>();
- for (SQLTokenGenerator each : sqlTokenGenerators.values()) {
+ for (SQLTokenGenerator each : generators.values()) {
setUpSQLTokenGenerator(each, params, databaseName, schemas, result, connectionContext);
if (each instanceof OptionalSQLTokenGenerator) {
SQLToken sqlToken = ((OptionalSQLTokenGenerator) each).generateSQLToken(sqlStatementContext);
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGeneratorsTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGeneratorsTest.java
index f9c24873056..78adb460f99 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGeneratorsTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGeneratorsTest.java
@@ -96,6 +96,6 @@ class SQLTokenGeneratorsTest {
@SuppressWarnings("unchecked")
private Map<Class<?>, SQLTokenGenerator> getSQLTokenGeneratorsMap(final SQLTokenGenerators sqlTokenGenerators) throws ReflectiveOperationException {
- return (Map<Class<?>, SQLTokenGenerator>) Plugins.getMemberAccessor().get(sqlTokenGenerators.getClass().getDeclaredField("sqlTokenGenerators"), sqlTokenGenerators);
+ return (Map<Class<?>, SQLTokenGenerator>) Plugins.getMemberAccessor().get(sqlTokenGenerators.getClass().getDeclaredField("generators"), sqlTokenGenerators);
}
}
diff --git a/src/resources/pmd.xml b/src/resources/pmd.xml
index ccf92f81a30..dec4ec8b482 100644
--- a/src/resources/pmd.xml
+++ b/src/resources/pmd.xml
@@ -111,4 +111,10 @@
<property name="allowWhile" value="true" />
</properties>
</rule>
+ <rule ref="category/java/errorprone.xml/AvoidCallingFinalize" />
+ <rule ref="category/java/errorprone.xml/AvoidCatchingNPE" />
+ <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName" />
+ <rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation" />
+ <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod" />
+ <rule ref="category/java/errorprone.xml/DetachedTestCase" />
</ruleset>