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 015e5a22b4d Format code in database container classes (#35337) 015e5a22b4d is described below commit 015e5a22b4dd9030a23270994f73eba335d23d63 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Mon May 5 17:53:56 2025 +0800 Format code in database container classes (#35337) - Remove unnecessary line breaks in getDatabaseNames and getExpectedDatabaseNames methods - Affected classes: MariaDBContainer, MySQLContainer, OpenGaussContainer --- .../e2e/env/container/atomic/storage/impl/MariaDBContainer.java | 6 ++---- .../test/e2e/env/container/atomic/storage/impl/MySQLContainer.java | 6 ++---- .../e2e/env/container/atomic/storage/impl/OpenGaussContainer.java | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MariaDBContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MariaDBContainer.java index 00290b282f1..e69eeda71cd 100644 --- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MariaDBContainer.java +++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MariaDBContainer.java @@ -54,14 +54,12 @@ public final class MariaDBContainer extends DockerStorageContainer { @Override protected Collection<String> getDatabaseNames() { - return storageContainerConfig.getDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); } @Override protected Collection<String> getExpectedDatabaseNames() { - return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); } @Override diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java index 1dcffa5479f..6170e5b3938 100644 --- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java +++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java @@ -57,14 +57,12 @@ public final class MySQLContainer extends DockerStorageContainer { @Override protected Collection<String> getDatabaseNames() { - return storageContainerConfig.getDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); } @Override protected Collection<String> getExpectedDatabaseNames() { - return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList()); } @Override diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/OpenGaussContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/OpenGaussContainer.java index 28d52763ecb..87c5c827917 100644 --- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/OpenGaussContainer.java +++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/OpenGaussContainer.java @@ -62,14 +62,12 @@ public final class OpenGaussContainer extends DockerStorageContainer { @Override protected Collection<String> getDatabaseNames() { - return storageContainerConfig.getDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList()); } @Override protected Collection<String> getExpectedDatabaseNames() { - return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream() - .filter(entry -> entry.getValue() == getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList()); + return storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList()); } @Override