[shardingsphere] branch master updated: Refactor ScenarioDataPath (#22574)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 3098362ff79 Refactor ScenarioDataPath (#22574)
3098362ff79 is described below

commit 3098362ff79ace4683be889afe532abe3d4756ae
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Dec 1 21:09:55 2022 +0800

    Refactor ScenarioDataPath (#22574)
---
 .../env/runtime/scenario/path/ScenarioDataPath.java            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/scenario/path/ScenarioDataPath.java
 
b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/scenario/path/ScenarioDataPath.java
index dbf10f63d81..95bd83c1f47 100644
--- 
a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/scenario/path/ScenarioDataPath.java
+++ 
b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/scenario/path/ScenarioDataPath.java
@@ -95,21 +95,21 @@ public final class ScenarioDataPath {
      * @return actual init SQL file
      */
     public Optional<String> findActualDatabaseInitSQLFile(final String 
databaseName, final DatabaseType databaseType) {
-        return isActualDatabaseInitSQLFileExisted(databaseName, databaseType) 
? Optional.of(getActualDatabaseInitSQLFile(databaseType, databaseName)) : 
Optional.empty();
+        return isActualDatabaseInitSQLFileExisted(databaseName, databaseType) 
? Optional.of(getActualDatabaseInitSQLFile(databaseName, databaseType)) : 
Optional.empty();
     }
     
     private boolean isActualDatabaseInitSQLFileExisted(final String 
databaseName, final DatabaseType databaseType) {
-        String initSQLResourceFile = 
getActualDatabaseInitSQLResourceFile(databaseType, databaseName);
+        String initSQLResourceFile = 
getActualDatabaseInitSQLResourceFile(databaseName, databaseType);
         return null != 
ScenarioDataPath.class.getClassLoader().getResource(initSQLResourceFile);
     }
     
-    private String getActualDatabaseInitSQLResourceFile(final DatabaseType 
databaseType, final String databaseName) {
+    private String getActualDatabaseInitSQLResourceFile(final String 
databaseName, final DatabaseType databaseType) {
         String initSQLFileName = String.join("-", 
Type.ACTUAL.name().toLowerCase(), databaseName, BASIC_INIT_SQL_FILE);
         return String.join("/", getInitSQLResourcePath(Type.ACTUAL, 
databaseType), initSQLFileName);
     }
     
-    private String getActualDatabaseInitSQLFile(final DatabaseType 
databaseType, final String databaseName) {
-        String resourceFile = 
getActualDatabaseInitSQLResourceFile(databaseType, databaseName);
+    private String getActualDatabaseInitSQLFile(final String databaseName, 
final DatabaseType databaseType) {
+        String resourceFile = 
getActualDatabaseInitSQLResourceFile(databaseName, databaseType);
         URL url = 
ScenarioDataPath.class.getClassLoader().getResource(resourceFile);
         assertNotNull(String.format("File `%s` must exist.", resourceFile), 
url);
         return url.getFile();