You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/05 16:10:11 UTC
[shardingsphere] branch master updated: Refactor discovery's class names (#22680)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 2dffb62bb6a Refactor discovery's class names (#22680)
2dffb62bb6a is described below
commit 2dffb62bb6ab829745780706e53570f9f868abc3
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 6 00:10:03 2022 +0800
Refactor discovery's class names (#22680)
* Refactor discovery's class names
---
.../test/e2e/discovery/build/DiscoveryRuleBuilder.java | 4 ++--
.../base/{BaseE2EIT.java => BaseDiscoveryE2EIT.java} | 8 ++++----
...GRGeneralE2EIT.java => MGRGeneralDiscoveryE2EIT.java} | 10 ++++------
.../discovery/cases/mysql/env/MySQLMGREnvironment.java | 4 ++--
...Environment.java => DiscoveryE2ETestEnvironment.java} | 16 ++++++++--------
...{E2EEnvTypeEnum.java => DiscoveryE2EEnvTypeEnum.java} | 2 +-
.../test/e2e/discovery/util/DiscoveryContainerUtil.java | 3 ++-
7 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
index 4d9bfa45da6..3496d324f96 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.discovery.build;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
-import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseDiscoveryE2EIT;
import org.apache.shardingsphere.test.e2e.discovery.command.DiscoveryDistSQLCommand;
import javax.sql.DataSource;
@@ -40,7 +40,7 @@ public final class DiscoveryRuleBuilder {
public DiscoveryRuleBuilder(final DataSource proxyDataSource) {
this.proxyDataSource = proxyDataSource;
- discoveryDistSQLCommand = JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/discovery-command.xml")), DiscoveryDistSQLCommand.class);
+ discoveryDistSQLCommand = JAXB.unmarshal(Objects.requireNonNull(BaseDiscoveryE2EIT.class.getClassLoader().getResource("env/common/discovery-command.xml")), DiscoveryDistSQLCommand.class);
}
/**
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseDiscoveryE2EIT.java
similarity index 96%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseDiscoveryE2EIT.java
index 31f44c467b4..f8e3277cf28 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseDiscoveryE2EIT.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.discovery.build.DiscoveryRuleBuilder;
import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
-import org.apache.shardingsphere.test.e2e.discovery.env.E2ETestEnvironment;
+import org.apache.shardingsphere.test.e2e.discovery.env.DiscoveryE2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.discovery.framework.container.compose.BaseContainerComposer;
import org.apache.shardingsphere.test.e2e.discovery.framework.container.compose.DockerContainerComposer;
import org.apache.shardingsphere.test.e2e.discovery.framework.parameter.DiscoveryTestParameter;
@@ -47,9 +47,9 @@ import static org.junit.Assert.assertNotEquals;
@Getter(AccessLevel.PROTECTED)
@Slf4j
-public abstract class BaseE2EIT {
+public abstract class BaseDiscoveryE2EIT {
- protected static final E2ETestEnvironment ENV = E2ETestEnvironment.getInstance();
+ protected static final DiscoveryE2ETestEnvironment ENV = DiscoveryE2ETestEnvironment.getInstance();
private final BaseContainerComposer containerComposer;
@@ -59,7 +59,7 @@ public abstract class BaseE2EIT {
private final DataSource proxyDataSource;
- public BaseE2EIT(final DiscoveryTestParameter testParameter) {
+ public BaseDiscoveryE2EIT(final DiscoveryTestParameter testParameter) {
databaseType = testParameter.getDatabaseType();
containerComposer = new DockerContainerComposer(testParameter.getScenario(), testParameter.getDatabaseType(), testParameter.getStorageContainerImage());
containerComposer.start();
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/MGRGeneralDiscoveryE2EIT.java
similarity index 90%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/MGRGeneralDiscoveryE2EIT.java
index d6fc1580948..ef28a6fd08f 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/MGRGeneralDiscoveryE2EIT.java
@@ -17,11 +17,10 @@
package org.apache.shardingsphere.test.e2e.discovery.cases.mysql;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironmentFactory;
-import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseDiscoveryE2EIT;
import org.apache.shardingsphere.test.e2e.discovery.framework.parameter.DiscoveryTestParameter;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,15 +32,14 @@ import java.util.Collection;
import java.util.LinkedList;
@RunWith(Parameterized.class)
-@Slf4j
-public final class DiscoveryMGRGeneralE2EIT extends BaseE2EIT {
+public final class MGRGeneralDiscoveryE2EIT extends BaseDiscoveryE2EIT {
- public DiscoveryMGRGeneralE2EIT(final DiscoveryTestParameter testParameter) {
+ public MGRGeneralDiscoveryE2EIT(final DiscoveryTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<DiscoveryTestParameter> getParameters() {
+ public static Collection<DiscoveryTestParameter> getTestParameters() {
Collection<DiscoveryTestParameter> result = new LinkedList<>();
MySQLDatabaseType databaseType = new MySQLDatabaseType();
for (String each : ENV.listStorageContainerImages(databaseType)) {
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
index 057e89f5f4e..182aed9ea95 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.discovery.cases.mysql.env;
import com.google.common.base.Splitter;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseDiscoveryE2EIT;
import org.apache.shardingsphere.test.e2e.discovery.command.MGRPrimaryReplicaCommand;
import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
@@ -51,7 +51,7 @@ public final class MySQLMGREnvironment implements DatabaseClusterEnvironment {
primaryDataSource = dataSources.get(0);
replicationDataSources = dataSources.subList(1, dataSources.size());
this.dataSources = getAllDataSources();
- mgrPrimaryReplicaCommand = JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/mgr-primary-replica-command.xml")),
+ mgrPrimaryReplicaCommand = JAXB.unmarshal(Objects.requireNonNull(BaseDiscoveryE2EIT.class.getClassLoader().getResource("env/common/mgr-primary-replica-command.xml")),
MGRPrimaryReplicaCommand.class);
buildMGRPrimaryDataSource();
buildMGRReplicaDataSources();
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/DiscoveryE2ETestEnvironment.java
similarity index 78%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/DiscoveryE2ETestEnvironment.java
index b40898b0298..96ee31d2054 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/DiscoveryE2ETestEnvironment.java
@@ -22,7 +22,7 @@ import lombok.Getter;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.discovery.env.enums.E2EEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.discovery.env.enums.DiscoveryE2EEnvTypeEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -33,26 +33,26 @@ import java.util.stream.Collectors;
@Getter
@Slf4j
-public final class E2ETestEnvironment {
+public final class DiscoveryE2ETestEnvironment {
- private static final E2ETestEnvironment INSTANCE = new E2ETestEnvironment();
+ private static final DiscoveryE2ETestEnvironment INSTANCE = new DiscoveryE2ETestEnvironment();
private final Properties props;
- private final E2EEnvTypeEnum itEnvType;
+ private final DiscoveryE2EEnvTypeEnum itEnvType;
private final List<String> mysqlVersions;
- private E2ETestEnvironment() {
+ private DiscoveryE2ETestEnvironment() {
props = loadProperties();
- itEnvType = E2EEnvTypeEnum.valueOf(props.getProperty("it.env.type", E2EEnvTypeEnum.NONE.name()).toUpperCase());
+ itEnvType = DiscoveryE2EEnvTypeEnum.valueOf(props.getProperty("it.env.type", DiscoveryE2EEnvTypeEnum.NONE.name()).toUpperCase());
mysqlVersions = Arrays.stream(props.getOrDefault("it.docker.mysql.version", "").toString().split(",")).filter(each -> !Strings.isNullOrEmpty(each)).collect(Collectors.toList());
}
@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream = E2ETestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
+ try (InputStream inputStream = DiscoveryE2ETestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
result.load(inputStream);
}
for (String each : System.getProperties().stringPropertyNames()) {
@@ -66,7 +66,7 @@ public final class E2ETestEnvironment {
*
* @return singleton instance
*/
- public static E2ETestEnvironment getInstance() {
+ public static DiscoveryE2ETestEnvironment getInstance() {
return INSTANCE;
}
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/DiscoveryE2EEnvTypeEnum.java
similarity index 95%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/DiscoveryE2EEnvTypeEnum.java
index 63d92a9c95c..df499e37b01 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/DiscoveryE2EEnvTypeEnum.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.discovery.env.enums;
-public enum E2EEnvTypeEnum {
+public enum DiscoveryE2EEnvTypeEnum {
NONE, DOCKER, NATIVE
}
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
index ebcd9e0ca37..7570267506b 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.discovery.util;
+import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import java.io.File;
@@ -27,7 +28,7 @@ import java.util.Map;
/**
* Discovery container utility.
*/
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DiscoveryContainerUtil {
/**