(shardingsphere) branch master updated: Fix sonar issues (#30238)

[sunnianjun]

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 73fd2adea92 Fix sonar issues (#30238)
73fd2adea92 is described below

commit 73fd2adea92d503c78acb3281da70c773f09a830
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 22 16:38:49 2024 +0800

    Fix sonar issues (#30238)
---
 .../bind/protocol/PostgreSQLUUIDBinaryProtocolValueTest.java   | 10 +++++-----
 .../readwritesplitting/rule/ReadwriteSplittingRule.java        |  2 +-
 .../readwritesplitting/rule/ReadwriteSplittingRuleTest.java    |  7 ++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUUIDBinaryProtocolValueTest.java
 
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUUIDBinaryProtocolValueTest.java
index d905f0912db..5955a26c48b 100644
--- 
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUUIDBinaryProtocolValueTest.java
+++ 
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUUIDBinaryProtocolValueTest.java
@@ -50,15 +50,15 @@ class PostgreSQLUUIDBinaryProtocolValueTest {
     
     @Test
     void assertWrite() {
-        UUID randomUUID = UUID.randomUUID();
+        UUID uuid = UUID.fromString("00000000-000-0000-0000-000000000001");
         byte[] expected = new byte[16];
         ByteBuffer buffer = ByteBuffer.wrap(expected);
-        buffer.putLong(randomUUID.getMostSignificantBits());
-        buffer.putLong(randomUUID.getLeastSignificantBits());
+        buffer.putLong(uuid.getMostSignificantBits());
+        buffer.putLong(uuid.getLeastSignificantBits());
         ByteBuf byteBuf = Unpooled.wrappedBuffer(expected);
         PostgreSQLPacketPayload payload = new 
PostgreSQLPacketPayload(byteBuf.writerIndex(0), StandardCharsets.UTF_8);
         PostgreSQLUUIDBinaryProtocolValue actual = new 
PostgreSQLUUIDBinaryProtocolValue();
-        actual.write(payload, randomUUID);
-        assertThat(actual.read(payload, 16), is(randomUUID));
+        actual.write(payload, uuid);
+        assertThat(actual.read(payload, 16), is(uuid));
     }
 }
diff --git 
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
 
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index e0d15d498a6..75d8d0d820f 100644
--- 
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++ 
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -70,8 +70,8 @@ public final class ReadwriteSplittingRule implements 
DatabaseRule, DataSourceCon
     
     public ReadwriteSplittingRule(final String databaseName, final 
ReadwriteSplittingRuleConfiguration ruleConfig, final InstanceContext 
instanceContext) {
         this.databaseName = databaseName;
-        this.instanceContext = instanceContext;
         configuration = ruleConfig;
+        this.instanceContext = instanceContext;
         loadBalancers = createLoadBalancers(ruleConfig);
         dataSourceRules = createDataSourceRules(ruleConfig);
     }
diff --git 
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
 
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
index a1e62cb6c93..33a3e5716e3 100644
--- 
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
+++ 
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
@@ -110,11 +110,8 @@ class ReadwriteSplittingRuleTest {
                 "<GROOVY>${['write']}_ds",
                 Arrays.asList("<GROOVY>read_ds_${['0']}", "read_ds_${['1']}", 
"read_ds_2", "<LITERAL>read_ds_3"),
                 "random");
-        ReadwriteSplittingRule readwriteSplittingRule = new 
ReadwriteSplittingRule(
-                "logic_db",
-                new ReadwriteSplittingRuleConfiguration(
-                        Collections.singleton(config), 
Collections.singletonMap("random", new AlgorithmConfiguration("RANDOM", new 
Properties()))),
-                mock(InstanceContext.class));
+        ReadwriteSplittingRule readwriteSplittingRule = new 
ReadwriteSplittingRule("logic_db", new ReadwriteSplittingRuleConfiguration(
+                Collections.singleton(config), 
Collections.singletonMap("random", new AlgorithmConfiguration("RANDOM", new 
Properties()))), mock(InstanceContext.class));
         Optional<ReadwriteSplittingDataSourceRule> actual = 
readwriteSplittingRule.findDataSourceRule("readwrite_ds");
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("readwrite_ds"));