[shardingsphere] branch master updated: Remove WorkerIdGenerator.parseWorkerId() (#19175)

[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 f0757e76dc3 Remove WorkerIdGenerator.parseWorkerId() (#19175)
f0757e76dc3 is described below

commit f0757e76dc387ca7b25c9f57642997a248a20287
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Jul 15 10:08:17 2022 +0800

    Remove WorkerIdGenerator.parseWorkerId() (#19175)
---
 .../infra/instance/workerid/WorkerIdGenerator.java         | 14 --------------
 .../workerid/generator/StandaloneWorkerIdGenerator.java    |  7 ++++++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/workerid/WorkerIdGenerator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/workerid/WorkerIdGenerator.java
index 274e28e09c9..5baa182d4af 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/workerid/WorkerIdGenerator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/workerid/WorkerIdGenerator.java
@@ -37,18 +37,4 @@ public interface WorkerIdGenerator {
      * @return worker id
      */
     long generate(Properties props);
-    
-    /**
-     * Parse worker id.
-     *
-     * @param props props
-     * @return worker id
-     */
-    default long parseWorkerId(final Properties props) {
-        if (null == props) {
-            return DEFAULT_WORKER_ID;
-        }
-        Object workerId = props.get(WORKER_ID_KEY);
-        return null == workerId ? DEFAULT_WORKER_ID : 
Long.parseLong(workerId.toString());
-    }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/workerid/generator/StandaloneWorkerIdGenerator.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/workerid/generator/StandaloneWorkerIdGenerator.java
index 94487e92d1b..1dae2eaed12 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/workerid/generator/StandaloneWorkerIdGenerator.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/workerid/generator/StandaloneWorkerIdGenerator.java
@@ -28,6 +28,11 @@ public final class StandaloneWorkerIdGenerator implements 
WorkerIdGenerator {
     
     @Override
     public long generate(final Properties props) {
-        return parseWorkerId(props);
+        if (null == props) {
+            return DEFAULT_WORKER_ID;
+        }
+        Object workerId = props.get(WORKER_ID_KEY);
+        // TODO check can not exceed MAX_WORKER_ID
+        return null == workerId ? DEFAULT_WORKER_ID : 
Long.parseLong(workerId.toString());
     }
 }