Rename ClusterContainerConfigurationFactory (#36432)

* Rename ClusterContainerConfigurationFactory

* Rename ClusterContainerConfigurationFactory

Author: terrymanu

proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutorTest.java

@@ -36,7 +36,6 @@
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
 import org.apache.shardingsphere.test.infra.framework.mock.AutoMockExtension;
 import org.apache.shardingsphere.test.infra.framework.mock.StaticMockSettings;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -48,7 +47,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@Disabled("fix this unit test @menghaoran")
 @ExtendWith(AutoMockExtension.class)
 @StaticMockSettings(ProxyContext.class)
 class SetDistVariableExecutorTest {
@@ -60,7 +58,6 @@ void assertExecuteWithConfigurationKey() throws SQLException {
         SetDistVariableStatement statement = new SetDistVariableStatement("proxy_frontend_flush_threshold", "1024");
         ContextManager contextManager = mockContextManager();
         executor.executeUpdate(statement, contextManager);
-        assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getProps().get("proxy-frontend-flush-threshold"), is(1024));
         assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD), is(1024));
     }
 
@@ -69,7 +66,6 @@ void assertExecuteWithTemporaryConfigurationKey() throws SQLException {
         SetDistVariableStatement statement = new SetDistVariableStatement("proxy_meta_data_collector_enabled", "false");
         ContextManager contextManager = mockContextManager();
         executor.executeUpdate(statement, contextManager);
-        assertThat(contextManager.getMetaDataContexts().getMetaData().getTemporaryProps().getProps().get("proxy-meta-data-collector-enabled"), is(Boolean.FALSE));
         assertThat(contextManager.getMetaDataContexts().getMetaData().getTemporaryProps().getValue(TemporaryConfigurationPropertyKey.PROXY_META_DATA_COLLECTOR_ENABLED), is(false));
     }
 

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java

@@ -23,7 +23,6 @@
 import org.apache.shardingsphere.database.connector.opengauss.type.OpenGaussDatabaseType;
 import org.apache.shardingsphere.database.connector.postgresql.type.PostgreSQLDatabaseType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
 
@@ -53,7 +52,6 @@ private static String getProxyDatasourceName(final DatabaseType databaseType) {
 
     private static Map<String, String> getMountedResource(final DatabaseType databaseType) {
         Map<String, String> result = new HashMap<>(2, 1F);
-        result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
         result.put(String.format("env/%s/global.yaml", databaseType.getType().toLowerCase()), ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
         result.put("env/logback.xml", ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
         return result;

test/e2e/env/src/test/resources/env/log/logback.xml

@@ -38,7 +38,7 @@
 import org.apache.shardingsphere.test.e2e.transaction.env.TransactionE2EEnvironment;
 import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionE2EEnvTypeEnum;
 import org.apache.shardingsphere.test.e2e.transaction.framework.container.config.StorageContainerConfigurationFactory;
-import org.apache.shardingsphere.test.e2e.transaction.framework.container.config.proxy.ProxyClusterContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.transaction.framework.container.config.proxy.TransactionProxyClusterContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
 
 import java.net.URL;
@@ -74,7 +74,7 @@ public DockerContainerComposer(final TransactionTestParameter testParam) {
         }
         if (AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
             jdbcContainer = null;
-            AdaptorContainerConfiguration containerConfig = ProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(), databaseType, testParam.getPortBindings());
+            AdaptorContainerConfiguration containerConfig = TransactionProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(), databaseType, testParam.getPortBindings());
             proxyContainer =
                     AdapterContainerFactory.newInstance(AdapterMode.CLUSTER, AdapterType.PROXY, databaseType, testParam.getScenario(), containerConfig, storageContainer, envType.name());
             if (proxyContainer instanceof DockerITContainer) {

test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java

@@ -32,7 +32,7 @@
  * Transaction proxy cluster container configuration factory.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ProxyClusterContainerConfigurationFactory {
+public final class TransactionProxyClusterContainerConfigurationFactory {
 
     /**
      * Create instance of adaptor container configuration.
@@ -43,9 +43,7 @@ public final class ProxyClusterContainerConfigurationFactory {
      * @return created instance
      */
     public static AdaptorContainerConfiguration newInstance(final String scenario, final DatabaseType databaseType, final List<String> portBindings) {
-        String containerCommand = "";
-        return new AdaptorContainerConfiguration(getProxyDatasourceName(scenario), portBindings, getMountedResource(scenario, databaseType), AdapterContainerUtils.getAdapterContainerImage(),
-                containerCommand);
+        return new AdaptorContainerConfiguration(getProxyDatasourceName(scenario), portBindings, getMountedResource(scenario, databaseType), AdapterContainerUtils.getAdapterContainerImage(), "");
     }
 
     private static String getProxyDatasourceName(final String scenario) {

test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java

@@ -34,7 +34,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
 import org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import org.apache.shardingsphere.test.e2e.env.container.config.ProxyClusterContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyClusterContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
@@ -65,7 +65,7 @@ public ClusterContainerComposer(final String scenario, final DatabaseType databa
         } else {
             storageContainer = containers.registerContainer(new NativeStorageContainer(databaseType, scenario));
         }
-        AdaptorContainerConfiguration containerConfig = ProxyClusterContainerConfigurationFactory.newInstance(scenario, databaseType, AdapterContainerUtils.getAdapterContainerImage());
+        AdaptorContainerConfiguration containerConfig = SQLE2EProxyClusterContainerConfigurationFactory.newInstance(scenario, databaseType, AdapterContainerUtils.getAdapterContainerImage());
         AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario, containerConfig, storageContainer, envType.name());
         if (adapterContainer instanceof DockerITContainer) {
             ((DockerITContainer) adapterContainer).dependsOn(governanceContainer, storageContainer);

test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java renamed to test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyClusterContainerConfigurationFactory.java

@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import org.apache.shardingsphere.test.e2e.env.container.config.ProxyStandaloneContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyStandaloneContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
@@ -57,7 +57,7 @@ public StandaloneContainerComposer(final String scenario, final DatabaseType dat
             storageContainer = containers.registerContainer(new NativeStorageContainer(databaseType, scenario));
         }
         adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario,
-                ProxyStandaloneContainerConfigurationFactory.newInstance(scenario, databaseType), storageContainer, envType.name()));
+                SQLE2EProxyStandaloneContainerConfigurationFactory.newInstance(scenario, databaseType), storageContainer, envType.name()));
         if (adapterContainer instanceof DockerITContainer) {
             ((DockerITContainer) adapterContainer).dependsOn(storageContainer);
         }

test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java

@@ -30,10 +30,10 @@
 import java.util.Map;
 
 /**
- * Suite proxy cluster container configuration factory.
+ * SQL E2E Proxy cluster container configuration factory.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ProxyClusterContainerConfigurationFactory {
+public final class SQLE2EProxyClusterContainerConfigurationFactory {
 
     /**
      * Create instance of adaptor container configuration.

test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java

@@ -31,10 +31,10 @@
 import java.util.Map;
 
 /**
- * Suite proxy standalone container configuration factory.
+ * SQL E2E Proxy standalone container configuration factory.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ProxyStandaloneContainerConfigurationFactory {
+public final class SQLE2EProxyStandaloneContainerConfigurationFactory {
 
     /**
      * Create instance of adaptor container configuration.