[shardingsphere] branch master updated: Rename InstanceTypeUtil to InstanceTypeUtils (#25148)

[jianglongtao]

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

jianglongtao 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 845d1007809 Rename InstanceTypeUtil to InstanceTypeUtils (#25148)
845d1007809 is described below

commit 845d1007809d358965fc07fdbe451467eeb1f63e
Author: yx9o <yangx_s...@163.com>
AuthorDate: Thu Apr 13 23:27:41 2023 +0800

    Rename InstanceTypeUtil to InstanceTypeUtils (#25148)
---
 .../shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java   | 6 +++---
 .../core/job/util/{InstanceTypeUtil.java => InstanceTypeUtils.java} | 4 ++--
 .../util/{InstanceTypeUtilTest.java => InstanceTypeUtilsTest.java}  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
index 32c87b92605..c4f27320081 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.shardingsphere.data.pipeline.api.job.PipelineJobId;
 import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey;
-import org.apache.shardingsphere.data.pipeline.core.job.util.InstanceTypeUtil;
+import org.apache.shardingsphere.data.pipeline.core.job.util.InstanceTypeUtils;
 import org.apache.shardingsphere.data.pipeline.spi.job.JobType;
 import org.apache.shardingsphere.data.pipeline.spi.job.JobTypeFactory;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
@@ -50,7 +50,7 @@ public final class PipelineJobIdUtils {
         String databaseName = instanceType == InstanceType.PROXY ? "" : 
pipelineJobId.getContextKey().getDatabaseName();
         String databaseNameHex = 
Hex.encodeHexString(databaseName.getBytes(StandardCharsets.UTF_8), true);
         String databaseNameLengthHex = 
Hex.encodeHexString(Shorts.toByteArray((short) databaseNameHex.length()), true);
-        char encodedInstanceType = InstanceTypeUtil.encode(instanceType);
+        char encodedInstanceType = InstanceTypeUtils.encode(instanceType);
         return 'j' + pipelineJobId.getJobType().getTypeCode() + 
pipelineJobId.getFormatVersion() + encodedInstanceType + databaseNameLengthHex 
+ databaseNameHex;
     }
     
@@ -85,6 +85,6 @@ public final class PipelineJobIdUtils {
         char instanceType = jobId.charAt(5);
         short databaseNameLength = 
Shorts.fromByteArray(Hex.decodeHex(jobId.substring(6, 10)));
         String databaseName = new String(Hex.decodeHex(jobId.substring(10, 10 
+ databaseNameLength)), StandardCharsets.UTF_8);
-        return PipelineContextKey.build(InstanceTypeUtil.decode(instanceType), 
databaseName);
+        return 
PipelineContextKey.build(InstanceTypeUtils.decode(instanceType), databaseName);
     }
 }
diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtil.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtils.java
similarity index 96%
rename from 
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtil.java
rename to 
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtils.java
index d79405b1ce0..3adba4328de 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtil.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtils.java
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
 
 /**
- * Instance type util.
+ * Instance type utility class.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class InstanceTypeUtil {
+public final class InstanceTypeUtils {
     
     /**
      * Encode instance type.
diff --git 
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilTest.java
 
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilsTest.java
similarity index 90%
rename from 
kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilTest.java
rename to 
kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilsTest.java
index 27e6325604d..046c97ce762 100644
--- 
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilTest.java
+++ 
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/util/InstanceTypeUtilsTest.java
@@ -23,12 +23,12 @@ import org.junit.jupiter.api.Test;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-final class InstanceTypeUtilTest {
+class InstanceTypeUtilsTest {
     
     @Test
     void assertEncodeAndDecode() {
         for (InstanceType each : InstanceType.values()) {
-            assertThat(InstanceTypeUtil.decode(InstanceTypeUtil.encode(each)), 
is(each));
+            
assertThat(InstanceTypeUtils.decode(InstanceTypeUtils.encode(each)), is(each));
         }
     }
 }