This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 340f20a754e Fix sonar issues on Use concise character class syntax
'\\d' instead of '[0-9]' (#25727)
340f20a754e is described below
commit 340f20a754e85cec54218960621014b0839e3ff9
Author: Liang Zhang <[email protected]>
AuthorDate: Wed May 17 15:27:58 2023 +0800
Fix sonar issues on Use concise character class syntax '\\d' instead of
'[0-9]' (#25727)
* Fix sonar issues on Replace this lambda with method reference
* Fix sonar issues on Use concise character class syntax '\\d' instead of
'[0-9]'
* Fix sonar issues on ShardingRenameTableStatementValidatorTest
---
.../validator/ddl/ShardingRenameTableStatementValidatorTest.java | 3 +--
.../infra/database/metadata/dialect/H2DataSourceMetaData.java | 2 +-
.../infra/database/metadata/dialect/OracleDataSourceMetaData.java | 2 +-
.../infra/database/metadata/dialect/SQLServerDataSourceMetaData.java | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
index 1b86223ad67..a6c588abce5 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
@@ -46,7 +46,6 @@ import java.util.Collections;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -69,7 +68,7 @@ class ShardingRenameTableStatementValidatorTest {
void assertPreValidateBroadcastTable() {
SQLStatementContext sqlStatementContext =
createRenameTableStatementContext("t_order", "t_user_order");
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
- when(shardingRule.isBroadcastTable(eq("t_order"))).thenReturn(true);
+ when(shardingRule.isBroadcastTable("t_order")).thenReturn(true);
assertThrows(UnsupportedShardingOperationException.class,
() -> new
ShardingRenameTableStatementValidator().preValidate(shardingRule,
sqlStatementContext, Collections.emptyList(), database,
mock(ConfigurationProperties.class)));
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
index 5e2dd8c7c21..42a9c036101 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
@@ -45,7 +45,7 @@ public final class H2DataSourceMetaData implements
DataSourceMetaData {
private static final String MODEL_FILE = "file:";
private static final Pattern PATTERN =
Pattern.compile("jdbc:h2:((?<modelMem>mem|~)[:/](?<catalog>[\\w\\-]+)|"
- +
"(?<modelSslOrTcp>ssl:|tcp:)(//)?(?<hostname>[\\w\\-.]+)(:(?<port>[0-9]{1,4})/)?[/~\\w\\-.]+/(?<name>[\\-\\w]*)|"
+ +
"(?<modelSslOrTcp>ssl:|tcp:)(//)?(?<hostname>[\\w\\-.]+)(:(?<port>\\d{1,4})/)?[/~\\w\\-.]+/(?<name>[\\-\\w]*)|"
+ "(?<modelFile>file:)[/~\\w\\-]+/(?<fileName>[\\-\\w]*));?\\S*",
Pattern.CASE_INSENSITIVE);
private final String hostname;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
index 1d4195e0e39..755226857ad 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
@@ -47,7 +47,7 @@ public final class OracleDataSourceMetaData implements
DataSourceMetaData {
private final String schema;
- private final Pattern thinUrlPattern =
Pattern.compile("jdbc:oracle:(thin|oci|kprb):@(//)?([\\w\\-\\.]+):?([0-9]*)[:/]([\\w\\-]+)",
Pattern.CASE_INSENSITIVE);
+ private final Pattern thinUrlPattern =
Pattern.compile("jdbc:oracle:(thin|oci|kprb):@(//)?([\\w\\-\\.]+):?(\\d*)[:/]([\\w\\-]+)",
Pattern.CASE_INSENSITIVE);
private final Pattern connectDescriptorUrlPattern =
Pattern.compile("jdbc:oracle:(thin|oci|kprb):@[(\\w\\s=)]+HOST\\s*=\\s*([\\w\\-\\.]+).*PORT\\s*=\\s*(\\d+).*SERVICE_NAME\\s*=\\s*(\\w+)\\)");
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
index bd870491d50..972072dd245 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
@@ -42,7 +42,7 @@ public final class SQLServerDataSourceMetaData implements
DataSourceMetaData {
private final String schema;
- private final Pattern pattern =
Pattern.compile("jdbc:(microsoft:)?sqlserver://([\\w\\-\\.]+):?([0-9]*);\\S*(DatabaseName|database)=([\\w\\-\\.]+);?",
Pattern.CASE_INSENSITIVE);
+ private final Pattern pattern =
Pattern.compile("jdbc:(microsoft:)?sqlserver://([\\w\\-\\.]+):?(\\d*);\\S*(DatabaseName|database)=([\\w\\-\\.]+);?",
Pattern.CASE_INSENSITIVE);
public SQLServerDataSourceMetaData(final String url) {
Matcher matcher = pattern.matcher(url);
