This is an automated email from the ASF dual-hosted git repository.
panjuan 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 e7c2f93 Correct usages of Preconditions (#11630)
e7c2f93 is described below
commit e7c2f9344506948b64084fb8a7482cbbcf47e04a
Author: 吴伟杰 <[email protected]>
AuthorDate: Wed Aug 4 12:00:36 2021 +0800
Correct usages of Preconditions (#11630)
---
.../apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java | 2 +-
.../sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java | 2 +-
.../shardingsphere/infra/database/type/DatabaseTypeRecognizer.java | 2 +-
.../schema/refresher/type/AlterIndexStatementSchemaRefresher.java | 2 +-
.../shardingsphere/spring/boot/datasource/DataSourceMapSetter.java | 2 +-
.../core/config/datasource/ScalingDataSourceConfigurationWrap.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java
index d8f1ed1..fba8dc7 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java
@@ -54,7 +54,7 @@ public final class AESEncryptAlgorithm implements
EncryptAlgorithm {
}
private byte[] createSecretKey() {
- Preconditions.checkArgument(props.containsKey(AES_KEY),
String.format("%s can not be null.", AES_KEY));
+ Preconditions.checkArgument(props.containsKey(AES_KEY), "%s can not be
null.", AES_KEY);
return Arrays.copyOf(DigestUtils.sha1(props.getProperty(AES_KEY)), 16);
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
index 7761aac..4e799c8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
@@ -105,7 +105,7 @@ public final class IntervalShardingAlgorithm implements
StandardShardingAlgorith
}
private DateTimeFormatter getTableSuffixPattern() {
-
Preconditions.checkArgument(props.containsKey(SHARDING_SUFFIX_FORMAT_KEY), "%
can not be null.", SHARDING_SUFFIX_FORMAT_KEY);
+
Preconditions.checkArgument(props.containsKey(SHARDING_SUFFIX_FORMAT_KEY), "%s
can not be null.", SHARDING_SUFFIX_FORMAT_KEY);
return
DateTimeFormatter.ofPattern(props.getProperty(SHARDING_SUFFIX_FORMAT_KEY));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeRecognizer.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeRecognizer.java
index 7a28735..578efa0 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeRecognizer.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeRecognizer.java
@@ -42,7 +42,7 @@ public final class DatabaseTypeRecognizer {
DatabaseType result = null;
for (DataSource each : dataSources) {
DatabaseType databaseType = getDatabaseType(each);
- Preconditions.checkState(null == result || result == databaseType,
String.format("Database type inconsistent with '%s' and '%s'", result,
databaseType));
+ Preconditions.checkState(null == result || result == databaseType,
"Database type inconsistent with '%s' and '%s'", result, databaseType);
result = databaseType;
}
return null == result ? DatabaseTypeRegistry.getDefaultDatabaseType()
: result;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/AlterIndexStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/AlterIndexStatementSchemaRefresher.java
index f92acaa..67e910f 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/AlterIndexStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/AlterIndexStatementSchemaRefresher.java
@@ -45,7 +45,7 @@ public final class AlterIndexStatementSchemaRefresher
implements SchemaRefresher
Optional<String> logicTableName = findLogicTableName(schema,
indexName);
if (logicTableName.isPresent()) {
TableMetaData tableMetaData = schema.get(logicTableName.get());
- Preconditions.checkNotNull(tableMetaData, String.format("Can not
get the table '%s' metadata!", logicTableName.get()));
+ Preconditions.checkNotNull(tableMetaData, "Can not get the table
'%s' metadata!", logicTableName.get());
tableMetaData.getIndexes().remove(indexName);
String renameIndexName =
renameIndex.get().getIdentifier().getValue();
tableMetaData.getIndexes().put(renameIndexName, new
IndexMetaData(renameIndexName));
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetter.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetter.java
index 62e5682..2d28ae6 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetter.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetter.java
@@ -85,7 +85,7 @@ public final class DataSourceMapSetter {
@SuppressWarnings("unchecked")
private static DataSource getDataSource(final Environment environment,
final String dataSourceName) throws ReflectiveOperationException,
NamingException {
Map<String, Object> dataSourceProps = PropertyUtil.handle(environment,
String.join("", PREFIX, dataSourceName), Map.class);
- Preconditions.checkState(!dataSourceProps.isEmpty(),
String.format("Wrong datasource [%s] properties.", dataSourceName));
+ Preconditions.checkState(!dataSourceProps.isEmpty(), "Wrong datasource
[%s] properties.", dataSourceName);
if (dataSourceProps.containsKey(JNDI_NAME)) {
return
getJNDIDataSource(dataSourceProps.get(JNDI_NAME).toString());
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
index ec1d610..00140f6 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
@@ -41,7 +41,7 @@ public class ScalingDataSourceConfigurationWrap {
@SneakyThrows(ReflectiveOperationException.class)
public ScalingDataSourceConfiguration unwrap() {
Map<String, Class<?>> classMap =
DataSourceConfigurationHolder.getInstances();
- Preconditions.checkArgument(classMap.containsKey(type.toLowerCase()),
String.format("Unsupported data source type '%s'", type));
+ Preconditions.checkArgument(classMap.containsKey(type.toLowerCase()),
"Unsupported data source type '%s'", type);
return (ScalingDataSourceConfiguration)
classMap.get(type.toLowerCase()).getConstructor(String.class).newInstance(parameter);
}
