This is an automated email from the ASF dual-hosted git repository.
panjuan 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 448067f6568 Optimize code style. (#25284)
448067f6568 is described below
commit 448067f6568bcfbd9f3a494bc1538405ab2ad137
Author: Raigor <[email protected]>
AuthorDate: Sun Apr 23 11:25:36 2023 +0800
Optimize code style. (#25284)
---
.../encrypt/distsql/handler/query/CountEncryptRuleExecutor.java | 2 +-
.../mask/distsql/handler/query/CountMaskRuleExecutor.java | 2 +-
.../distsql/handler/query/CountReadwriteSplittingRuleExecutor.java | 2 +-
.../shadow/distsql/handler/query/CountShadowRuleExecutor.java | 2 +-
.../sharding/distsql/handler/query/CountShardingRuleExecutor.java | 2 +-
.../authority/provider/database/builder/DatabasePrivilegeBuilder.java | 2 +-
.../org/apache/shardingsphere/proxy/backend/util/RegularUtils.java | 4 ++--
.../apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
index 6d071a03385..8ee227dc05d 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
@@ -42,7 +42,7 @@ public final class CountEncryptRuleExecutor implements
RQLExecutor<CountEncryptR
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountEncryptRuleStatement sqlStatement) {
Optional<EncryptRule> rule =
database.getRuleMetaData().findSingleRule(EncryptRule.class);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, rule.get(),
database.getName()));
+ rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
return result;
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
index 64f6f8a2229..9ec044745d0 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
@@ -42,7 +42,7 @@ public final class CountMaskRuleExecutor implements
RQLExecutor<CountMaskRuleSta
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountMaskRuleStatement sqlStatement) {
Optional<MaskRule> rule =
database.getRuleMetaData().findSingleRule(MaskRule.class);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, rule.get(),
database.getName()));
+ rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
return result;
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
index 074f29c0557..331057244d1 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
@@ -42,7 +42,7 @@ public final class CountReadwriteSplittingRuleExecutor
implements RQLExecutor<Co
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountReadwriteSplittingRuleStatement
sqlStatement) {
Optional<ReadwriteSplittingRule> rule =
database.getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, rule.get(),
database.getName()));
+ rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
return result;
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
index cb961f689eb..a26b9264ad3 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
@@ -42,7 +42,7 @@ public final class CountShadowRuleExecutor implements
RQLExecutor<CountShadowRul
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountShadowRuleStatement sqlStatement) {
Optional<ShadowRule> rule =
database.getRuleMetaData().findSingleRule(ShadowRule.class);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, rule.get(),
database.getName()));
+ rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
return result;
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
index f59ceceb7ad..6fdefaba5f9 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
@@ -43,7 +43,7 @@ public final class CountShardingRuleExecutor implements
RQLExecutor<CountShardin
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountShardingRuleStatement sqlStatement)
{
Optional<ShardingRule> rule =
database.getRuleMetaData().findSingleRule(ShardingRule.class);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, rule.get(),
database.getName()));
+ rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
return result;
}
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 773d97d6f5f..5873f15ef96 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
@@ -98,7 +98,7 @@ public final class DatabasePrivilegeBuilder {
Set<String> result = new HashSet<>();
for (Entry<ShardingSphereUser, Collection<String>> entry :
userDatabaseMappings.entrySet()) {
boolean isAnyOtherHost =
checkAnyOtherHost(entry.getKey().getGrantee(), shardingSphereUser);
- if (isAnyOtherHost || shardingSphereUser == entry.getKey() ||
shardingSphereUser.equals(entry.getKey())) {
+ if (isAnyOtherHost || shardingSphereUser.equals(entry.getKey())) {
result.addAll(entry.getValue());
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/RegularUtils.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/RegularUtils.java
index 25802d9b3ff..db4de1987f0 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/RegularUtils.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/RegularUtils.java
@@ -30,11 +30,11 @@ import java.util.regex.Pattern;
public final class RegularUtils {
/**
- * Tells whether or not this input string matches the given regular
expression.
+ * Tells whether this input string matches the given regular expression.
*
* @param regex the regular expression to which the input string is to be
matched
* @param toBeMatched the string to be matched
- * @return whether or not the regular expression matches on the input
+ * @return whether the regular expression matches on the input
*/
public static boolean matchesCaseInsensitive(final String regex, final
String toBeMatched) {
Pattern p = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index 11e1b9e1c7e..5dc6dcd3d4e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -96,7 +96,7 @@ public final class DataSetEnvironmentManager {
try {
EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(fillDataTasks);
// CHECKSTYLE:OFF
- } catch (final Exception ex) {
+ } catch (final Exception ignored) {
// CHECKSTYLE:ON
}
}
@@ -144,7 +144,7 @@ public final class DataSetEnvironmentManager {
try {
EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(deleteTasks);
// CHECKSTYLE:OFF
- } catch (final Exception ex) {
+ } catch (final Exception ignored) {
// CHECKSTYLE:ON
}
}
