[shardingsphere] branch master updated: Rename DatabaseVersionParser (#26856)

[duanzhengqiang]

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

duanzhengqiang 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 b234fdf786c Rename DatabaseVersionParser (#26856)
b234fdf786c is described below

commit b234fdf786cbb23e30fb4a9820d46da4e8da11af
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jul 9 16:06:49 2023 +0800

    Rename DatabaseVersionParser (#26856)
---
 .../{DatabaseTypeUtils.java => DatabaseVersionParser.java}   | 12 ++++--------
 .../PipelineProxyClusterContainerConfigurationFactory.java   |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseVersionParser.java
similarity index 79%
rename from 
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
rename to 
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseVersionParser.java
index b782ebd80ae..98d088c4702 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseVersionParser.java
@@ -22,22 +22,18 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 
 /**
- * Database type utility class.
+ * Database version parser.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseTypeUtils {
+public final class DatabaseVersionParser {
     
     /**
-     * Get storage container image major version.
+     * parse major database version.
      *
      * @param storageContainerImage storage container image
      * @return major version
      */
     public static String parseMajorVersion(final String storageContainerImage) 
{
-        if (StringUtils.isBlank(storageContainerImage)) {
-            return "";
-        }
-        String version = storageContainerImage.split(":")[1];
-        return version.split("\\.")[0];
+        return StringUtils.isBlank(storageContainerImage) ? "" : 
storageContainerImage.substring(storageContainerImage.indexOf(':') + 1, 
storageContainerImage.indexOf('.'));
     }
 }
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
index 96daf03d2d3..10bbdefa380 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.Ad
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
-import 
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
+import 
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseVersionParser;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,7 +57,7 @@ public final class 
PipelineProxyClusterContainerConfigurationFactory {
         Map<String, String> result = new HashMap<>(2, 1F);
         
result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
         if (databaseType instanceof MySQLDatabaseType) {
-            String majorVersion = 
DatabaseTypeUtils.parseMajorVersion(storageContainerImage);
+            String majorVersion = 
DatabaseVersionParser.parseMajorVersion(storageContainerImage);
             result.put(String.format("/env/%s/server-%s.yaml", 
databaseType.getType().toLowerCase(), majorVersion), 
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
         } else {
             result.put(String.format("/env/%s/server.yaml", 
databaseType.getType().toLowerCase()), 
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");