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 09bfcd9eb39 YamlAlgorithmConfiguration should only have default
constructor (#25373)
09bfcd9eb39 is described below
commit 09bfcd9eb39f4dbeb79cfb377b15af795240af59
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Apr 27 22:09:27 2023 +0800
YamlAlgorithmConfiguration should only have default constructor (#25373)
---
.../config/pojo/algorithm/YamlAlgorithmConfiguration.java | 4 ----
.../algorithm/YamlAlgorithmConfigurationSwapperTest.java | 4 +++-
.../YamlAuthorityRuleConfigurationSwapperTest.java | 4 +++-
.../config/process/PipelineProcessConfigurationUtils.java | 5 ++++-
.../YamlPipelineProcessConfigurationSwapperTest.java | 15 ++++++++++++---
.../PipelineProcessConfigurationPersistServiceTest.java | 5 ++---
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
index 21134fb1d93..811693561bf 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.infra.yaml.config.pojo.algorithm;
-import lombok.AllArgsConstructor;
import lombok.Getter;
-import lombok.NoArgsConstructor;
import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
@@ -28,8 +26,6 @@ import java.util.Properties;
/**
* Algorithm configuration for YAML.
*/
-@AllArgsConstructor
-@NoArgsConstructor
@Getter
@Setter
public final class YamlAlgorithmConfiguration implements YamlConfiguration {
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/YamlAlgorithmConfigurationSwapperTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/YamlAlgorithmConfigurationSwapperTest.java
index b2525a75cc5..8a4012d10d8 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/YamlAlgorithmConfigurationSwapperTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/YamlAlgorithmConfigurationSwapperTest.java
@@ -38,7 +38,9 @@ class YamlAlgorithmConfigurationSwapperTest {
@Test
void assertSwapToObject() {
- YamlAlgorithmConfiguration yamlConfig = new
YamlAlgorithmConfiguration("TEST", PropertiesBuilder.build(new Property("key",
"value")));
+ YamlAlgorithmConfiguration yamlConfig = new
YamlAlgorithmConfiguration();
+ yamlConfig.setType("TEST");
+ yamlConfig.setProps(PropertiesBuilder.build(new Property("key",
"value")));
AlgorithmConfiguration actual = new
YamlAlgorithmConfigurationSwapper().swapToObject(yamlConfig);
assertThat(actual.getType(), is("TEST"));
assertThat(actual.getProps().getProperty("key"), is("value"));
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
index 55990bca6a5..2203e49020d 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
@@ -48,7 +48,9 @@ class YamlAuthorityRuleConfigurationSwapperTest {
void assertSwapToObject() {
YamlAuthorityRuleConfiguration authorityRuleConfig = new
YamlAuthorityRuleConfiguration();
authorityRuleConfig.setUsers(Collections.singletonList(getYamlUser()));
- authorityRuleConfig.setPrivilege(new
YamlAlgorithmConfiguration("type", new Properties()));
+ YamlAlgorithmConfiguration yamlAlgorithmConfig = new
YamlAlgorithmConfiguration();
+ yamlAlgorithmConfig.setType("type");
+ authorityRuleConfig.setPrivilege(yamlAlgorithmConfig);
AuthorityRuleConfiguration actual =
swapper.swapToObject(authorityRuleConfig);
assertThat(actual.getUsers().size(), is(1));
assertNotNull(actual.getAuthorityProvider());
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java
index c48176c49b9..32f1224f522 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java
@@ -65,9 +65,12 @@ public final class PipelineProcessConfigurationUtils {
yamlConfig.getWrite().fillInNullFieldsWithDefaultValue();
}
if (null == yamlConfig.getStreamChannel()) {
+ YamlAlgorithmConfiguration yamlAlgorithmConfig = new
YamlAlgorithmConfiguration();
+ yamlAlgorithmConfig.setType("MEMORY");
Properties props = new Properties();
props.setProperty("block-queue-size", "10000");
- yamlConfig.setStreamChannel(new
YamlAlgorithmConfiguration("MEMORY", props));
+ yamlAlgorithmConfig.setProps(props);
+ yamlConfig.setStreamChannel(yamlAlgorithmConfig);
}
}
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineProcessConfigurationSwapperTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineProcessConfigurationSwapperTest.java
index 7f2d2aa9690..ea7c19314f7 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineProcessConfigurationSwapperTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineProcessConfigurationSwapperTest.java
@@ -56,13 +56,22 @@ class YamlPipelineProcessConfigurationSwapperTest {
private YamlPipelineProcessConfiguration createYamlConfiguration() {
YamlPipelineReadConfiguration yamlInputConfig =
YamlPipelineReadConfiguration.buildWithDefaultValue();
- yamlInputConfig.setRateLimiter(new YamlAlgorithmConfiguration("INPUT",
PropertiesBuilder.build(new Property("batch-size", "1000"), new Property("qps",
"50"))));
+ YamlAlgorithmConfiguration yamlAlgorithmConfig = new
YamlAlgorithmConfiguration();
+ yamlAlgorithmConfig.setType("INPUT");
+ yamlAlgorithmConfig.setProps(PropertiesBuilder.build(new
Property("batch-size", "1000"), new Property("qps", "50")));
+ yamlInputConfig.setRateLimiter(yamlAlgorithmConfig);
YamlPipelineProcessConfiguration result = new
YamlPipelineProcessConfiguration();
result.setRead(yamlInputConfig);
YamlPipelineWriteConfiguration yamlOutputConfig =
YamlPipelineWriteConfiguration.buildWithDefaultValue();
- yamlOutputConfig.setRateLimiter(new
YamlAlgorithmConfiguration("OUTPUT", PropertiesBuilder.build(new
Property("batch-size", "1000"), new Property("qps", "50"))));
+ YamlAlgorithmConfiguration rateLimiterConfig = new
YamlAlgorithmConfiguration();
+ rateLimiterConfig.setType("OUTPUT");
+ rateLimiterConfig.setProps(PropertiesBuilder.build(new
Property("batch-size", "1000"), new Property("qps", "50")));
+ yamlOutputConfig.setRateLimiter(rateLimiterConfig);
result.setWrite(yamlOutputConfig);
- result.setStreamChannel(new YamlAlgorithmConfiguration("MEMORY",
PropertiesBuilder.build(new Property("block-queue-size", "10000"))));
+ YamlAlgorithmConfiguration streamChannelConfig = new
YamlAlgorithmConfiguration();
+ streamChannelConfig.setType("MEMORY");
+ streamChannelConfig.setProps(PropertiesBuilder.build(new
Property("block-queue-size", "10000")));
+ result.setStreamChannel(streamChannelConfig);
return result;
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
index 112f87690d1..1b550fab451 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
@@ -31,8 +31,6 @@ import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContext
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import java.util.Properties;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -52,7 +50,8 @@ class PipelineProcessConfigurationPersistServiceTest {
yamlProcessConfig.setRead(yamlReadConfig);
YamlPipelineWriteConfiguration yamlWriteConfig =
YamlPipelineWriteConfiguration.buildWithDefaultValue();
yamlProcessConfig.setWrite(yamlWriteConfig);
- YamlAlgorithmConfiguration yamlStreamChannel = new
YamlAlgorithmConfiguration("MEMORY", new Properties());
+ YamlAlgorithmConfiguration yamlStreamChannel = new
YamlAlgorithmConfiguration();
+ yamlStreamChannel.setType("MEMORY");
yamlProcessConfig.setStreamChannel(yamlStreamChannel);
String expectedYamlText = YamlEngine.marshal(yamlProcessConfig);
PipelineProcessConfiguration processConfig = new
YamlPipelineProcessConfigurationSwapper().swapToObject(yamlProcessConfig);
