You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/10/06 11:05:24 UTC
[shardingsphere] branch master updated: Rename YamlMigrationJobConfigurationSwapperTest (#21359)
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 0cc6d0d68c2 Rename YamlMigrationJobConfigurationSwapperTest (#21359)
0cc6d0d68c2 is described below
commit 0cc6d0d68c2b762714b38c3c14062c4c68cf6b8c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Oct 6 19:05:15 2022 +0800
Rename YamlMigrationJobConfigurationSwapperTest (#21359)
---
.../yaml/YamlConsistencyCheckJobConfiguration.java | 2 --
.../job/yaml/YamlMigrationJobConfiguration.java | 1 -
.../yaml/YamlMigrationJobConfigurationSwapper.java | 1 -
.../config/yaml/YamlJdbcConfiguration.java | 1 +
.../YamlMigrationJobConfigurationSwapperTest.java} | 21 +++++----------------
5 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlConsistencyCheckJobConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlConsistencyCheckJobConfiguration.java
index 69ace660ef1..845bad26757 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlConsistencyCheckJobConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlConsistencyCheckJobConfiguration.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.data.pipeline.api.config.job.yaml;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import lombok.extern.slf4j.Slf4j;
import java.util.Properties;
@@ -29,7 +28,6 @@ import java.util.Properties;
*/
@Getter
@Setter
-@Slf4j
@ToString
public final class YamlConsistencyCheckJobConfiguration implements YamlPipelineJobConfiguration {
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfiguration.java
index 34d13bc8d97..38c4b71a981 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfiguration.java
@@ -32,7 +32,6 @@ import java.util.List;
*/
@Getter
@Setter
-@Slf4j
@ToString(exclude = {"source", "target"})
public final class YamlMigrationJobConfiguration implements YamlPipelineJobConfiguration {
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapper.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapper.java
index e11a5709f84..6d894951dc1 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapper.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapper.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwappe
/**
* YAML migration job configuration swapper.
*/
-// TODO add test
public final class YamlMigrationJobConfigurationSwapper implements YamlConfigurationSwapper<YamlMigrationJobConfiguration, MigrationJobConfiguration> {
private final YamlPipelineDataSourceConfigurationSwapper dataSourceConfigSwapper = new YamlPipelineDataSourceConfigurationSwapper();
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/yaml/YamlJdbcConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/yaml/YamlJdbcConfiguration.java
index a6248669736..4c09bda8593 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/yaml/YamlJdbcConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/yaml/YamlJdbcConfiguration.java
@@ -39,6 +39,7 @@ public final class YamlJdbcConfiguration implements YamlConfiguration {
*
* @param url JDBC URL
*/
+ // TODO check why need alias here. Use DataSourcePoolCreator if alias necessary, or remove alias otherwise
public void setUrl(final String url) {
this.jdbcUrl = url;
}
diff --git a/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/MigrationJobConfigurationTest.java b/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapperTest.java
similarity index 53%
rename from kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/MigrationJobConfigurationTest.java
rename to kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapperTest.java
index 2d40efa6426..509f1bc4d56 100644
--- a/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/MigrationJobConfigurationTest.java
+++ b/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/job/yaml/YamlMigrationJobConfigurationSwapperTest.java
@@ -15,31 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.api.config;
+package org.apache.shardingsphere.data.pipeline.api.config.job.yaml;
import org.apache.shardingsphere.data.pipeline.api.config.job.MigrationJobConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlMigrationJobConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlMigrationJobConfigurationSwapper;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class MigrationJobConfigurationTest {
-
- private static final YamlMigrationJobConfigurationSwapper JOB_CONFIG_SWAPPER = new YamlMigrationJobConfigurationSwapper();
-
- @Test
- public void assertGetJobShardingCountByNull() {
- YamlMigrationJobConfiguration yamlJobConfig = new YamlMigrationJobConfiguration();
- MigrationJobConfiguration jobConfig = JOB_CONFIG_SWAPPER.swapToObject(yamlJobConfig);
- assertThat(jobConfig.getJobShardingCount(), is(1));
- }
+public final class YamlMigrationJobConfigurationSwapperTest {
@Test
- public void assertGetJobShardingCount() {
+ public void assertSwapToObject() {
YamlMigrationJobConfiguration yamlJobConfig = new YamlMigrationJobConfiguration();
- MigrationJobConfiguration jobConfig = JOB_CONFIG_SWAPPER.swapToObject(yamlJobConfig);
- assertThat(jobConfig.getJobShardingCount(), is(1));
+ MigrationJobConfiguration actual = new YamlMigrationJobConfigurationSwapper().swapToObject(yamlJobConfig);
+ assertThat(actual.getJobShardingCount(), is(1));
}
}