This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 698b72d9391 Rename useless generic on AbstractTestParameterLoader
(#28088)
698b72d9391 is described below
commit 698b72d93915df9024119ba7d9b3aa0d83040c23
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 15 13:52:04 2023 +0800
Rename useless generic on AbstractTestParameterLoader (#28088)
---
.../test/it/sql/parser/external/ExternalSQLParserIT.java | 3 +--
.../external/loader/DefaultExternalTestParameterLoader.java | 2 +-
.../external/loader/MySQLExternalTestParameterLoader.java | 2 +-
.../test/loader/AbstractTestParameterLoader.java | 11 +++++------
.../shardingsphere/test/loader/ExternalCaseSettings.java | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
index e82943d4586..17a5313a662 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
@@ -84,8 +84,7 @@ public abstract class ExternalSQLParserIT {
@SneakyThrows
private Collection<ExternalSQLParserTestParameter>
getTestParameters(final ExternalCaseSettings settings) {
- AbstractTestParameterLoader<ExternalSQLParserTestParameter> loader
= settings.caseLoader().getConstructor(TestParameterLoadStrategy.class)
- .newInstance(new GitHubTestParameterLoadStrategy());
+ AbstractTestParameterLoader loader =
settings.caseLoader().getConstructor(TestParameterLoadStrategy.class).newInstance(new
GitHubTestParameterLoadStrategy());
return loader.load(URI.create(settings.caseURL()),
URI.create(settings.resultURL()), settings.value(), settings.reportType());
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
index d3ebcfb53b3..c6113349cb4 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* Default external SQL parser test parameter loader.
*/
-public final class DefaultExternalTestParameterLoader extends
AbstractTestParameterLoader<ExternalSQLParserTestParameter> {
+public final class DefaultExternalTestParameterLoader extends
AbstractTestParameterLoader {
public DefaultExternalTestParameterLoader(final TestParameterLoadStrategy
loadStrategy) {
super(loadStrategy);
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
index 954a007d515..b644705f4b8 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
@@ -30,7 +30,7 @@ import java.util.Objects;
/**
* External test parameter loader for MySQL.
*/
-public final class MySQLExternalTestParameterLoader extends
AbstractTestParameterLoader<ExternalSQLParserTestParameter> {
+public final class MySQLExternalTestParameterLoader extends
AbstractTestParameterLoader {
private static final int DELIMITER_COMMAND_LENGTH = "DELIMITER".length();
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
index 4ffc60e73d3..683345e8a41 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
@@ -42,12 +42,10 @@ import java.util.stream.Collectors;
/**
* Test parameter loader.
- *
- * @param <T> type of test parameter
*/
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
@Slf4j
-public abstract class AbstractTestParameterLoader<T> {
+public abstract class AbstractTestParameterLoader {
private static final int DEFAULT_DOWNLOAD_THREADS = 4;
@@ -65,8 +63,8 @@ public abstract class AbstractTestParameterLoader<T> {
* @return loaded test parameters
*/
@SneakyThrows
- public Collection<T> load(final URI sqlCaseURI, final URI resultURI, final
String databaseType, final String reportType) {
- Collection<T> result = new LinkedList<>();
+ public final Collection<ExternalSQLParserTestParameter> load(final URI
sqlCaseURI, final URI resultURI, final String databaseType, final String
reportType) {
+ Collection<ExternalSQLParserTestParameter> result = new LinkedList<>();
Map<String, List<String>> sqlCaseFileContents =
downloadAllBySummary(sqlCaseURI);
Map<String, List<String>> resultFileContents =
downloadAllBySummary(resultURI);
for (Entry<String, List<String>> each :
sqlCaseFileContents.entrySet()) {
@@ -97,7 +95,8 @@ public abstract class AbstractTestParameterLoader<T> {
* @param reportType report type
* @return test parameters
*/
- public abstract Collection<T> createTestParameters(String sqlCaseFileName,
List<String> sqlCaseFileContent, List<String> resultFileContent, String
databaseType, String reportType);
+ public abstract Collection<ExternalSQLParserTestParameter>
createTestParameters(String sqlCaseFileName,
+
List<String> sqlCaseFileContent, List<String> resultFileContent, String
databaseType, String reportType);
private List<String> loadContent(final URI uri) {
try (
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
index 3429d693b3a..97217bb49e5 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
@@ -61,5 +61,5 @@ public @interface ExternalCaseSettings {
*
* @return case loader
*/
- Class<? extends
AbstractTestParameterLoader<ExternalSQLParserTestParameter>> caseLoader();
+ Class<? extends AbstractTestParameterLoader> caseLoader();
}
