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/08/10 07:47:23 UTC

(shardingsphere) branch master updated: Rename ExternalEnvironmentContext (#36234)

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 c7c539402fa Rename ExternalEnvironmentContext (#36234)
c7c539402fa is described below

commit c7c539402fa32bca89b9a6a4a04c3e709840988b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Aug 10 15:47:17 2025 +0800

    Rename ExternalEnvironmentContext (#36234)
---
 .../parser/it/mysql/external/ExternalMySQLParserIT.java  |  4 ++--
 .../it/sql/parser/external/ExternalCaseSettings.java     |  4 ++--
 .../test/it/sql/parser/external/ExternalSQLParserIT.java | 14 +++++++-------
 ...nmentContext.java => ExternalEnvironmentContext.java} | 12 ++++++------
 ...meterLoader.java => ExternalTestParameterLoader.java} | 16 ++++++++--------
 ...ategy.java => ExternalTestParameterLoadStrategy.java} |  4 ++--
 .../{impl => type}/GitHubTestParameterLoadStrategy.java  | 12 ++++++------
 ...plate.java => ExternalTestParameterLoadTemplate.java} |  4 ++--
 ... MySQLExternalExternalTestParameterLoadTemplate.java} |  4 ++--
 .../OneCasePerFileExternalTestParameterLoadTemplate.java |  4 ++--
 .../type/PrestoExternalTestParameterLoadTemplate.java    |  4 ++--
 .../type/StandardExternalTestParameterLoadTemplate.java  |  4 ++--
 .../env/{env.properties => external-env.properties}      |  0
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
index 73efb041fa0..ed527239fae 100644
--- a/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
+++ b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.it.sql.parser.it.mysql.external;
 
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalCaseSettings;
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type.MySQLExternalTestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type.MySQLExternalExternalTestParameterLoadTemplate;
 
-@ExternalCaseSettings(value = "MySQL", caseURL = ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL, template = MySQLExternalTestParameterLoadTemplate.class)
+@ExternalCaseSettings(value = "MySQL", caseURL = ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL, template = MySQLExternalExternalTestParameterLoadTemplate.class)
 class ExternalMySQLParserIT extends ExternalSQLParserIT {
     
     static final String CASE_URL = "https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t";
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
index 59931c91f68..18743f81572 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.test.it.sql.parser.external;
 
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
@@ -63,5 +63,5 @@ public @interface ExternalCaseSettings {
      *
      * @return test parameter load template
      */
-    Class<? extends TestParameterLoadTemplate> template();
+    Class<? extends ExternalTestParameterLoadTemplate> template();
 }
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 7422472cbd6..edc0d60126e 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
@@ -25,10 +25,10 @@ import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
 import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 import org.apache.shardingsphere.test.it.sql.parser.external.env.SQLParserExternalITEnvironment;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.TestParameterLoader;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.impl.GitHubTestParameterLoadStrategy;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.ExternalTestParameterLoader;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.ExternalTestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.type.GitHubTestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 import org.apache.shardingsphere.test.it.sql.parser.external.result.SQLParseResultReporter;
 import org.apache.shardingsphere.test.it.sql.parser.external.result.SQLParseResultReporterCreator;
 import org.junit.jupiter.api.condition.EnabledIf;
@@ -81,11 +81,11 @@ public abstract class ExternalSQLParserIT {
         }
         
         private Stream<ExternalSQLTestParameter> getTestParameters(final ExternalCaseSettings settings) throws ReflectiveOperationException {
-            TestParameterLoadStrategy loadStrategy = new GitHubTestParameterLoadStrategy();
+            ExternalTestParameterLoadStrategy loadStrategy = new GitHubTestParameterLoadStrategy();
             URI sqlCaseURI = URI.create(settings.caseURL());
             URI resultURI = URI.create(settings.resultURL());
-            TestParameterLoadTemplate loadTemplate = settings.template().getConstructor().newInstance();
-            TestParameterLoader loader = new TestParameterLoader(loadStrategy, loadTemplate);
+            ExternalTestParameterLoadTemplate loadTemplate = settings.template().getConstructor().newInstance();
+            ExternalTestParameterLoader loader = new ExternalTestParameterLoader(loadStrategy, loadTemplate);
             return loader.load(sqlCaseURI, resultURI, settings.value(), settings.reportType());
         }
     }
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/ExternalEnvironmentContext.java
similarity index 83%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/ExternalEnvironmentContext.java
index 4e1d94c4785..a001bb731f3 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/ExternalEnvironmentContext.java
@@ -24,15 +24,15 @@ import java.io.InputStream;
 import java.util.Properties;
 
 /**
- * environment context.
+ * External environment context.
  */
-public final class EnvironmentContext {
+public final class ExternalEnvironmentContext {
     
-    private static final EnvironmentContext INSTANCE = new EnvironmentContext();
+    private static final ExternalEnvironmentContext INSTANCE = new ExternalEnvironmentContext();
     
     private final Properties props;
     
-    private EnvironmentContext() {
+    private ExternalEnvironmentContext() {
         props = loadProperties();
     }
     
@@ -41,7 +41,7 @@ public final class EnvironmentContext {
      *
      * @return got instance
      */
-    public static EnvironmentContext getInstance() {
+    public static ExternalEnvironmentContext getInstance() {
         return INSTANCE;
     }
     
@@ -58,7 +58,7 @@ public final class EnvironmentContext {
     @SneakyThrows(IOException.class)
     private Properties loadProperties() {
         Properties result = new Properties();
-        try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("env/env.properties")) {
+        try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("env/external-env.properties")) {
             result.load(inputStream);
         }
         for (String each : System.getProperties().stringPropertyNames()) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalTestParameterLoader.java
similarity index 91%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalTestParameterLoader.java
index 6a37aa141bd..e57815fac06 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalTestParameterLoader.java
@@ -23,10 +23,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.it.sql.parser.external.env.EnvironmentContext;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.external.env.ExternalEnvironmentContext;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.ExternalTestParameterLoadStrategy;
 import org.apache.shardingsphere.test.it.sql.parser.external.loader.summary.FileSummary;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -43,16 +43,16 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * Test parameter loader.
+ * External test parameter loader.
  */
 @RequiredArgsConstructor
-public final class TestParameterLoader {
+public final class ExternalTestParameterLoader {
     
     private static final String TOKEN_KEY = "it.github.token";
     
-    private final TestParameterLoadStrategy loadStrategy;
+    private final ExternalTestParameterLoadStrategy loadStrategy;
     
-    private final TestParameterLoadTemplate loadTemplate;
+    private final ExternalTestParameterLoadTemplate loadTemplate;
     
     /**
      * Load test parameters.
@@ -96,7 +96,7 @@ public final class TestParameterLoader {
     @SneakyThrows(IOException.class)
     private List<String> loadContent(final URI uri) {
         URLConnection urlConnection = uri.toURL().openConnection();
-        String githubToken = EnvironmentContext.getInstance().getValue(TOKEN_KEY);
+        String githubToken = ExternalEnvironmentContext.getInstance().getValue(TOKEN_KEY);
         if (!Strings.isNullOrEmpty(githubToken)) {
             urlConnection.setRequestProperty("Authorization", "Bearer " + githubToken);
         }
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/ExternalTestParameterLoadStrategy.java
similarity index 92%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/ExternalTestParameterLoadStrategy.java
index de6ed2b16fa..fc9e92002b2 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/ExternalTestParameterLoadStrategy.java
@@ -23,9 +23,9 @@ import java.net.URI;
 import java.util.Collection;
 
 /**
- * Test parameter load strategy.
+ * External test parameter load strategy.
  */
-public interface TestParameterLoadStrategy {
+public interface ExternalTestParameterLoadStrategy {
     
     /**
      * Load SQL case file summaries.
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/type/GitHubTestParameterLoadStrategy.java
similarity index 93%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/type/GitHubTestParameterLoadStrategy.java
index 1f8b5d9c5ef..4257f456bc7 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/type/GitHubTestParameterLoadStrategy.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.impl;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.type;
 
 import com.google.common.base.Strings;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.it.sql.parser.external.env.EnvironmentContext;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.external.env.ExternalEnvironmentContext;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.ExternalTestParameterLoadStrategy;
 import org.apache.shardingsphere.test.it.sql.parser.external.loader.summary.FileSummary;
 
 import java.io.BufferedReader;
@@ -37,9 +37,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Test parameter load strategy with GitHub.
+ * GitHub test parameter load strategy.
  */
-public final class GitHubTestParameterLoadStrategy implements TestParameterLoadStrategy {
+public final class GitHubTestParameterLoadStrategy implements ExternalTestParameterLoadStrategy {
     
     private static final String TOKEN_KEY = "it.github.token";
     
@@ -106,7 +106,7 @@ public final class GitHubTestParameterLoadStrategy implements TestParameterLoadS
     @SneakyThrows(IOException.class)
     private String loadContent(final URI casesURI) {
         URLConnection urlConnection = casesURI.toURL().openConnection();
-        String githubToken = EnvironmentContext.getInstance().getValue(TOKEN_KEY);
+        String githubToken = ExternalEnvironmentContext.getInstance().getValue(TOKEN_KEY);
         if (!Strings.isNullOrEmpty(githubToken)) {
             urlConnection.setRequestProperty("Authorization", "Bearer " + githubToken);
         }
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/ExternalTestParameterLoadTemplate.java
similarity index 94%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/ExternalTestParameterLoadTemplate.java
index 065eaa4b279..0df6ffe81ac 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/ExternalTestParameterLoadTemplate.java
@@ -23,9 +23,9 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * Test parameter load template.
+ * External test parameter load template.
  */
-public interface TestParameterLoadTemplate {
+public interface ExternalTestParameterLoadTemplate {
     
     /**
      * Load test parameters.
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalTestParameterLoadTemplate.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalExternalTestParameterLoadTemplate.java
similarity index 96%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalTestParameterLoadTemplate.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalExternalTestParameterLoadTemplate.java
index f21ce413b0b..0e245c700f1 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalTestParameterLoadTemplate.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/MySQLExternalExternalTestParameterLoadTemplate.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ty
 
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
 import org.apache.shardingsphere.test.it.sql.parser.external.loader.SQLLineComment;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +30,7 @@ import java.util.Objects;
 /**
  * External test parameter load template for MySQL.
  */
-public final class MySQLExternalTestParameterLoadTemplate implements TestParameterLoadTemplate {
+public final class MySQLExternalExternalTestParameterLoadTemplate implements ExternalTestParameterLoadTemplate {
     
     private static final int DELIMITER_COMMAND_LENGTH = "DELIMITER".length();
     
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
index f9210a5c805..bf8dfb2434b 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type;
 
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +28,7 @@ import java.util.List;
 /**
  * One case per file external test parameter load template.
  */
-public final class OneCasePerFileExternalTestParameterLoadTemplate implements TestParameterLoadTemplate {
+public final class OneCasePerFileExternalTestParameterLoadTemplate implements ExternalTestParameterLoadTemplate {
     
     @Override
     public Collection<ExternalSQLTestParameter> load(final String sqlCaseFileName, final List<String> sqlCaseFileContent, final List<String> resultFileContent,
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
index 1091bc22ff6..8a273116bba 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type;
 
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 /**
  * External test parameter load template for Presto.
  */
-public final class PrestoExternalTestParameterLoadTemplate implements TestParameterLoadTemplate {
+public final class PrestoExternalTestParameterLoadTemplate implements ExternalTestParameterLoadTemplate {
     
     private static final String REGEX = "\\$\\{mutableTables.hive.datatype}";
     
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
index 7c96224cc59..b9231c99ec4 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ty
 
 import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
 import org.apache.shardingsphere.test.it.sql.parser.external.loader.SQLLineComment;
-import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.it.sql.parser.external.loader.template.ExternalTestParameterLoadTemplate;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -28,7 +28,7 @@ import java.util.List;
 /**
  * Standard external test parameter load template.
  */
-public final class StandardExternalTestParameterLoadTemplate implements TestParameterLoadTemplate {
+public final class StandardExternalTestParameterLoadTemplate implements ExternalTestParameterLoadTemplate {
     
     @Override
     public Collection<ExternalSQLTestParameter> load(final String sqlCaseFileName, final List<String> sqlCaseFileContent,
diff --git a/test/it/parser/src/main/resources/env/env.properties b/test/it/parser/src/main/resources/env/external-env.properties
similarity index 100%
rename from test/it/parser/src/main/resources/env/env.properties
rename to test/it/parser/src/main/resources/env/external-env.properties