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 9d82a93a135 Refactor AuthorityEnvironment (#36770)
9d82a93a135 is described below
commit 9d82a93a135a1f4310fce500ca65d38bbb2db30f
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Oct 1 17:36:14 2025 +0800
Refactor AuthorityEnvironment (#36770)
---
.../scenario/authority/AuthorityEnvironment.java | 23 ++++++++--------------
.../type/scenario/authority/AuthoritySQLSet.java | 2 +-
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
index ed902cd257e..06bc56202b0 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
@@ -23,9 +23,10 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Collection;
import java.util.LinkedList;
+import java.util.stream.Collectors;
/**
- * Authority root xml entry.
+ * Authority root XML entry.
*/
@XmlRootElement(name = "authority")
public final class AuthorityEnvironment {
@@ -34,30 +35,22 @@ public final class AuthorityEnvironment {
private final Collection<AuthoritySQLSet> sqlSets = new LinkedList<>();
/**
- * Get init SQLs of this database type.
+ * Get init SQLs.
*
* @param databaseType database type
- * @return init SQLs of this database type
+ * @return init SQLs
*/
public Collection<String> getInitSQLs(final DatabaseType databaseType) {
- Collection<String> result = new LinkedList<>();
- for (AuthoritySQLSet each : sqlSets) {
- result.addAll(each.getCreateUserSQLs(databaseType));
- }
- return result;
+ return sqlSets.stream().flatMap(each ->
each.getCreateUserSQLs(databaseType).stream()).collect(Collectors.toList());
}
/**
- * Get clean SQLs of this database type.
+ * Get clean SQLs.
*
* @param databaseType database type
- * @return clean SQLs of this database type
+ * @return clean SQLs
*/
public Collection<String> getCleanSQLs(final DatabaseType databaseType) {
- Collection<String> result = new LinkedList<>();
- for (AuthoritySQLSet each : sqlSets) {
- result.addAll(each.getDropUserSQLs(databaseType));
- }
- return result;
+ return sqlSets.stream().flatMap(each ->
each.getDropUserSQLs(databaseType).stream()).collect(Collectors.toList());
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
index eb0b354ab8e..23efb28a127 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * Authority SQL set xml entry.
+ * Authority SQL set XML entry.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@Setter