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 79e8f673c65 Fixes for codes format (#37174)
79e8f673c65 is described below
commit 79e8f673c6572563adb3e4539662e1d62fa270f1
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 23 23:58:49 2025 +0800
Fixes for codes format (#37174)
---
.../dml/util/AlterTableMetadataCheckUtilsTest.java | 4 +--
.../statement/ddl/PrepareStatementBinderTest.java | 15 ++++----
.../creator/DataSourcePoolPropertiesCreator.java | 2 +-
.../authentication/AuthenticatorFactory.java | 2 +-
.../cdc/util/ColumnValueConvertUtilsTest.java | 40 ++++++++++++----------
.../converter/DataSourceSegmentsConverter.java | 2 +-
.../fixture/CallTimeRecordDataSource.java | 6 ++--
.../test/e2e/sql/cases/value/SQLValue.java | 3 +-
.../test/e2e/sql/it/sql/ddl/DDLE2EIT.java | 2 ++
9 files changed, 39 insertions(+), 37 deletions(-)
diff --git
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/util/AlterTableMetadataCheckUtilsTest.java
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/util/AlterTableMetadataCheckUtilsTest.java
index 370607db4db..bbbc623cca0 100644
---
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/util/AlterTableMetadataCheckUtilsTest.java
+++
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/util/AlterTableMetadataCheckUtilsTest.java
@@ -201,12 +201,10 @@ class AlterTableMetadataCheckUtilsTest {
}
private Collection<RenameColumnSegment> createRenameColumnSegments(final
String oldColumnName, final String newColumnName) {
- Collection<RenameColumnSegment> result = new ArrayList<>();
RenameColumnSegment segment = mock(RenameColumnSegment.class);
when(segment.getColumnName()).thenReturn(new ColumnSegment(0, 0, new
IdentifierValue(newColumnName)));
when(segment.getOldColumnName()).thenReturn(new ColumnSegment(0, 0,
new IdentifierValue(oldColumnName)));
- result.add(segment);
- return result;
+ return Collections.singleton(segment);
}
private Collection<DropColumnDefinitionSegment>
createDropColumnDefinitions(final String columnName) {
diff --git
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/PrepareStatementBinderTest.java
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/PrepareStatementBinderTest.java
index c30701b289d..fbc8bfd2300 100644
---
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/PrepareStatementBinderTest.java
+++
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/PrepareStatementBinderTest.java
@@ -41,6 +41,7 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
@@ -79,9 +80,9 @@ class PrepareStatementBinderTest {
PrepareStatement actual = new
PrepareStatementBinder().bind(prepareStatement, binderContext);
assertThat(actual.getDatabaseType(), is(databaseType));
assertTrue(actual.getSelect().isPresent());
- assertTrue(!actual.getInsert().isPresent());
- assertTrue(!actual.getUpdate().isPresent());
- assertTrue(!actual.getDelete().isPresent());
+ assertFalse(actual.getInsert().isPresent());
+ assertFalse(actual.getUpdate().isPresent());
+ assertFalse(actual.getDelete().isPresent());
}
@Test
@@ -92,10 +93,10 @@ class PrepareStatementBinderTest {
SQLStatementBinderContext binderContext = new
SQLStatementBinderContext(metaData, "foo_db_1", hintValueContext,
prepareStatement);
PrepareStatement actual = new
PrepareStatementBinder().bind(prepareStatement, binderContext);
assertThat(actual.getDatabaseType(), is(databaseType));
- assertTrue(!actual.getSelect().isPresent());
- assertTrue(!actual.getInsert().isPresent());
- assertTrue(!actual.getUpdate().isPresent());
- assertTrue(!actual.getDelete().isPresent());
+ assertFalse(actual.getSelect().isPresent());
+ assertFalse(actual.getInsert().isPresent());
+ assertFalse(actual.getUpdate().isPresent());
+ assertFalse(actual.getDelete().isPresent());
}
private SelectStatement createSelectStatement() {
diff --git
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/creator/DataSourcePoolPropertiesCreator.java
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/creator/DataSourcePoolPropertiesCreator.java
index cd01f0703ab..db9a7b8c973 100644
---
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/creator/DataSourcePoolPropertiesCreator.java
+++
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/creator/DataSourcePoolPropertiesCreator.java
@@ -65,7 +65,7 @@ public final class DataSourcePoolPropertiesCreator {
return new
DataSourcePoolProperties(realDataSource.getClass().getName(),
createProperties(realDataSource));
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({"unchecked", "rawtypes",
"CollectionWithoutInitialCapacity"})
private static Map<String, Object> createProperties(final
DataSourceConfiguration config) {
Map<String, Object> result = new LinkedHashMap<>();
result.put("dataSourceClassName",
config.getConnection().getDataSourceClassName());
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authentication/AuthenticatorFactory.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authentication/AuthenticatorFactory.java
index 40016fd6974..a9a66a90b9a 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authentication/AuthenticatorFactory.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authentication/AuthenticatorFactory.java
@@ -50,7 +50,7 @@ public final class AuthenticatorFactory<E extends Enum<E> &
AuthenticatorType> {
private E getAuthenticatorType(final String authenticationMethodName) {
try {
- return E.valueOf(authenticatorTypeClass,
authenticationMethodName.toUpperCase());
+ return Enum.valueOf(authenticatorTypeClass,
authenticationMethodName.toUpperCase());
} catch (final IllegalArgumentException ignored) {
return
Arrays.stream(authenticatorTypeClass.getEnumConstants()).filter(AuthenticatorType::isDefault).findAny().orElseThrow(IllegalArgumentException::new);
}
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtilsTest.java
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtilsTest.java
index 86974d9597b..0fef98ee448 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtilsTest.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtilsTest.java
@@ -39,71 +39,73 @@ import java.util.Date;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ColumnValueConvertUtilsTest {
+ @SuppressWarnings("UseOfObsoleteDateTimeApi")
@Test
void assertConvertToProtobufMessage() {
Message actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(null);
- assertTrue(actualMessage instanceof Empty);
+ assertThat(actualMessage, isA(Empty.class));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1);
- assertTrue(actualMessage instanceof Int32Value);
+ assertThat(actualMessage, isA(Int32Value.class));
assertThat(((Int32Value) actualMessage).getValue(), is(1));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage((byte) 1);
- assertTrue(actualMessage instanceof Int32Value);
+ assertThat(actualMessage, isA(Int32Value.class));
assertThat(((Int32Value) actualMessage).getValue(), is(1));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage((short) 1);
- assertTrue(actualMessage instanceof Int32Value);
+ assertThat(actualMessage, isA(Int32Value.class));
assertThat(((Int32Value) actualMessage).getValue(), is(1));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1L);
- assertTrue(actualMessage instanceof Int64Value);
+ assertThat(actualMessage, isA(Int64Value.class));
assertThat(((Int64Value) actualMessage).getValue(), is(1L));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new
BigInteger("1234"));
- assertTrue(actualMessage instanceof StringValue);
+ assertThat(actualMessage, isA(StringValue.class));
assertThat(new BigInteger(((StringValue) actualMessage).getValue()),
is(new BigInteger("1234")));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1.0F);
- assertTrue(actualMessage instanceof FloatValue);
+ assertThat(actualMessage, isA(FloatValue.class));
assertThat(((FloatValue) actualMessage).getValue(), is(1.0F));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1.23);
- assertTrue(actualMessage instanceof DoubleValue);
+ assertThat(actualMessage, isA(DoubleValue.class));
assertThat(((DoubleValue) actualMessage).getValue(), is(1.23));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new
BigDecimal("100"));
- assertTrue(actualMessage instanceof StringValue);
+ assertThat(actualMessage, isA(StringValue.class));
assertThat(((StringValue) actualMessage).getValue(), is("100"));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage("abcd");
- assertTrue(actualMessage instanceof StringValue);
+ assertThat(actualMessage, isA(StringValue.class));
assertThat(((StringValue) actualMessage).getValue(), is("abcd"));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(true);
- assertTrue(actualMessage instanceof BoolValue);
+ assertThat(actualMessage, isA(BoolValue.class));
assertTrue(((BoolValue) actualMessage).getValue());
Timestamp now = new Timestamp(System.currentTimeMillis());
long epochSecond = now.toInstant().getEpochSecond();
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(now.toLocalDateTime());
- assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
+ assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
assertThat(((com.google.protobuf.Timestamp)
actualMessage).getSeconds(), is(epochSecond));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(now);
- assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
+ assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
assertThat(((com.google.protobuf.Timestamp)
actualMessage).getSeconds(), is(epochSecond));
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new
Date(now.getTime()));
- assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
+ assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
assertThat(((com.google.protobuf.Timestamp)
actualMessage).getSeconds(), is(epochSecond));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(now.toInstant());
- assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
+ assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
assertThat(((com.google.protobuf.Timestamp) actualMessage).getNanos(),
is(now.toInstant().getNano()));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(now.toLocalDateTime().toLocalTime());
- assertTrue(actualMessage instanceof Int64Value);
+ assertThat(actualMessage, isA(Int64Value.class));
assertThat(((Int64Value) actualMessage).getValue(),
is(now.toLocalDateTime().toLocalTime().toNanoOfDay()));
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage("123456".getBytes());
- assertTrue(actualMessage instanceof BytesValue);
+ assertThat(actualMessage, isA(BytesValue.class));
assertThat(((BytesValue) actualMessage).getValue().toByteArray(),
is("123456".getBytes()));
OffsetTime offsetTime = OffsetTime.now();
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(offsetTime);
- assertTrue(actualMessage instanceof Int64Value);
+ assertThat(actualMessage, isA(Int64Value.class));
assertThat(((Int64Value) actualMessage).getValue(),
is(offsetTime.toLocalTime().toNanoOfDay()));
OffsetDateTime offsetDateTime = OffsetDateTime.now();
actualMessage =
ColumnValueConvertUtils.convertToProtobufMessage(offsetDateTime);
- assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
+ assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
assertThat(((com.google.protobuf.Timestamp)
actualMessage).getSeconds(), is(offsetDateTime.toEpochSecond()));
assertThat(((com.google.protobuf.Timestamp) actualMessage).getNanos(),
is(offsetDateTime.getNano()));
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java
index a1488192ac1..0a978f1fbe1 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java
@@ -50,7 +50,7 @@ public final class DataSourceSegmentsConverter {
return result;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({"unchecked", "rawtypes",
"CollectionWithoutInitialCapacity"})
private static Map<String, Object> createProperties(final DatabaseType
databaseType, final DataSourceSegment segment) {
Map<String, Object> result = new LinkedHashMap<>();
result.put("jdbcUrl", getURL(databaseType, segment));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/fixture/CallTimeRecordDataSource.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/fixture/CallTimeRecordDataSource.java
index 6db4b6e00f4..ed4b3fc6b0b 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/fixture/CallTimeRecordDataSource.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/fixture/CallTimeRecordDataSource.java
@@ -17,6 +17,8 @@
package
org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.fixture;
+import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
+
import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Array;
@@ -48,9 +50,7 @@ public final class CallTimeRecordDataSource implements
DataSource, AutoCloseable
@Override
public Connection getConnection() throws SQLException {
- if (5 <= count.get()) {
- throw new SQLException("Data source is not enough");
- }
+ ShardingSpherePreconditions.checkState(count.get() < 5, () -> new
SQLException("Data source is not enough"));
count.getAndIncrement();
return new CallTimeRecordConnection();
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java
index d415c31638f..156a5ffe4ea 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java
@@ -81,8 +81,6 @@ public final class SQLValue {
case "bigint":
case "long":
return Long.parseLong(value);
- case "bigint unsigned":
- return new BigDecimal(value);
case "float":
case "real":
return Float.parseFloat(value);
@@ -94,6 +92,7 @@ public final class SQLValue {
case "decimal":
case "numeric unsigned":
case "decimal unsigned":
+ case "bigint unsigned":
return new BigDecimal(value);
case "boolean":
return Boolean.parseBoolean(value);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
index 946e29e53ab..e1112193174 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
@@ -203,6 +203,7 @@ class DDLE2EIT implements SQLE2EIT {
assertFalse(connection.getMetaData().getTables(null, null, tableName,
new String[]{"TABLE"}).next(), String.format("Table `%s` should not existed",
tableName));
}
+ @SuppressWarnings("CollectionWithoutInitialCapacity")
private List<DataSetColumn> getActualColumns(final Collection<DataNode>
dataNodes) throws SQLException {
Set<DataSetColumn> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
@@ -228,6 +229,7 @@ class DDLE2EIT implements SQLE2EIT {
}
}
+ @SuppressWarnings("CollectionWithoutInitialCapacity")
private List<DataSetIndex> getActualIndexes(final Collection<DataNode>
dataNodes) throws SQLException {
Set<DataSetIndex> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
