You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2022/02/26 15:36:02 UTC
[shardingsphere] branch master updated: Remove useless DataSet.ignoreRowOrder
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 d55fa09 Remove useless DataSet.ignoreRowOrder
new 9c3e031 Merge pull request #15657 from terrymanu/dev
d55fa09 is described below
commit d55fa09b93c3d23da8e181bc56d2a90b5d90c4e6
Author: zhangliang <zh...@apache.org>
AuthorDate: Sat Feb 26 23:23:49 2022 +0800
Remove useless DataSet.ignoreRowOrder
---
.../test/integration/cases/IntegrationTestCasesLoader.java | 4 ++--
.../apache/shardingsphere/test/integration/cases/dataset/DataSet.java | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
index 726855f..81f4081 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -70,8 +71,7 @@ public final class IntegrationTestCasesLoader {
@SneakyThrows({IOException.class, URISyntaxException.class, JAXBException.class})
private Collection<IntegrationTestCaseContext> loadIntegrationTestCaseContexts(final SQLCommandType sqlCommandType) {
- URL url = IntegrationTestCasesLoader.class.getClassLoader().getResource("cases/");
- Preconditions.checkNotNull(url, "Can not find integration test cases.");
+ URL url = Objects.requireNonNull(IntegrationTestCasesLoader.class.getClassLoader().getResource("cases/"));
return loadIntegrationTestCaseContexts(url, sqlCommandType);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
index b591e71..eb08dbd 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
@@ -41,9 +41,6 @@ public final class DataSet {
@XmlAttribute(name = "update-count")
private int updateCount;
- @XmlAttribute(name = "ignore-row-order")
- private boolean ignoreRowOrder;
-
@XmlElement(name = "metadata")
private final List<DataSetMetaData> metaDataList = new LinkedList<>();