You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/03 09:17:07 UTC
[shardingsphere] branch master updated: Rename variable name from param to parameter or parameters (#17294)
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 085a9ba10f0 Rename variable name from param to parameter or parameters (#17294)
085a9ba10f0 is described below
commit 085a9ba10f0d4f3a1d41ef78feeff6e0aa02e43c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue May 3 17:17:00 2022 +0800
Rename variable name from param to parameter or parameters (#17294)
---
.../service/ZipkinTracingPluginBootService.java | 10 ++--
.../postgres/PostgresColumnPropertiesLoader.java | 18 +++----
.../postgres/PostgresConstraintsLoader.java | 58 +++++++++++-----------
.../postgres/PostgresTablePropertiesLoader.java | 20 ++++----
.../dialect/OpenGaussSchemaMetaDataLoader.java | 6 +--
.../dialect/PostgreSQLSchemaMetaDataLoader.java | 6 +--
...tractUnsupportedOperationParameterMetaData.java | 16 +++---
.../spring/boot/util/PropertyUtil.java | 10 ++--
8 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
index 0123ac1fb76..be6a299d9eb 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
@@ -81,19 +81,19 @@ public final class ZipkinTracingPluginBootService implements PluginBootService {
private Sampler createSampler(final PluginConfiguration pluginConfig) {
String samplerType = Optional.ofNullable(pluginConfig.getProps().getProperty("SAMPLER_TYPE")).orElse("const");
- String samplerParam = Optional.ofNullable(pluginConfig.getProps().getProperty("SAMPLER_PARAM")).orElse("1");
+ String samplerParameter = Optional.ofNullable(pluginConfig.getProps().getProperty("SAMPLER_PARAM")).orElse("1");
switch (samplerType) {
case "const":
- if ("0".equals(samplerParam)) {
+ if ("0".equals(samplerParameter)) {
return Sampler.NEVER_SAMPLE;
}
return Sampler.ALWAYS_SAMPLE;
case "counting":
- return Sampler.create(Float.parseFloat(samplerParam));
+ return Sampler.create(Float.parseFloat(samplerParameter));
case "ratelimiting":
- return RateLimitingSampler.create(Integer.parseInt(samplerParam));
+ return RateLimitingSampler.create(Integer.parseInt(samplerParameter));
case "boundary":
- return BoundarySampler.create(Float.parseFloat(samplerParam));
+ return BoundarySampler.create(Float.parseFloat(samplerParameter));
default:
break;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresColumnPropertiesLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresColumnPropertiesLoader.java
index e26425a5e2a..e5e7f3ad2af 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresColumnPropertiesLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresColumnPropertiesLoader.java
@@ -90,18 +90,18 @@ public final class PostgresColumnPropertiesLoader extends PostgresAbstractLoader
Collection<Map<String, Object>> result = new LinkedList<>();
for (Map<String, Object> each : executeByTemplate(new LinkedHashMap<>(), "table/10_plus/get_inherits.ftl")) {
if (collInherits.contains((String) each.get("inherits"))) {
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("tid", each.get("oid"));
- result.addAll(executeByTemplate(param, "table/10_plus/get_columns_for_table.ftl"));
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("tid", each.get("oid"));
+ result.addAll(executeByTemplate(parameters, "table/10_plus/get_columns_for_table.ftl"));
}
}
return result;
}
private Collection<Map<String, Object>> getColumnFromType(final Map<String, Object> context) {
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("tid", context.get("typoid"));
- return executeByTemplate(param, "table/10_plus/get_columns_for_table.ftl");
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("tid", context.get("typoid"));
+ return executeByTemplate(parameters, "table/10_plus/get_columns_for_table.ftl");
}
@SuppressWarnings("unchecked")
@@ -122,9 +122,9 @@ public final class PostgresColumnPropertiesLoader extends PostgresAbstractLoader
private Map<String, Collection<String>> getEditTypes(final Collection<Map<String, Object>> allColumns) throws SQLException {
Map<String, Collection<String>> result = new LinkedHashMap<>();
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("type_ids", allColumns.stream().map(each -> each.get("atttypid").toString()).collect(Collectors.joining(",")));
- for (Map<String, Object> each : executeByTemplate(param, "columns/default/edit_mode_types_multi.ftl")) {
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("type_ids", allColumns.stream().map(each -> each.get("atttypid").toString()).collect(Collectors.joining(",")));
+ for (Map<String, Object> each : executeByTemplate(parameters, "columns/default/edit_mode_types_multi.ftl")) {
result.put(each.get("main_oid").toString(), covertPgArrayAndSort(each.get("edit_types")));
}
return result;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresConstraintsLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresConstraintsLoader.java
index dc12fa9748f..1480c4f2a1f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresConstraintsLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresConstraintsLoader.java
@@ -85,10 +85,10 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
columns.add(column);
}
each.put("columns", columns);
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("cid", each.get("oid"));
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("cid", each.get("oid"));
Collection<Object> includes = new LinkedList<>();
- for (Map<String, Object> include : executeByTemplate(param, "index_constraint/11_plus/get_constraint_include.ftl")) {
+ for (Map<String, Object> include : executeByTemplate(parameters, "index_constraint/11_plus/get_constraint_include.ftl")) {
includes.add(include.get("colname"));
}
each.put("include", includes);
@@ -114,19 +114,19 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private Collection<Map<String, Object>> fetchConstraintsProperties(final Map<String, Object> context, final String constraintType) {
- Map<String, Object> param = new HashMap<>();
- param.put("did", context.get("did"));
- param.put("tid", context.get("tid"));
- param.put("cid", context.get("cid"));
- param.put("constraint_type", constraintType);
- return executeByTemplate(param, "index_constraint/11_plus/properties.ftl");
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("did", context.get("did"));
+ parameters.put("tid", context.get("tid"));
+ parameters.put("cid", context.get("cid"));
+ parameters.put("constraint_type", constraintType);
+ return executeByTemplate(parameters, "index_constraint/11_plus/properties.ftl");
}
private Collection<Map<String, Object>> getExclusionConstraints(final Map<String, Object> context) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", context.get("tid"));
- param.put("did", context.get("did"));
- Collection<Map<String, Object>> result = executeByTemplate(param, "exclusion_constraint/11_plus/properties.ftl");
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", context.get("tid"));
+ parameters.put("did", context.get("did"));
+ Collection<Map<String, Object>> result = executeByTemplate(parameters, "exclusion_constraint/11_plus/properties.ftl");
for (Map<String, Object> each : result) {
getExclusionConstraintsColumns(each);
}
@@ -162,9 +162,9 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private Collection<Map<String, Object>> getForeignKeys(final Long tid) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", tid);
- Collection<Map<String, Object>> result = executeByTemplate(param, "foreign_key/9.1_plus/properties.ftl");
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", tid);
+ Collection<Map<String, Object>> result = executeByTemplate(parameters, "foreign_key/9.1_plus/properties.ftl");
for (Map<String, Object> each : result) {
Collection<Map<String, Object>> columns = new LinkedList<>();
Set<String> cols = new HashSet<>();
@@ -188,9 +188,9 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private void setRemoteName(final Map<String, Object> foreignKey, final Collection<Map<String, Object>> columns) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", columns.iterator().next().get("references"));
- Collection<Map<String, Object>> parents = executeByTemplate(param, "foreign_key/default/get_parent.ftl");
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", columns.iterator().next().get("references"));
+ Collection<Map<String, Object>> parents = executeByTemplate(parameters, "foreign_key/default/get_parent.ftl");
for (Map<String, Object> each : parents) {
foreignKey.put("remote_schema", each.get("schema"));
foreignKey.put("remote_table", each.get("table"));
@@ -199,15 +199,15 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private Collection<Map<String, Object>> getForeignKeysCols(final Long tid, final Map<String, Object> foreignKeyProps) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", tid);
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", tid);
Collection<Map<String, Object>> keys = new LinkedList<>();
Map<String, Object> key = new HashMap<>();
key.put("confkey", foreignKeyProps.get("confkey"));
key.put("conkey", foreignKeyProps.get("conkey"));
keys.add(key);
- param.put("keys", keys);
- return executeByTemplate(param, "foreign_key/default/get_constraint_cols.ftl");
+ parameters.put("keys", keys);
+ return executeByTemplate(parameters, "foreign_key/default/get_constraint_cols.ftl");
}
private boolean isPartitionAndConstraintInherited(final Map<String, Object> constraint, final Map<String, Object> context) {
@@ -215,9 +215,9 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private Optional<String> searchCoveringIndex(final Long tid, final Set<String> cols) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", tid);
- for (Map<String, Object> each : executeByTemplate(param, "foreign_key/default/get_constraints.ftl")) {
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", tid);
+ for (Map<String, Object> each : executeByTemplate(parameters, "foreign_key/default/get_constraints.ftl")) {
Map<String, Object> map = new HashMap<>();
map.put("cid", each.get("oid"));
map.put("colcnt", each.get("col_count"));
@@ -255,8 +255,8 @@ public final class PostgresConstraintsLoader extends PostgresAbstractLoader {
}
private Collection<Map<String, Object>> getCheckConstraints(final Long tid) {
- Map<String, Object> param = new HashMap<>();
- param.put("tid", tid);
- return executeByTemplate(param, "check_constraint/9.2_plus/get_cols.ftl");
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("tid", tid);
+ return executeByTemplate(parameters, "check_constraint/9.2_plus/get_cols.ftl");
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresTablePropertiesLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresTablePropertiesLoader.java
index b1d7474f3c5..63fb3bbddbb 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresTablePropertiesLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ddlgenerator/dialect/postgres/PostgresTablePropertiesLoader.java
@@ -57,22 +57,22 @@ public final class PostgresTablePropertiesLoader extends PostgresAbstractLoader
}
private void fetchDataBaseId(final Map<String, Object> context) throws SQLException {
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("databaseName", getConnection().getCatalog());
- appendFirstRow(executeByTemplate(param, "table/default/get_database_id.ftl"), context);
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("databaseName", getConnection().getCatalog());
+ appendFirstRow(executeByTemplate(parameters, "table/default/get_database_id.ftl"), context);
}
private void fetchTableId(final Map<String, Object> context) {
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("schemaName", schemaName);
- param.put("tableName", tableName);
- appendFirstRow(executeByTemplate(param, "table/default/get_table_id.ftl"), context);
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("schemaName", schemaName);
+ parameters.put("tableName", tableName);
+ appendFirstRow(executeByTemplate(parameters, "table/default/get_table_id.ftl"), context);
}
private void fetchSchemaId(final Map<String, Object> context) {
- Map<String, Object> param = new LinkedHashMap<>();
- param.put("schemaName", schemaName);
- appendFirstRow(executeByTemplate(param, "table/default/get_schema_id.ftl"), context);
+ Map<String, Object> parameters = new LinkedHashMap<>();
+ parameters.put("schemaName", schemaName);
+ appendFirstRow(executeByTemplate(parameters, "table/default/get_schema_id.ftl"), context);
}
private void fetchTableProperties(final Map<String, Object> context) {
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
index d899b8e7f79..d3e347a6e38 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
@@ -134,9 +134,9 @@ public final class OpenGaussSchemaMetaDataLoader implements DialectSchemaMetaDat
}
private String getColumnMetaDataSQL(final Collection<String> schemaNames, final Collection<String> tables) {
- String schemaNameParam = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
- return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParam)
- : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParam, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
+ String schemaNameParameter = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
+ return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParameter)
+ : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParameter, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
private Map<String, Multimap<String, IndexMetaData>> loadIndexMetaDataMap(final DataSource dataSource, final Collection<String> schemaNames) throws SQLException {
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
index ee816d6d38e..094dba2d830 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
@@ -142,9 +142,9 @@ public final class PostgreSQLSchemaMetaDataLoader implements DialectSchemaMetaDa
}
private String getColumnMetaDataSQL(final Collection<String> schemaNames, final Collection<String> tables) {
- String schemaNameParam = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
- return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParam)
- : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParam, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
+ String schemaNameParameter = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
+ return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParameter)
+ : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParameter, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
private Map<String, Multimap<String, IndexMetaData>> loadIndexMetaDataMap(final DataSource dataSource, final Collection<String> schemaNames) throws SQLException {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationParameterMetaData.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationParameterMetaData.java
index 57139deaf47..bf892017bd4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationParameterMetaData.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationParameterMetaData.java
@@ -29,42 +29,42 @@ import java.sql.SQLFeatureNotSupportedException;
public abstract class AbstractUnsupportedOperationParameterMetaData extends WrapperAdapter implements ParameterMetaData {
@Override
- public final int isNullable(final int param) throws SQLException {
+ public final int isNullable(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("isNullable");
}
@Override
- public final boolean isSigned(final int param) throws SQLException {
+ public final boolean isSigned(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("isSigned");
}
@Override
- public final int getPrecision(final int param) throws SQLException {
+ public final int getPrecision(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getPrecision");
}
@Override
- public final int getScale(final int param) throws SQLException {
+ public final int getScale(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getScale");
}
@Override
- public final int getParameterType(final int param) throws SQLException {
+ public final int getParameterType(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getParameterType");
}
@Override
- public final String getParameterTypeName(final int param) throws SQLException {
+ public final String getParameterTypeName(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getParameterTypeName");
}
@Override
- public final String getParameterClassName(final int param) throws SQLException {
+ public final String getParameterClassName(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getParameterClassName");
}
@Override
- public final int getParameterMode(final int param) throws SQLException {
+ public final int getParameterMode(final int parameter) throws SQLException {
throw new SQLFeatureNotSupportedException("getParameterMode");
}
}
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/util/PropertyUtil.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/util/PropertyUtil.java
index 70bc518c2b0..50d20b365d6 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/util/PropertyUtil.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/util/PropertyUtil.java
@@ -85,15 +85,15 @@ public final class PropertyUtil {
Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
Method getSubPropertiesMethod = resolverClass.getDeclaredMethod("getSubProperties", String.class);
Object resolverObject = resolverConstructor.newInstance(environment);
- String prefixParam = prefix.endsWith(".") ? prefix : prefix + ".";
+ String prefixParameter = prefix.endsWith(".") ? prefix : prefix + ".";
Method getPropertyMethod = resolverClass.getDeclaredMethod("getProperty", String.class);
- Map<String, Object> dataSourceProps = (Map<String, Object>) getSubPropertiesMethod.invoke(resolverObject, prefixParam);
+ Map<String, Object> dataSourceProps = (Map<String, Object>) getSubPropertiesMethod.invoke(resolverObject, prefixParameter);
Map<String, Object> result = new HashMap<>(dataSourceProps.size(), 1);
for (Entry<String, Object> entry : dataSourceProps.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (handlePlaceholder && value instanceof String && ((String) value).contains(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX)) {
- String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParam + key);
+ String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParameter + key);
result.put(key, resolvedValue);
} else {
result.put(key, value);
@@ -109,8 +109,8 @@ public final class PropertyUtil {
Method getMethod = binderClass.getDeclaredMethod("get", Environment.class);
Method bindMethod = binderClass.getDeclaredMethod("bind", String.class, Class.class);
Object binderObject = getMethod.invoke(null, environment);
- String prefixParam = dashedPrefix.endsWith(".") ? dashedPrefix.substring(0, prefix.length() - 1) : dashedPrefix;
- Object bindResultObject = bindMethod.invoke(binderObject, prefixParam, targetClass);
+ String prefixParameter = dashedPrefix.endsWith(".") ? dashedPrefix.substring(0, prefix.length() - 1) : dashedPrefix;
+ Object bindResultObject = bindMethod.invoke(binderObject, prefixParameter, targetClass);
Method resultGetMethod = bindResultObject.getClass().getDeclaredMethod("get");
return resultGetMethod.invoke(bindResultObject);
}