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 d2202ff8b2d Merge SQLE2EProxyClusterContainerConfigurationFactory and
SQLE2EProxyStandaloneContainerConfigurationFactory (#36433)
d2202ff8b2d is described below
commit d2202ff8b2d34adbebf722e514ce4d6fd5b68143
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 30 11:59:23 2025 +0800
Merge SQLE2EProxyClusterContainerConfigurationFactory and
SQLE2EProxyStandaloneContainerConfigurationFactory (#36433)
* Merge SQLE2EProxyClusterContainerConfigurationFactory and
SQLE2EProxyStandaloneContainerConfigurationFactory
* Merge SQLE2EProxyClusterContainerConfigurationFactory and
SQLE2EProxyStandaloneContainerConfigurationFactory
* Merge SQLE2EProxyClusterContainerConfigurationFactory and
SQLE2EProxyStandaloneContainerConfigurationFactory
---
.../container/compose/DockerContainerComposer.java | 4 +-
...ipelineProxyContainerConfigurationFactory.java} | 4 +-
.../container/compose/DockerContainerComposer.java | 4 +-
...sactionProxyContainerConfigurationFactory.java} | 4 +-
.../compose/mode/ClusterContainerComposer.java | 5 +-
.../compose/mode/StandaloneContainerComposer.java | 4 +-
...EProxyClusterContainerConfigurationFactory.java | 78 ----------------------
... SQLE2EProxyContainerConfigurationFactory.java} | 37 +++++-----
8 files changed, 31 insertions(+), 109 deletions(-)
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 15919522673..82b4cf1c509 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.database.connector.mysql.type.MySQLDatabaseType
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.PipelineE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.enums.PipelineProxyTypeEnum;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.config.proxy.PipelineProxyClusterContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.config.proxy.PipelineProxyContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DockerImageVersion;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
@@ -71,7 +71,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
storageContainer.setNetworkAliases(Collections.singletonList(String.join(".",
databaseType.getType().toLowerCase() + "_" + i, "host")));
storageContainers.add(storageContainer);
}
- AdaptorContainerConfiguration containerConfig =
PipelineProxyClusterContainerConfigurationFactory.newInstance(databaseType);
+ AdaptorContainerConfiguration containerConfig =
PipelineProxyContainerConfigurationFactory.newInstance(databaseType);
DatabaseType proxyDatabaseType =
"Oracle".equals(databaseType.getType()) ?
TypedSPILoader.getService(DatabaseType.class, "MySQL") : databaseType;
if (PipelineE2EEnvironment.getInstance().getItProxyType() ==
PipelineProxyTypeEnum.INTERNAL) {
ShardingSphereProxyEmbeddedContainer proxyContainer = new
ShardingSphereProxyEmbeddedContainer(proxyDatabaseType, containerConfig);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
similarity index 95%
rename from
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
rename to
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
index 93d76bbd54b..5f35c5993fe 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
@@ -31,10 +31,10 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * Pipeline proxy cluster container configuration factory.
+ * Pipeline proxy container configuration factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class PipelineProxyClusterContainerConfigurationFactory {
+public final class PipelineProxyContainerConfigurationFactory {
/**
* Create instance of adaptor container configuration.
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
index e0254e754cf..97afa2ba3e6 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.Nati
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.TransactionProxyClusterContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.transaction.framework.container.config.proxy.TransactionProxyContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import java.net.URL;
@@ -74,7 +74,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
}
if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
jdbcContainer = null;
- AdaptorContainerConfiguration containerConfig =
TransactionProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(),
databaseType, testParam.getPortBindings());
+ AdaptorContainerConfiguration containerConfig =
TransactionProxyContainerConfigurationFactory.newInstance(testParam.getScenario(),
databaseType, testParam.getPortBindings());
proxyContainer =
AdapterContainerFactory.newInstance(AdapterMode.CLUSTER,
AdapterType.PROXY, databaseType, testParam.getScenario(), containerConfig,
storageContainer, envType.name());
if (proxyContainer instanceof DockerITContainer) {
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyContainerConfigurationFactory.java
similarity index 95%
rename from
test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyClusterContainerConfigurationFactory.java
rename to
test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyContainerConfigurationFactory.java
index 9fabf8862ad..189fef7a859 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/TransactionProxyContainerConfigurationFactory.java
@@ -29,10 +29,10 @@ import java.util.List;
import java.util.Map;
/**
- * Transaction proxy cluster container configuration factory.
+ * Transaction proxy container configuration factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TransactionProxyClusterContainerConfigurationFactory {
+public final class TransactionProxyContainerConfigurationFactory {
/**
* Create instance of adaptor container configuration.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
index f34f8ad4fe3..cb11a9d6096 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
@@ -32,9 +32,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
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.atomic.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyClusterContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
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 +64,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
} else {
storageContainer = containers.registerContainer(new
NativeStorageContainer(databaseType, scenario));
}
- AdaptorContainerConfiguration containerConfig =
SQLE2EProxyClusterContainerConfigurationFactory.newInstance(scenario,
databaseType, AdapterContainerUtils.getAdapterContainerImage());
+ AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType,
scenario, containerConfig, storageContainer, envType.name());
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
index de2c4947759..989575755a7 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
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.SQLE2EProxyStandaloneContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
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 final class StandaloneContainerComposer implements
ContainerComposer {
storageContainer = containers.registerContainer(new
NativeStorageContainer(databaseType, scenario));
}
adapterContainer =
containers.registerContainer(AdapterContainerFactory.newInstance(adapterMode,
adapterType, databaseType, scenario,
-
SQLE2EProxyStandaloneContainerConfigurationFactory.newInstance(scenario,
databaseType), storageContainer, envType.name()));
+ SQLE2EProxyContainerConfigurationFactory.newInstance(scenario,
"standalone", databaseType), storageContainer, envType.name()));
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(storageContainer);
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyClusterContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyClusterContainerConfigurationFactory.java
deleted file mode 100644
index 2f340de5136..00000000000
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyClusterContainerConfigurationFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.env.container.config;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import org.jetbrains.annotations.NotNull;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-/**
- * SQL E2E Proxy cluster container configuration factory.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLE2EProxyClusterContainerConfigurationFactory {
-
- /**
- * Create instance of adaptor container configuration.
- *
- * @param scenario scenario
- * @param databaseType database type
- * @param adapterContainerImage adapter container image
- * @return created instance
- */
- public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType, final String adapterContainerImage) {
- return new AdaptorContainerConfiguration(scenario, new LinkedList<>(),
getMountedResources(scenario, databaseType), adapterContainerImage, "");
- }
-
- private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
- Map<String, String> result = new HashMap<>(3, 1F);
- result.put("/env/common/cluster/proxy/conf/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
- result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
- result.put(getGlobalYamlPath(scenario, databaseType),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
- return result;
- }
-
- @NotNull
- private static String getGlobalYamlPath(final String scenario, final
DatabaseType databaseType) {
- if (isDialectScenarioGlobalYamlExists(scenario, databaseType)) {
- return "/env/scenario/" + scenario + "/proxy/mode/cluster/" +
databaseType.getType().toLowerCase() + "/global.yaml";
- }
- if (isScenarioGlobalYamlExists(scenario)) {
- return "/env/scenario/" + scenario +
"/proxy/mode/cluster/global.yaml";
- }
- return "/env/common/cluster/proxy/conf/global.yaml";
- }
-
- private static boolean isDialectScenarioGlobalYamlExists(final String
scenario, final DatabaseType databaseType) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/cluster/" + databaseType.getType().toLowerCase() +
"/global.yaml");
- return null != url;
- }
-
- private static boolean isScenarioGlobalYamlExists(final String scenario) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/cluster/global.yaml");
- return null != url;
- }
-}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyStandaloneContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
similarity index 58%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyStandaloneContainerConfigurationFactory.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 4e1fcc01d58..a33dbb144c5 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyStandaloneContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -31,48 +31,49 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * SQL E2E Proxy standalone container configuration factory.
+ * SQL E2E Proxy container configuration factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLE2EProxyStandaloneContainerConfigurationFactory {
+public final class SQLE2EProxyContainerConfigurationFactory {
/**
* Create instance of adaptor container configuration.
*
* @param scenario scenario
+ * @param modeType modeType
* @param databaseType database type
* @return created instance
*/
- public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new AdaptorContainerConfiguration(scenario, new LinkedList<>(),
getMountedResources(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), "");
+ public static AdaptorContainerConfiguration newInstance(final String
scenario, final String modeType, final DatabaseType databaseType) {
+ return new AdaptorContainerConfiguration(scenario, new LinkedList<>(),
getMountedResources(scenario, modeType, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), "");
}
- private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
+ private static Map<String, String> getMountedResources(final String
scenario, final String modeType, final DatabaseType databaseType) {
Map<String, String> result = new HashMap<>(3, 1F);
- result.put("/env/common/standalone/proxy/conf/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
- result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
- result.put(getGlobalYamlPath(scenario, databaseType),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
+ result.put(String.format("/env/common/%s/proxy/conf/logback.xml",
modeType), ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
+ result.put(String.format("/env/scenario/%s/proxy/conf/%s", scenario,
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
+ result.put(getGlobalYamlPath(scenario, modeType, databaseType),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
return result;
}
@NotNull
- private static String getGlobalYamlPath(final String scenario, final
DatabaseType databaseType) {
- if (isDialectScenarioGlobalYamlExists(scenario, databaseType)) {
- return "/env/scenario/" + scenario + "/proxy/mode/standalone/" +
databaseType.getType().toLowerCase() + "/global.yaml";
+ private static String getGlobalYamlPath(final String scenario, final
String modeType, final DatabaseType databaseType) {
+ if (isDialectScenarioGlobalYamlExists(scenario, modeType,
databaseType)) {
+ return
String.format("/env/scenario/%s/proxy/mode/%s/%s/global.yaml", scenario,
modeType, databaseType.getType().toLowerCase());
}
- if (isScenarioGlobalYamlExists(scenario)) {
- return "/env/scenario/" + scenario +
"/proxy/mode/standalone/global.yaml";
+ if (isScenarioGlobalYamlExists(scenario, modeType)) {
+ return String.format("/env/scenario/%s/proxy/mode/%s/global.yaml",
scenario, modeType);
}
- return "/env/common/standalone/proxy/conf/global.yaml";
+ return String.format("/env/common/%s/proxy/conf/global.yaml",
modeType);
}
- private static boolean isDialectScenarioGlobalYamlExists(final String
scenario, final DatabaseType databaseType) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/standalone/" + databaseType.getType().toLowerCase() +
"/global.yaml");
+ private static boolean isDialectScenarioGlobalYamlExists(final String
scenario, final String modeType, final DatabaseType databaseType) {
+ URL url =
Thread.currentThread().getContextClassLoader().getResource(String.format("env/scenario/%s/proxy/mode/%s/%s/global.yaml",
scenario, modeType, databaseType.getType().toLowerCase()));
return null != url;
}
- private static boolean isScenarioGlobalYamlExists(final String scenario) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/standalone/global.yaml");
+ private static boolean isScenarioGlobalYamlExists(final String scenario,
final String modeType) {
+ URL url =
Thread.currentThread().getContextClassLoader().getResource(String.format("env/scenario/%s/proxy/mode/%s/global.yaml",
scenario, modeType));
return null != url;
}
}
