This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 603b6756351 Refactor AdapterContainerFactory (#36625)
603b6756351 is described below
commit 603b67563515b0cab011e975cd9bd223716730b9
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 19 02:19:51 2025 +0800
Refactor AdapterContainerFactory (#36625)
* Refactor AdapterContainerFactory
* Refactor AdapterContainerFactory
* Refactor AdapterContainerFactory
---
.../env/container/adapter/AdapterContainerFactory.java | 18 ++++++++++--------
.../env/container/governance/GovernanceContainer.java | 2 +-
.../governance/option/GovernanceContainerOption.java | 7 +++++++
.../impl/ZookeeperGovernanceContainerOption.java | 5 +++++
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
index aba86e9fd0d..5876acd21f3 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
@@ -21,13 +21,13 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereMultiProxyClusterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyClusterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyStandaloneContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
@@ -55,12 +55,7 @@ public final class AdapterContainerFactory {
final
AdaptorContainerConfiguration containerConfig, final StorageContainer
storageContainer, final String envType) {
switch (adapter) {
case PROXY:
- if
(ClusterEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)) {
- return new
ShardingSphereProxyEmbeddedContainer(databaseType, containerConfig);
- }
- return AdapterMode.CLUSTER == mode
- ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig)
- : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
+ return newProxyInstance(mode, databaseType, containerConfig,
envType);
case PROXY_RANDOM:
return new
ShardingSphereMultiProxyClusterContainer(databaseType, containerConfig);
case JDBC:
@@ -69,4 +64,11 @@ public final class AdapterContainerFactory {
throw new RuntimeException(String.format("Unknown adapter
`%s`.", adapter));
}
}
+
+ private static AdapterContainer newProxyInstance(final AdapterMode mode,
final DatabaseType databaseType, final AdaptorContainerConfiguration
containerConfig, final String envType) {
+ if (ClusterEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)) {
+ return new ShardingSphereProxyEmbeddedContainer(databaseType,
containerConfig);
+ }
+ return AdapterMode.CLUSTER == mode ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig) : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
+ }
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
index ef28b5b9d66..4643cc84996 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
@@ -46,6 +46,6 @@ public final class GovernanceContainer extends
DockerITContainer {
@Override
public String getAbbreviation() {
- return getName();
+ return option.getAbbreviation();
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/GovernanceContainerOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/GovernanceContainerOption.java
index 7ef2bfefa8d..dace431feb5 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/GovernanceContainerOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/GovernanceContainerOption.java
@@ -46,4 +46,11 @@ public interface GovernanceContainerOption extends TypedSPI {
* @return success log pattern
*/
String getSuccessLogPattern();
+
+ /**
+ * Get abbreviation.
+ *
+ * @return abbreviation
+ */
+ String getAbbreviation();
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/impl/ZookeeperGovernanceContainerOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/impl/ZookeeperGovernanceContainerOption.java
index 5af42caf6ca..8373d96351a 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/impl/ZookeeperGovernanceContainerOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/option/impl/ZookeeperGovernanceContainerOption.java
@@ -39,6 +39,11 @@ public final class ZookeeperGovernanceContainerOption
implements GovernanceConta
return ".*PrepRequestProcessor \\(sid:[0-9]+\\) started.*";
}
+ @Override
+ public String getAbbreviation() {
+ return "zk";
+ }
+
@Override
public Object getType() {
return "ZooKeeper";
