This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 0855189474b Fix sonar issues (#29716)
0855189474b is described below
commit 0855189474b7fb5ae34fbd2fa034b4c3b15a0f47
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 13 23:13:14 2024 +0800
Fix sonar issues (#29716)
---
.../generator/impl/ConditionValueCompareOperatorGenerator.java | 2 +-
.../infra/expr/interval/IntervalInlineExpressionParser.java | 7 +------
.../data/pipeline/cdc/generator/CDCResponseUtilsTest.java | 10 +++++-----
.../visitor/statement/type/OracleDDLStatementVisitor.java | 2 +-
.../sqlserver/visitor/statement/SQLServerStatementVisitor.java | 2 +-
.../asserts/segment/statistics/SampleOptionAssert.java | 3 +++
.../asserts/segment/statistics/StatisticsOptionAssert.java | 3 +++
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
index 0a0bdc01730..e645e9d1045 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
@@ -65,10 +65,10 @@ public final class ConditionValueCompareOperatorGenerator
implements ConditionVa
}
ExpressionSegment valueExpression = predicate.getLeft() instanceof
ColumnSegment ? predicate.getRight() : predicate.getLeft();
ConditionValue conditionValue = new ConditionValue(valueExpression,
params);
- Optional<Comparable<?>> value = conditionValue.getValue();
if (conditionValue.isNull()) {
return generate(null, column, operator,
conditionValue.getParameterMarkerIndex().orElse(-1));
}
+ Optional<Comparable<?>> value = conditionValue.getValue();
if (value.isPresent()) {
return generate(value.get(), column, operator,
conditionValue.getParameterMarkerIndex().orElse(-1));
}
diff --git
a/infra/expr/type/interval/src/main/java/org/apache/shardingsphere/infra/expr/interval/IntervalInlineExpressionParser.java
b/infra/expr/type/interval/src/main/java/org/apache/shardingsphere/infra/expr/interval/IntervalInlineExpressionParser.java
index 70db4398ec4..673abfa318a 100644
---
a/infra/expr/type/interval/src/main/java/org/apache/shardingsphere/infra/expr/interval/IntervalInlineExpressionParser.java
+++
b/infra/expr/type/interval/src/main/java/org/apache/shardingsphere/infra/expr/interval/IntervalInlineExpressionParser.java
@@ -30,7 +30,6 @@ import java.time.YearMonth;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.time.temporal.Temporal;
@@ -139,11 +138,7 @@ public class IntervalInlineExpressionParser implements
InlineExpressionParser {
}
private TemporalAccessor getDateTime(final String dateTimeValue) {
- try {
- return dateTimeFormatterForSuffixPattern.parse(dateTimeValue);
- } catch (final DateTimeParseException dateTimeParseException) {
- throw new RuntimeException(dateTimeParseException);
- }
+ return dateTimeFormatterForSuffixPattern.parse(dateTimeValue);
}
private DateTimeFormatter getSuffixPattern(final Map<String, String>
props) {
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/generator/CDCResponseUtilsTest.java
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/generator/CDCResponseUtilsTest.java
index e4c921862f7..dbe920e66c0 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/generator/CDCResponseUtilsTest.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/generator/CDCResponseUtilsTest.java
@@ -32,14 +32,14 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
class CDCResponseUtilsTest {
@Test
- public void assertSucceedWhenResponseNotSet() {
+ void assertSucceedWhenResponseNotSet() {
CDCResponse actualResponse = CDCResponseUtils.succeed("request_id_1");
assertThat(actualResponse.getStatus(), is(CDCResponse.Status.SUCCEED));
assertThat(actualResponse.getRequestId(), is("request_id_1"));
}
@Test
- public void assertSucceedWhenResponseCaseServerGreetingResult() {
+ void assertSucceedWhenResponseCaseServerGreetingResult() {
Message msg = ServerGreetingResult.newBuilder().build();
CDCResponse actualResponse = CDCResponseUtils.succeed("request_id_1",
CDCResponse.ResponseCase.SERVER_GREETING_RESULT, msg);
assertThat(actualResponse.getStatus(), is(CDCResponse.Status.SUCCEED));
@@ -48,7 +48,7 @@ class CDCResponseUtilsTest {
}
@Test
- public void assertSucceedWhenResponseCaseDataRecordResult() {
+ void assertSucceedWhenResponseCaseDataRecordResult() {
Message msg = DataRecordResult.newBuilder().build();
CDCResponse actualResponse = CDCResponseUtils.succeed("request_id_1",
CDCResponse.ResponseCase.DATA_RECORD_RESULT, msg);
assertThat(actualResponse.getStatus(), is(CDCResponse.Status.SUCCEED));
@@ -57,7 +57,7 @@ class CDCResponseUtilsTest {
}
@Test
- public void assertSucceedWhenResponseCaseStreamDataResult() {
+ void assertSucceedWhenResponseCaseStreamDataResult() {
Message msg = StreamDataResult.newBuilder().build();
CDCResponse actualResponse = CDCResponseUtils.succeed("request_id_1",
CDCResponse.ResponseCase.STREAM_DATA_RESULT, msg);
assertThat(actualResponse.getStatus(), is(CDCResponse.Status.SUCCEED));
@@ -66,7 +66,7 @@ class CDCResponseUtilsTest {
}
@Test
- public void assertFailed() {
+ void assertFailed() {
CDCResponse actualResponse = CDCResponseUtils.failed("request_id_1",
XOpenSQLState.GENERAL_ERROR.getValue(), "Error");
assertThat(actualResponse.getStatus(), is(CDCResponse.Status.FAILED));
assertThat(actualResponse.getRequestId(), is("request_id_1"));
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
index 2577d9b45ed..00863f408ad 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -1406,10 +1406,10 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
@Override
public ASTNode visitCollectionVariableDecl(final
CollectionVariableDeclContext ctx) {
- CollectionValue<VariableSegment> result = new CollectionValue<>();
if (null == ctx.variableName()) {
return super.visitCollectionVariableDecl(ctx);
}
+ CollectionValue<VariableSegment> result = new CollectionValue<>();
for (VariableNameContext each : ctx.variableName()) {
getVariableSegment(each).ifPresent(optional ->
result.getValue().add(optional));
}
diff --git
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
index b6aaf68e83e..9a4e1cba7d2 100644
---
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
+++
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
@@ -1426,7 +1426,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
if (null != ctx.tableName()) {
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
}
- if (null != ctx.indexName() && ctx.indexName().size() > 0) {
+ if (null != ctx.indexName() && !ctx.indexName().isEmpty()) {
List<IndexSegment> indexSegments = new LinkedList<>();
for (IndexNameContext indexNameContext : ctx.indexName()) {
indexSegments.add((IndexSegment) visit(indexNameContext));
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/SampleOptionAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/SampleOptionAssert.java
index 089ff32d4b3..531f9999ed1 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/SampleOptionAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/SampleOptionAssert.java
@@ -17,6 +17,8 @@
package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.statistics;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.segment.SampleOptionSegment;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQLSegmentAssert;
@@ -30,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Sample option assert.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SampleOptionAssert {
/**
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/StatisticsOptionAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/StatisticsOptionAssert.java
index c8a3f098ceb..7f5ace7c5cc 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/StatisticsOptionAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/statistics/StatisticsOptionAssert.java
@@ -17,6 +17,8 @@
package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.statistics;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.segment.StatisticsOptionSegment;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQLSegmentAssert;
@@ -30,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Statistics option assert.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class StatisticsOptionAssert {
/**
