This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 ccf13cd Remove useless param in ComposedContainer (#15326)
ccf13cd is described below
commit ccf13cd9ffadbf0c4a7b8c531e70673e421e39db
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Feb 9 20:46:31 2022 +0800
Remove useless param in ComposedContainer (#15326)
---
.../test/integration/framework/compose/ComposedContainer.java | 7 +------
.../framework/compose/mode/ClusterComposedContainer.java | 4 ++--
.../framework/compose/mode/MemoryComposedContainer.java | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
index 204a608..abc453b 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
@@ -22,7 +22,6 @@ import lombok.Getter;
import
org.apache.shardingsphere.test.integration.framework.container.ShardingSphereContainers;
import
org.apache.shardingsphere.test.integration.framework.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.integration.framework.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.junit.rules.ExternalResource;
import javax.sql.DataSource;
@@ -37,15 +36,11 @@ import java.util.function.Consumer;
public abstract class ComposedContainer extends ExternalResource implements
Closeable {
@Getter(AccessLevel.PROTECTED)
- private final ParameterizedArray parameterizedArray;
-
- @Getter(AccessLevel.PROTECTED)
private final ShardingSphereContainers containers;
private volatile boolean executed;
- public ComposedContainer(final String suiteName, final ParameterizedArray
parameterizedArray) {
- this.parameterizedArray = parameterizedArray;
+ public ComposedContainer(final String suiteName) {
containers = new ShardingSphereContainers(suiteName);
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
index c00cb56..846ca08 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
@@ -49,13 +49,13 @@ public final class ClusterComposedContainer extends
ComposedContainer {
private final ZookeeperContainer zookeeperContainer;
public ClusterComposedContainer(final String suiteName, final
ParameterizedArray parameterizedArray) {
- super(suiteName, parameterizedArray);
+ super(suiteName);
this.storageContainer = getContainers().registerContainer(
StorageContainerFactory.newInstance(parameterizedArray),
parameterizedArray.getDatabaseType().getName().toLowerCase() + "." +
parameterizedArray.getScenario() + ".host");
this.adapterContainer =
getContainers().registerContainer(AdapterContainerFactory.newInstance(parameterizedArray),
"adapter");
this.storageContainer.setNetworkAliases(Collections.singletonList(parameterizedArray.getDatabaseType().getName().toLowerCase()
+ ".sharding_governance.host"));
// TODO support other types of governance
- zookeeperContainer = getContainers().registerContainer(new
ZookeeperContainer(getParameterizedArray()), "zk");
+ zookeeperContainer = getContainers().registerContainer(new
ZookeeperContainer(parameterizedArray), "zk");
if ("proxy".equals(parameterizedArray.getAdapter())) {
adapterContainerForReader = getContainers().registerContainer(new
ShardingSphereProxyContainer("ShardingSphere-Proxy-1", parameterizedArray),
"ShardingSphere-Proxy-1");
adapterContainerForReader.dependsOn(storageContainer,
zookeeperContainer);
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
index be14e9f..511ae82 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
@@ -36,7 +36,7 @@ public final class MemoryComposedContainer extends
ComposedContainer {
private final AdapterContainer adapterContainer;
public MemoryComposedContainer(final String suiteName, final
ParameterizedArray parameterizedArray) {
- super(suiteName, parameterizedArray);
+ super(suiteName);
this.storageContainer = getContainers().registerContainer(
StorageContainerFactory.newInstance(parameterizedArray),
parameterizedArray.getDatabaseType().getName().toLowerCase() + "." +
parameterizedArray.getScenario() + ".host");
this.adapterContainer =
getContainers().registerContainer(AdapterContainerFactory.newInstance(parameterizedArray),
"adapter");
