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 2021/02/09 09:30:21 UTC
[shardingsphere] branch master updated: Rename acceptClass to
acceptedClass (#9402)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 67b0230 Rename acceptClass to acceptedClass (#9402)
67b0230 is described below
commit 67b0230265fe311aa084500f83164830a619bab8
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Feb 9 17:29:52 2021 +0800
Rename acceptClass to acceptedClass (#9402)
* For code format
* Rename acceptClass to acceptedClass
---
.../apache/shardingsphere/infra/yaml/engine/YamlEngine.java | 12 ++++++------
.../constructor/ShardingSphereFilterYamlConstructor.java | 12 ++++++------
.../src/test/resources/env/encrypt/scenario-env.properties | 1 -
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngine.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngine.java
index 0d5ad62..a069621 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngine.java
@@ -93,23 +93,23 @@ public final class YamlEngine {
*
* @param yamlContent YAML content
* @param classType class type
- * @param acceptClasses accept classes
+ * @param acceptedClasses accepted classes
* @param <T> type of class
* @return object from YAML
*/
- public static <T> T unmarshal(final String yamlContent, final Class<T> classType, final Collection<Class<?>> acceptClasses) {
- return new Yaml(new ShardingSphereFilterYamlConstructor(classType, acceptClasses)).loadAs(yamlContent, classType);
+ public static <T> T unmarshal(final String yamlContent, final Class<T> classType, final Collection<Class<?>> acceptedClasses) {
+ return new Yaml(new ShardingSphereFilterYamlConstructor(classType, acceptedClasses)).loadAs(yamlContent, classType);
}
/**
* Unmarshal YAML.
*
* @param yamlContent YAML content
- * @param acceptClasses accept classes
+ * @param acceptedClasses accepted classes
* @return map from YAML
*/
- public static Map<?, ?> unmarshal(final String yamlContent, final Collection<Class<?>> acceptClasses) {
- return Strings.isNullOrEmpty(yamlContent) ? new LinkedHashMap<>() : (Map) new Yaml(new ShardingSphereFilterYamlConstructor(acceptClasses)).load(yamlContent);
+ public static Map<?, ?> unmarshal(final String yamlContent, final Collection<Class<?>> acceptedClasses) {
+ return Strings.isNullOrEmpty(yamlContent) ? new LinkedHashMap<>() : (Map) new Yaml(new ShardingSphereFilterYamlConstructor(acceptedClasses)).load(yamlContent);
}
/**
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
index b76ff04..5e1006f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
@@ -24,21 +24,21 @@ import java.util.Collection;
*/
public final class ShardingSphereFilterYamlConstructor extends ShardingSphereYamlConstructor {
- private final Collection<Class<?>> acceptClasses;
+ private final Collection<Class<?>> acceptedClasses;
- public ShardingSphereFilterYamlConstructor(final Class<?> rootClass, final Collection<Class<?>> acceptClasses) {
+ public ShardingSphereFilterYamlConstructor(final Class<?> rootClass, final Collection<Class<?>> acceptedClasses) {
super(rootClass);
- this.acceptClasses = acceptClasses;
+ this.acceptedClasses = acceptedClasses;
}
- public ShardingSphereFilterYamlConstructor(final Collection<Class<?>> acceptClasses) {
+ public ShardingSphereFilterYamlConstructor(final Collection<Class<?>> acceptedClasses) {
super(Object.class);
- this.acceptClasses = acceptClasses;
+ this.acceptedClasses = acceptedClasses;
}
@Override
protected Class<?> getClassForName(final String name) throws ClassNotFoundException {
- for (Class<?> each : acceptClasses) {
+ for (Class<?> each : acceptedClasses) {
if (name.equals(each.getName())) {
return super.getClassForName(name);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/scenario-env.properties b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/scenario-env.properties
index 7ca6e1f..51acf7b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/scenario-env.properties
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/scenario-env.properties
@@ -39,4 +39,3 @@ it.encrypt.proxy.host=127.0.0.1
it.encrypt.proxy.port=33470
it.encrypt.proxy.username=root
it.encrypt.proxy.password=root
-