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 574ca697390 Refactor PipelineBaseContainerComposer (#36587) 574ca697390 is described below commit 574ca6973901a284d58bf7ec121e9847f66477b4 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Tue Sep 16 19:11:20 2025 +0800 Refactor PipelineBaseContainerComposer (#36587) --- .../framework/container/compose/PipelineDockerContainerComposer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineDockerContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineDockerContainerComposer.java index b42bbc84dd7..44f5cf71806 100644 --- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineDockerContainerComposer.java +++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineDockerContainerComposer.java @@ -20,6 +20,7 @@ package org.apache.shardingsphere.test.e2e.operation.pipeline.framework.containe import lombok.Getter; import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.database.connector.core.type.DatabaseType; +import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration; import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer; @@ -53,10 +54,8 @@ public final class PipelineDockerContainerComposer extends PipelineBaseContainer public PipelineDockerContainerComposer(final DatabaseType databaseType, final String storageContainerImage, final int storageContainerCount) { this.databaseType = databaseType; + ShardingSpherePreconditions.checkState(storageContainerCount >= 1, () -> new InvalidParameterException("storageContainerCount must >= 1")); GovernanceContainer governanceContainer = getContainers().registerContainer(new ZookeeperContainer()); - if (storageContainerCount < 1) { - throw new InvalidParameterException("storageContainerCount must >= 1"); - } for (int i = 0; i < storageContainerCount; i++) { DockerStorageContainer storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance( databaseType, storageContainerImage, DatabaseTypedSPILoader.findService(StorageContainerConfigurationOption.class, databaseType).orElse(null), null));