This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 456e118dc78 Fix sonar issues (#25815)
456e118dc78 is described below
commit 456e118dc78b021a1489730ec13425e434d39bfc
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 21 12:06:01 2023 +0800
Fix sonar issues (#25815)
* Fix sonar issue on YamlPointcutConfigurationSwapper
* Fix sonar issue on CommandExecuteEngine
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issue on Remove usage of generic wildcard type.
* Fix sonar issues
---
.../repository/cluster/nacos/listener/NamingEventListener.java | 8 ++++----
.../parser/internal/asserts/segment/distsql/PropertiesAssert.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
index 855f398ab51..c31ed187236 100644
---
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
+++
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
@@ -26,10 +26,10 @@ import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
import
org.apache.shardingsphere.mode.repository.cluster.nacos.util.NacosMetaDataUtils;
+import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -49,8 +49,8 @@ public final class NamingEventListener implements
EventListener {
return;
}
NamingEvent namingEvent = (NamingEvent) event;
- List<Instance> instances =
namingEvent.getInstances().stream().sorted(Comparator.comparing(NacosMetaDataUtils::getKey)).collect(Collectors.toList());
- List<WatchData> watchDataList = new LinkedList<>();
+ Collection<Instance> instances =
namingEvent.getInstances().stream().sorted(Comparator.comparing(NacosMetaDataUtils::getKey)).collect(Collectors.toList());
+ Collection<WatchData> watchDataList = new LinkedList<>();
synchronized (this) {
instances.forEach(instance ->
prefixListenerMap.forEach((prefixPath, listener) -> {
String key = NacosMetaDataUtils.getKey(instance);
@@ -108,7 +108,7 @@ public final class NamingEventListener implements
EventListener {
*
* @param instances instances
*/
- public void setPreInstances(final List<Instance> instances) {
+ public void setPreInstances(final Collection<Instance> instances) {
preInstances = instances.stream().filter(instance -> {
for (String each : prefixListenerMap.keySet()) {
if (NacosMetaDataUtils.getKey(instance).startsWith(each)) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/PropertiesAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/PropertiesAssert.java
index 183379a482f..8e57e98c02e 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/PropertiesAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/PropertiesAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedProperty;
-import java.util.List;
+import java.util.Collection;
import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -41,7 +41,7 @@ public final class PropertiesAssert {
* @param actual actual properties
* @param expected expected properties test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext,
final Properties actual, final List<ExpectedProperty> expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final Properties actual, final Collection<ExpectedProperty> expected) {
if (expected.isEmpty()) {
assertTrue(actual.isEmpty(), assertContext.getText("Actual
properties should not exist."));
} else {
