[shardingsphere] branch master updated: Fix sonar issue of 0 is a valid index, but is ignored by this check. (#25694)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 312a3582e12 Fix sonar issue of 0 is a valid index, but is ignored by this check. (#25694)
312a3582e12 is described below

commit 312a3582e12aa4ce379e7cadc597f2c7a12d0e04
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue May 16 15:34:25 2023 +0800

    Fix sonar issue of 0 is a valid index, but is ignored by this check. (#25694)
---
 .../authority/provider/database/builder/DatabasePrivilegeBuilder.java | 2 +-
 .../postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
index 61494092456..b0edac23873 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
@@ -61,7 +61,7 @@ public final class DatabasePrivilegeBuilder {
      */
     private static void checkDatabases(final String mappingProp) {
         Preconditions.checkArgument(!"".equals(mappingProp), "user-database-mappings configuration `%s` can not be null", mappingProp);
-        Arrays.stream(mappingProp.split(",")).forEach(each -> Preconditions.checkArgument(0 < each.indexOf("@") && 0 < each.indexOf("="),
+        Arrays.stream(mappingProp.split(",")).forEach(each -> Preconditions.checkArgument(each.contains("@") && each.contains("="),
                 "user-database-mappings configuration `%s` is invalid, the configuration format should be like `username@hostname=database`", each));
     }
     
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
index eb502d06aae..921682d057c 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
@@ -253,10 +253,10 @@ public final class PostgreSQLColumnPropertiesAppender extends AbstractPostgreSQL
     }
     
     private String checkSchemaInName(final String typname, final String schema) {
-        if (typname.indexOf(schema + "\".") > 0) {
+        if (typname.contains(schema + "\".")) {
             return typname.substring(schema.length() + 3);
         }
-        if (typname.indexOf(schema + ".") > 0) {
+        if (typname.contains(schema + ".")) {
             return typname.substring(schema.length() + 1);
         }
         return typname;