Skip to content

Commit 79e8f67

Browse files
terrymanuterrymanu
authored
Fixes for codes format (apache#37174)
1 parent 29a74c8 commit 79e8f67

9 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/util/AlterTableMetadataCheckUtilsTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,10 @@ private Collection<ModifyColumnDefinitionSegment> createModifyColumnDefinitions(
201201
}
202202

203203
private Collection<RenameColumnSegment> createRenameColumnSegments(final String oldColumnName, final String newColumnName) {
204-
Collection<RenameColumnSegment> result = new ArrayList<>();
205204
RenameColumnSegment segment = mock(RenameColumnSegment.class);
206205
when(segment.getColumnName()).thenReturn(new ColumnSegment(0, 0, new IdentifierValue(newColumnName)));
207206
when(segment.getOldColumnName()).thenReturn(new ColumnSegment(0, 0, new IdentifierValue(oldColumnName)));
208-
result.add(segment);
209-
return result;
207+
return Collections.singleton(segment);
210208
}
211209

212210
private Collection<DropColumnDefinitionSegment> createDropColumnDefinitions(final String columnName) {

‎infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/PrepareStatementBinderTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import static org.hamcrest.CoreMatchers.is;
4343
import static org.hamcrest.MatcherAssert.assertThat;
44+
import static org.junit.jupiter.api.Assertions.assertFalse;
4445
import static org.junit.jupiter.api.Assertions.assertTrue;
4546
import static org.mockito.Mockito.when;
4647

@@ -79,9 +80,9 @@ void assertBindWithSelect() {
7980
PrepareStatement actual = new PrepareStatementBinder().bind(prepareStatement, binderContext);
8081
assertThat(actual.getDatabaseType(), is(databaseType));
8182
assertTrue(actual.getSelect().isPresent());
82-
assertTrue(!actual.getInsert().isPresent());
83-
assertTrue(!actual.getUpdate().isPresent());
84-
assertTrue(!actual.getDelete().isPresent());
83+
assertFalse(actual.getInsert().isPresent());
84+
assertFalse(actual.getUpdate().isPresent());
85+
assertFalse(actual.getDelete().isPresent());
8586
}
8687

8788
@Test
@@ -92,10 +93,10 @@ void assertBindWithoutInnerStatements() {
9293
SQLStatementBinderContext binderContext = new SQLStatementBinderContext(metaData, "foo_db_1", hintValueContext, prepareStatement);
9394
PrepareStatement actual = new PrepareStatementBinder().bind(prepareStatement, binderContext);
9495
assertThat(actual.getDatabaseType(), is(databaseType));
95-
assertTrue(!actual.getSelect().isPresent());
96-
assertTrue(!actual.getInsert().isPresent());
97-
assertTrue(!actual.getUpdate().isPresent());
98-
assertTrue(!actual.getDelete().isPresent());
96+
assertFalse(actual.getSelect().isPresent());
97+
assertFalse(actual.getInsert().isPresent());
98+
assertFalse(actual.getUpdate().isPresent());
99+
assertFalse(actual.getDelete().isPresent());
99100
}
100101

101102
private SelectStatement createSelectStatement() {

‎infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/creator/DataSourcePoolPropertiesCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static DataSourcePoolProperties create(final DataSource dataSource) {
6565
return new DataSourcePoolProperties(realDataSource.getClass().getName(), createProperties(realDataSource));
6666
}
6767

68-
@SuppressWarnings({"unchecked", "rawtypes"})
68+
@SuppressWarnings({"unchecked", "rawtypes", "CollectionWithoutInitialCapacity"})
6969
private static Map<String, Object> createProperties(final DataSourceConfiguration config) {
7070
Map<String, Object> result = new LinkedHashMap<>();
7171
result.put("dataSourceClassName", config.getConnection().getDataSourceClassName());

‎kernel/authority/core/src/main/java/org/apache/shardingsphere/authentication/AuthenticatorFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public Authenticator newInstance(final ShardingSphereUser user) {
5050

5151
private E getAuthenticatorType(final String authenticationMethodName) {
5252
try {
53-
return E.valueOf(authenticatorTypeClass, authenticationMethodName.toUpperCase());
53+
return Enum.valueOf(authenticatorTypeClass, authenticationMethodName.toUpperCase());
5454
} catch (final IllegalArgumentException ignored) {
5555
return Arrays.stream(authenticatorTypeClass.getEnumConstants()).filter(AuthenticatorType::isDefault).findAny().orElseThrow(IllegalArgumentException::new);
5656
}

‎kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtilsTest.java‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,71 +39,73 @@
3939

4040
import static org.hamcrest.MatcherAssert.assertThat;
4141
import static org.hamcrest.Matchers.is;
42+
import static org.hamcrest.Matchers.isA;
4243
import static org.junit.jupiter.api.Assertions.assertTrue;
4344

4445
class ColumnValueConvertUtilsTest {
4546

47+
@SuppressWarnings("UseOfObsoleteDateTimeApi")
4648
@Test
4749
void assertConvertToProtobufMessage() {
4850
Message actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(null);
49-
assertTrue(actualMessage instanceof Empty);
51+
assertThat(actualMessage, isA(Empty.class));
5052
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1);
51-
assertTrue(actualMessage instanceof Int32Value);
53+
assertThat(actualMessage, isA(Int32Value.class));
5254
assertThat(((Int32Value) actualMessage).getValue(), is(1));
5355
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage((byte) 1);
54-
assertTrue(actualMessage instanceof Int32Value);
56+
assertThat(actualMessage, isA(Int32Value.class));
5557
assertThat(((Int32Value) actualMessage).getValue(), is(1));
5658
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage((short) 1);
57-
assertTrue(actualMessage instanceof Int32Value);
59+
assertThat(actualMessage, isA(Int32Value.class));
5860
assertThat(((Int32Value) actualMessage).getValue(), is(1));
5961
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1L);
60-
assertTrue(actualMessage instanceof Int64Value);
62+
assertThat(actualMessage, isA(Int64Value.class));
6163
assertThat(((Int64Value) actualMessage).getValue(), is(1L));
6264
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new BigInteger("1234"));
63-
assertTrue(actualMessage instanceof StringValue);
65+
assertThat(actualMessage, isA(StringValue.class));
6466
assertThat(new BigInteger(((StringValue) actualMessage).getValue()), is(new BigInteger("1234")));
6567
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1.0F);
66-
assertTrue(actualMessage instanceof FloatValue);
68+
assertThat(actualMessage, isA(FloatValue.class));
6769
assertThat(((FloatValue) actualMessage).getValue(), is(1.0F));
6870
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(1.23);
69-
assertTrue(actualMessage instanceof DoubleValue);
71+
assertThat(actualMessage, isA(DoubleValue.class));
7072
assertThat(((DoubleValue) actualMessage).getValue(), is(1.23));
7173
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new BigDecimal("100"));
72-
assertTrue(actualMessage instanceof StringValue);
74+
assertThat(actualMessage, isA(StringValue.class));
7375
assertThat(((StringValue) actualMessage).getValue(), is("100"));
7476
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage("abcd");
75-
assertTrue(actualMessage instanceof StringValue);
77+
assertThat(actualMessage, isA(StringValue.class));
7678
assertThat(((StringValue) actualMessage).getValue(), is("abcd"));
7779
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(true);
78-
assertTrue(actualMessage instanceof BoolValue);
80+
assertThat(actualMessage, isA(BoolValue.class));
7981
assertTrue(((BoolValue) actualMessage).getValue());
8082
Timestamp now = new Timestamp(System.currentTimeMillis());
8183
long epochSecond = now.toInstant().getEpochSecond();
8284
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(now.toLocalDateTime());
83-
assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
85+
assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
8486
assertThat(((com.google.protobuf.Timestamp) actualMessage).getSeconds(), is(epochSecond));
8587
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(now);
86-
assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
88+
assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
8789
assertThat(((com.google.protobuf.Timestamp) actualMessage).getSeconds(), is(epochSecond));
8890
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(new Date(now.getTime()));
89-
assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
91+
assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
9092
assertThat(((com.google.protobuf.Timestamp) actualMessage).getSeconds(), is(epochSecond));
9193
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(now.toInstant());
92-
assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
94+
assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
9395
assertThat(((com.google.protobuf.Timestamp) actualMessage).getNanos(), is(now.toInstant().getNano()));
9496
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(now.toLocalDateTime().toLocalTime());
95-
assertTrue(actualMessage instanceof Int64Value);
97+
assertThat(actualMessage, isA(Int64Value.class));
9698
assertThat(((Int64Value) actualMessage).getValue(), is(now.toLocalDateTime().toLocalTime().toNanoOfDay()));
9799
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage("123456".getBytes());
98-
assertTrue(actualMessage instanceof BytesValue);
100+
assertThat(actualMessage, isA(BytesValue.class));
99101
assertThat(((BytesValue) actualMessage).getValue().toByteArray(), is("123456".getBytes()));
100102
OffsetTime offsetTime = OffsetTime.now();
101103
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(offsetTime);
102-
assertTrue(actualMessage instanceof Int64Value);
104+
assertThat(actualMessage, isA(Int64Value.class));
103105
assertThat(((Int64Value) actualMessage).getValue(), is(offsetTime.toLocalTime().toNanoOfDay()));
104106
OffsetDateTime offsetDateTime = OffsetDateTime.now();
105107
actualMessage = ColumnValueConvertUtils.convertToProtobufMessage(offsetDateTime);
106-
assertTrue(actualMessage instanceof com.google.protobuf.Timestamp);
108+
assertThat(actualMessage, isA(com.google.protobuf.Timestamp.class));
107109
assertThat(((com.google.protobuf.Timestamp) actualMessage).getSeconds(), is(offsetDateTime.toEpochSecond()));
108110
assertThat(((com.google.protobuf.Timestamp) actualMessage).getNanos(), is(offsetDateTime.getNano()));
109111
}

‎parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static Map<String, DataSourcePoolProperties> convert(final DatabaseType d
5050
return result;
5151
}
5252

53-
@SuppressWarnings({"unchecked", "rawtypes"})
53+
@SuppressWarnings({"unchecked", "rawtypes", "CollectionWithoutInitialCapacity"})
5454
private static Map<String, Object> createProperties(final DatabaseType databaseType, final DataSourceSegment segment) {
5555
Map<String, Object> result = new LinkedHashMap<>();
5656
result.put("jdbcUrl", getURL(databaseType, segment));

‎proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/fixture/CallTimeRecordDataSource.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.fixture;
1919

20+
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
21+
2022
import javax.sql.DataSource;
2123
import java.io.PrintWriter;
2224
import java.sql.Array;
@@ -48,9 +50,7 @@ public final class CallTimeRecordDataSource implements DataSource, AutoCloseable
4850

4951
@Override
5052
public Connection getConnection() throws SQLException {
51-
if (5 <= count.get()) {
52-
throw new SQLException("Data source is not enough");
53-
}
53+
ShardingSpherePreconditions.checkState(count.get() < 5, () -> new SQLException("Data source is not enough"));
5454
count.getAndIncrement();
5555
return new CallTimeRecordConnection();
5656
}

‎test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ private Object getValue(final String value, final String type) {
8181
case "bigint":
8282
case "long":
8383
return Long.parseLong(value);
84-
case "bigint unsigned":
85-
return new BigDecimal(value);
8684
case "float":
8785
case "real":
8886
return Float.parseFloat(value);
@@ -94,6 +92,7 @@ private Object getValue(final String value, final String type) {
9492
case "decimal":
9593
case "numeric unsigned":
9694
case "decimal unsigned":
95+
case "bigint unsigned":
9796
return new BigDecimal(value);
9897
case "boolean":
9998
return Boolean.parseBoolean(value);

‎test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ private void assertNotContainsTable(final Connection connection, final String ta
203203
assertFalse(connection.getMetaData().getTables(null, null, tableName, new String[]{"TABLE"}).next(), String.format("Table `%s` should not existed", tableName));
204204
}
205205

206+
@SuppressWarnings("CollectionWithoutInitialCapacity")
206207
private List<DataSetColumn> getActualColumns(final Collection<DataNode> dataNodes) throws SQLException {
207208
Set<DataSetColumn> result = new LinkedHashSet<>();
208209
for (DataNode each : dataNodes) {
@@ -228,6 +229,7 @@ private List<DataSetColumn> getActualColumns(final Connection connection, final
228229
}
229230
}
230231

232+
@SuppressWarnings("CollectionWithoutInitialCapacity")
231233
private List<DataSetIndex> getActualIndexes(final Collection<DataNode> dataNodes) throws SQLException {
232234
Set<DataSetIndex> result = new LinkedHashSet<>();
233235
for (DataNode each : dataNodes) {

0 commit comments

Comments
 (0)