You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/13 17:50:07 UTC
(shardingsphere) branch master updated: Rename package of org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount (#36560)
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 72133614dce Rename package of org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount (#36560)
72133614dce is described below
commit 72133614dce6ee8af296ac7bbcf678413d1ca7fb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Sep 14 01:50:01 2025 +0800
Rename package of org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount (#36560)
---
.../MountConfigurationResourceGenerator.java} | 8 ++++----
.../MountSQLResourceGenerator.java} | 8 ++++----
.../atomic/storage/type/docker/DockerStorageContainer.java | 8 ++++----
.../atomic/storage/type/natived/NativeStorageContainer.java | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountConfigurationResourceGenerator.java
similarity index 94%
rename from test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java
rename to test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountConfigurationResourceGenerator.java
index a905b2af0c7..1dcb15be83d 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountConfigurationResourceGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted;
+package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -27,17 +27,17 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Mounted configuration resource generator.
+ * Mount configuration resource generator.
*/
@RequiredArgsConstructor
-public final class MountedConfigurationResourceGenerator {
+public final class MountConfigurationResourceGenerator {
private final StorageContainerConfigurationOption option;
private final DatabaseType databaseType;
/**
- * Generate mounted configuration resource map.
+ * Generate mount configuration resource map.
*
* @param majorVersion major version
* @param scenario scenario
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountSQLResourceGenerator.java
similarity index 97%
rename from test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java
rename to test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountSQLResourceGenerator.java
index 48d8fc9f346..b8e6ce8f827 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mount/MountSQLResourceGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted;
+package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -32,10 +32,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Mounted SQL resource generator.
+ * Mount SQL resource generator.
*/
@RequiredArgsConstructor
-public final class MountedSQLResourceGenerator {
+public final class MountSQLResourceGenerator {
private static final Collection<String> TO_BE_MOUNTED_COMMON_SQL_FILES = Arrays.asList("00-common-init-authority.sql", "99-common-check-ready.sql");
@@ -50,7 +50,7 @@ public final class MountedSQLResourceGenerator {
private final DatabaseType databaseType;
/**
- * Generate mounted SQL resource map.
+ * Generate mount SQL resource map.
*
* @param majorVersion major version
* @param scenario scenario
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
index 2017df66951..8a0e92ad378 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted.MountedConfigurationResourceGenerator;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted.MountedSQLResourceGenerator;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount.MountConfigurationResourceGenerator;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount.MountSQLResourceGenerator;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
@@ -69,8 +69,8 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
protected final void configure() {
setCommands();
addEnvironments();
- mapResources(new MountedConfigurationResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
- mapResources(new MountedSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
+ mapResources(new MountConfigurationResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
+ mapResources(new MountSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
setPrivilegedMode();
withExposedPorts(getExposedPort());
withStartupTimeout(Duration.of(storageContainerConfig.getConfigurationOption().getStartupTimeoutSeconds(), ChronoUnit.SECONDS));
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
index e15f5bded48..e761b305f07 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.Storage
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted.MountedSQLResourceGenerator;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount.MountSQLResourceGenerator;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
@@ -73,7 +73,7 @@ public final class NativeStorageContainer implements StorageContainer {
DataSource dataSource = StorageContainerUtils.generateDataSource(
DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(), Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort())),
E2ETestEnvironment.getInstance().getNativeStorageUsername(), E2ETestEnvironment.getInstance().getNativeStoragePassword());
- new MountedSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(0, scenario).keySet().forEach(each -> SQLScriptUtils.execute(dataSource, each));
+ new MountSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(0, scenario).keySet().forEach(each -> SQLScriptUtils.execute(dataSource, each));
}
private Map<String, DataSource> createActualDataSourceMap() {