This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 e8084f2cecf Fix sonar issues (#30687)
e8084f2cecf is described below
commit e8084f2cecf68255f23577bbdd9d2e6938a9355f
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Mar 29 11:52:00 2024 +0800
Fix sonar issues (#30687)
* Fix sonar issue
* Fix sonar issue
---
.../update/DropDefaultShardingStrategyExecutorTest.java | 4 ++--
.../metadata/database/schema/manager/SystemSchemaManager.java | 7 +++----
.../persist/node/metadata/DatabaseRuleMetaDataNode.java | 4 ++++
.../proxy/backend/config/ProxyConfigurationLoader.java | 10 ++++++++++
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
index 991c3b48671..044d1e5c07f 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java
@@ -69,7 +69,7 @@ class DropDefaultShardingStrategyExecutorTest {
}
@Test
- void asserBuildToBeDroppedRuleConfiguration() {
+ void assertBuildToBeDroppedRuleConfiguration() {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
executor.setRule(rule);
@@ -79,7 +79,7 @@ class DropDefaultShardingStrategyExecutorTest {
}
@Test
- void asserBuildToBeDroppedRuleConfigurationWithInUsedAlgorithm() {
+ void assertBuildToBeDroppedRuleConfigurationWithInUsedAlgorithm() {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
executor.setRule(rule);
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
index 04a36c9741f..2020706bd31 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.manager;
import com.cedarsoftware.util.CaseInsensitiveMap;
import com.cedarsoftware.util.CaseInsensitiveSet;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import
org.apache.shardingsphere.infra.util.directory.ClasspathResourceDirectoryReader;
@@ -38,8 +38,7 @@ import java.util.stream.Stream;
/**
* System schema manager.
*/
-@RequiredArgsConstructor
-@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SystemSchemaManager {
private static final Map<String, Map<String, Collection<String>>>
DATABASE_TYPE_SCHEMA_TABLE_MAP;
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNode.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNode.java
index 2d6f273ba3f..87912a04965 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNode.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNode.java
@@ -17,9 +17,13 @@
package org.apache.shardingsphere.metadata.persist.node.metadata;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
/**
* Database rule meta data node.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseRuleMetaDataNode {
private static final String ROOT_NODE = "metadata";
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
index 49a919235a5..be77581eec9 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
@@ -56,10 +56,20 @@ public final class ProxyConfigurationLoader {
private static final Pattern DATABASE_CONFIG_FILE_PATTERN =
Pattern.compile("database-.+\\.yaml");
// TODO remove COMPATIBLE_GLOBAL_CONFIG_FILE in next major version
+ /**
+ * to be removed.
+ *
+ * @deprecated to be removed
+ */
@Deprecated
private static final String COMPATIBLE_GLOBAL_CONFIG_FILE = "server.yaml";
// TODO remove COMPATIBLE_DATABASE_CONFIG_FILE_PATTERN in next major
version
+ /**
+ * to be removed.
+ *
+ * @deprecated to be removed
+ */
@Deprecated
private static final Pattern COMPATIBLE_DATABASE_CONFIG_FILE_PATTERN =
Pattern.compile("config-.+\\.yaml");