This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 89e9bd38620 Remove useless codes (#28011)
89e9bd38620 is described below
commit 89e9bd386209cac1b6a7344b370dd15c3b37d004
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Aug 10 14:51:37 2023 +0800
Remove useless codes (#28011)
* Remove useless SuppressWarnings on PacketCodec
* Remove useless codes
---
.../plugin/metrics/core/fixture/collector/MetricsCollectorFixture.java | 2 +-
.../java/org/apache/shardingsphere/db/protocol/codec/PacketCodec.java | 3 ---
.../sharding/route/engine/condition/ExpressionConditionUtils.java | 2 +-
.../proxy/backend/hbase/result/query/HBaseGetResultSet.java | 2 +-
.../shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/MetricsCollectorFixture.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/MetricsCollectorFixture.java
index aa8089e43b6..2b2761d7a2f 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/MetricsCollectorFixture.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/MetricsCollectorFixture.java
@@ -76,7 +76,7 @@ public final class MetricsCollectorFixture implements
CounterMetricsCollector, G
@Override
public String toString() {
- return labeledValues.isEmpty() ? value + "" : String.join(", ",
getLabeledContents());
+ return labeledValues.isEmpty() ? String.valueOf(value) :
String.join(", ", getLabeledContents());
}
private Collection<String> getLabeledContents() {
diff --git
a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/PacketCodec.java
b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/PacketCodec.java
index 95eb2f469d0..b69f31fe037 100644
---
a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/PacketCodec.java
+++
b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/PacketCodec.java
@@ -34,10 +34,8 @@ import java.util.List;
@Slf4j
public final class PacketCodec extends ByteToMessageCodec<DatabasePacket> {
- @SuppressWarnings("rawtypes")
private final DatabasePacketCodecEngine databasePacketCodecEngine;
- @SuppressWarnings("unchecked")
@Override
protected void decode(final ChannelHandlerContext context, final ByteBuf
in, final List<Object> out) {
int readableBytes = in.readableBytes();
@@ -50,7 +48,6 @@ public final class PacketCodec extends
ByteToMessageCodec<DatabasePacket> {
databasePacketCodecEngine.decode(context, in, out);
}
- @SuppressWarnings("unchecked")
@Override
protected void encode(final ChannelHandlerContext context, final
DatabasePacket message, final ByteBuf out) {
databasePacketCodecEngine.encode(context, message, out);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/ExpressionConditionUtils.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/ExpressionConditionUtils.java
index 781cad0526b..ce656794edb 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/ExpressionConditionUtils.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/ExpressionConditionUtils.java
@@ -34,6 +34,6 @@ public final class ExpressionConditionUtils {
* @return true or false
*/
public static boolean isNowExpression(final ExpressionSegment segment) {
- return segment instanceof ComplexExpressionSegment &&
"now()".equalsIgnoreCase(((ComplexExpressionSegment) segment).getText());
+ return segment instanceof ComplexExpressionSegment &&
"now()".equalsIgnoreCase(segment.getText());
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
index f518dd1f2d4..1d2caa033b2 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
@@ -181,7 +181,7 @@ public final class HBaseGetResultSet implements
HBaseQueryResultSet {
if (expressionSegment instanceof BetweenExpression) {
result.append(((BetweenExpression)
expressionSegment).getBetweenExpr());
} else if (expressionSegment instanceof BinaryOperationExpression) {
- result.append(((BinaryOperationExpression)
expressionSegment).getText());
+ result.append(expressionSegment.getText());
}
return result.toString();
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
index c34414d9057..864a5b566c0 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
@@ -135,7 +135,7 @@ public final class E2ETestEnvironment {
private boolean waitForJdbcEnvironmentReady() {
log.info("Jdbc project with agent environment initializing ...");
try {
- Awaitility.await().atMost(2L, TimeUnit.MINUTES).pollInterval(5L,
TimeUnit.SECONDS).until(() -> isJdbcReady());
+ Awaitility.await().atMost(2L, TimeUnit.MINUTES).pollInterval(5L,
TimeUnit.SECONDS).until(this::isJdbcReady);
} catch (final ConditionTimeoutException ignored) {
log.info("Jdbc project with agent environment initialization
failed ...");
return false;
