This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7175011b756 Fix sonar issues (#37527)
7175011b756 is described below
commit 7175011b7569012275a62ab75499e11b7b6e594e
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Dec 26 11:12:27 2025 +0800
Fix sonar issues (#37527)
* Fix sonar issues
* Fix sonar issues
---
.../YamlAdvisorConfigurationSwapperTest.java | 1 +
.../YamlPointcutConfigurationSwapperTest.java | 1 +
.../FirebirdBinaryProtocolValueFactory.java | 6 ++--
.../dml/from/type/SimpleTableSegmentBinder.java | 34 +++++++++++-----------
.../impl/driver/jdbc/type/util/ResultSetUtils.java | 4 +--
.../infra/rewrite/SQLRewriteEntry.java | 4 +--
6 files changed, 26 insertions(+), 24 deletions(-)
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapperTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapperTest.java
index 99f7003bfb3..6076e8f7c8f 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapperTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapperTest.java
@@ -51,6 +51,7 @@ class YamlAdvisorConfigurationSwapperTest {
assertThat(advisorConfig.getPluginType(), is("PLUGIN"));
}
+ @SuppressWarnings("unused")
private String call(final String input) {
return input;
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapperTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapperTest.java
index c5b991fdd68..6d60934d999 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapperTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapperTest.java
@@ -87,6 +87,7 @@ class YamlPointcutConfigurationSwapperTest {
private static final class MethodFixture {
+ @SuppressWarnings("unused")
private void execute() {
}
}
diff --git
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/execute/protocol/FirebirdBinaryProtocolValueFactory.java
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/execute/protocol/FirebirdBinaryProtocolValueFactory.java
index 139187692c2..f6dd83a4b49 100644
---
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/execute/protocol/FirebirdBinaryProtocolValueFactory.java
+++
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/execute/protocol/FirebirdBinaryProtocolValueFactory.java
@@ -62,9 +62,9 @@ public final class FirebirdBinaryProtocolValueFactory {
}
// TODO Uncomment when a specific handler is required; currently BLOB is
handled by StringBinaryProtocolValue
- // private static void setByteBinaryProtocolValue() {
- // FirebirdByteBinaryProtocolValue binaryProtocolValue = new
FirebirdByteBinaryProtocolValue();
- // }
+ private static void setByteBinaryProtocolValue() {
+ new FirebirdByteBinaryProtocolValue();
+ }
private static void setInt16BinaryProtocolValue() {
FirebirdInt16BinaryProtocolValue binaryProtocolValue = new
FirebirdInt16BinaryProtocolValue();
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/SimpleTableSegmentBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/SimpleTableSegmentBinder.java
index 0709ee965fb..ad0c1a70958 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/SimpleTableSegmentBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/SimpleTableSegmentBinder.java
@@ -91,10 +91,10 @@ public final class SimpleTableSegmentBinder {
Optional<IdentifierValue> schemaName = getSchemaName(segment,
binderContext, databaseName);
IdentifierValue tableName = segment.getTableName().getIdentifier();
Optional<ShardingSphereSchema> schema = schemaName.map(identifierValue
->
binderContext.getMetaData().getDatabase(databaseName.getValue()).getSchema(identifierValue.getValue()));
- checkTableExists(binderContext, schema, tableName.getValue());
+ checkTableExists(binderContext, schema.orElse(null),
tableName.getValue());
checkTableMetadata(binderContext, schema.orElse(null),
schemaName.map(IdentifierValue::getValue).orElse(null), tableName.getValue());
tableBinderContexts.put(new
CaseInsensitiveString(segment.getAliasName().orElseGet(tableName::getValue)),
- createSimpleTableBinderContext(segment, schema, databaseName,
schemaName, binderContext));
+ createSimpleTableBinderContext(segment, schema.orElse(null),
databaseName, schemaName.orElse(null), binderContext));
TableNameSegment tableNameSegment = new
TableNameSegment(segment.getTableName().getStartIndex(),
segment.getTableName().getStopIndex(), tableName);
tableNameSegment.setTableBoundInfo(new
TableSegmentBoundInfo(databaseName, schemaName.orElse(null)));
SimpleTableSegment result = new SimpleTableSegment(tableNameSegment);
@@ -133,49 +133,49 @@ public final class SimpleTableSegmentBinder {
return Optional.of(new
IdentifierValue(databaseTypeRegistry.getDefaultSchemaName(binderContext.getCurrentDatabaseName())));
}
- private static void checkTableExists(final SQLStatementBinderContext
binderContext, final Optional<ShardingSphereSchema> schema, final String
tableName) {
+ private static void checkTableExists(final SQLStatementBinderContext
binderContext, final ShardingSphereSchema schema, final String tableName) {
// TODO refactor table exists check with spi @duanzhengqiang
if (binderContext.getSqlStatement() instanceof CreateTableStatement &&
isCreateTable(((CreateTableStatement)
binderContext.getSqlStatement()).getTable(), tableName)) {
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
- || ((CreateTableStatement)
binderContext.getSqlStatement()).isIfNotExists() || !schema.isPresent() ||
!schema.get().containsTable(tableName),
+ || ((CreateTableStatement)
binderContext.getSqlStatement()).isIfNotExists() || null == schema ||
!schema.containsTable(tableName),
() -> new TableExistsException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof AlterTableStatement &&
isRenameTable((AlterTableStatement) binderContext.getSqlStatement(),
tableName)) {
-
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| !schema.isPresent() || !schema.get().containsTable(tableName),
+
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| null == schema || !schema.containsTable(tableName),
() -> new TableExistsException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof DropTableStatement) {
- ShardingSpherePreconditions.checkState(((DropTableStatement)
binderContext.getSqlStatement()).isIfExists() || schema.isPresent() &&
schema.get().containsTable(tableName),
+ ShardingSpherePreconditions.checkState(((DropTableStatement)
binderContext.getSqlStatement()).isIfExists() || null != schema &&
schema.containsTable(tableName),
() -> new TableNotFoundException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof RenameTableStatement &&
isRenameTable((RenameTableStatement) binderContext.getSqlStatement(),
tableName)) {
-
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| !schema.isPresent() || !schema.get().containsTable(tableName),
+
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| null == schema || !schema.containsTable(tableName),
() -> new TableExistsException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof CreateViewStatement &&
isCreateTable(((CreateViewStatement)
binderContext.getSqlStatement()).getView(), tableName)) {
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
- || ((CreateViewStatement)
binderContext.getSqlStatement()).isReplaceView() || !schema.isPresent() ||
!schema.get().containsTable(tableName),
+ || ((CreateViewStatement)
binderContext.getSqlStatement()).isReplaceView() || null == schema ||
!schema.containsTable(tableName),
() -> new TableExistsException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof AlterViewStatement &&
isRenameView((AlterViewStatement) binderContext.getSqlStatement(), tableName)) {
-
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| !schema.isPresent() || !schema.get().containsTable(tableName),
+
ShardingSpherePreconditions.checkState(binderContext.getHintValueContext().isSkipMetadataValidate()
|| null == schema || !schema.containsTable(tableName),
() -> new TableExistsException(tableName));
return;
}
if (binderContext.getSqlStatement() instanceof DropViewStatement) {
- ShardingSpherePreconditions.checkState(((DropViewStatement)
binderContext.getSqlStatement()).isIfExists() || schema.isPresent() &&
schema.get().containsTable(tableName),
+ ShardingSpherePreconditions.checkState(((DropViewStatement)
binderContext.getSqlStatement()).isIfExists() || null != schema &&
schema.containsTable(tableName),
() -> new TableNotFoundException(tableName));
return;
}
if ("DUAL".equalsIgnoreCase(tableName)) {
return;
}
- if (schema.isPresent() &&
SystemSchemaManager.isSystemTable(schema.get().getName(), tableName)) {
+ if (null != schema &&
SystemSchemaManager.isSystemTable(schema.getName(), tableName)) {
return;
}
if (binderContext.getExternalTableBinderContexts().containsKey(new
CaseInsensitiveString(tableName))) {
@@ -184,7 +184,7 @@ public final class SimpleTableSegmentBinder {
if
(binderContext.getCommonTableExpressionsSegmentsUniqueAliases().contains(tableName))
{
return;
}
- ShardingSpherePreconditions.checkState(schema.isPresent() &&
schema.get().containsTable(tableName), () -> new
TableNotFoundException(tableName));
+ ShardingSpherePreconditions.checkState(null != schema &&
schema.containsTable(tableName), () -> new TableNotFoundException(tableName));
}
private static boolean isCreateTable(final SimpleTableSegment
simpleTableSegment, final String tableName) {
@@ -236,14 +236,14 @@ public final class SimpleTableSegmentBinder {
}
}
- private static SimpleTableSegmentBinderContext
createSimpleTableBinderContext(final SimpleTableSegment segment, final
Optional<ShardingSphereSchema> schema, final IdentifierValue databaseName,
-
final Optional<IdentifierValue> schemaName, final SQLStatementBinderContext
binderContext) {
+ private static SimpleTableSegmentBinderContext
createSimpleTableBinderContext(final SimpleTableSegment segment, final
ShardingSphereSchema schema, final IdentifierValue databaseName,
+
final IdentifierValue schemaName, final SQLStatementBinderContext
binderContext) {
IdentifierValue tableName = segment.getTableName().getIdentifier();
- if (schema.isPresent() &&
schema.get().containsTable(tableName.getValue())) {
- return createSimpleTableSegmentBinderContextWithMetaData(segment,
schema.get(), databaseName, schemaName.get(), binderContext, tableName);
+ if (null != schema && schema.containsTable(tableName.getValue())) {
+ return createSimpleTableSegmentBinderContextWithMetaData(segment,
schema, databaseName, schemaName, binderContext, tableName);
}
if (binderContext.getSqlStatement() instanceof CreateTableStatement) {
- Collection<ProjectionSegment> projectionSegments =
createProjectionSegments((CreateTableStatement)
binderContext.getSqlStatement(), databaseName, schemaName.orElse(null),
tableName);
+ Collection<ProjectionSegment> projectionSegments =
createProjectionSegments((CreateTableStatement)
binderContext.getSqlStatement(), databaseName, schemaName, tableName);
return new SimpleTableSegmentBinderContext(projectionSegments,
TableSourceType.PHYSICAL_TABLE);
}
CaseInsensitiveString caseInsensitiveTableName = new
CaseInsensitiveString(tableName.getValue());
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
index 908599bd110..771e4669666 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
@@ -121,8 +121,8 @@ public final class ResultSetUtils {
if (java.sql.Date.class.equals(convertType)) {
return
Optional.of(java.sql.Date.valueOf(LocalDate.from(LOOSE_DATE_TIME_FORMATTER.parse(value))));
}
- if (java.sql.Time.class.equals(convertType)) {
- return
Optional.of(java.sql.Time.valueOf(LocalTime.from(LOOSE_DATE_TIME_FORMATTER.parse(value))));
+ if (Time.class.equals(convertType)) {
+ return
Optional.of(Time.valueOf(LocalTime.from(LOOSE_DATE_TIME_FORMATTER.parse(value))));
}
return Optional.empty();
}
diff --git
a/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
index 650a147e64d..45cf2d7159a 100644
---
a/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
+++
b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
@@ -81,13 +81,13 @@ public final class SQLRewriteEntry {
return result;
}
result.addSQLTokenGenerators(new
DefaultTokenGeneratorBuilder(queryContext.getSqlStatementContext()).getSQLTokenGenerators());
- decorate(result, routeContext, hintValueContext);
+ decorate(result, routeContext);
result.generateSQLTokens();
return result;
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private void decorate(final SQLRewriteContext sqlRewriteContext, final
RouteContext routeContext, final HintValueContext hintValueContext) {
+ private void decorate(final SQLRewriteContext sqlRewriteContext, final
RouteContext routeContext) {
for (Entry<ShardingSphereRule, SQLRewriteContextDecorator> entry :
decorators.entrySet()) {
entry.getValue().decorate(entry.getKey(), props,
sqlRewriteContext, routeContext);
}
