[shardingsphere-elasticjob] branch master updated: Simplify JobRegistry (#1545)

[zh...@apache.org]

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-elasticjob.git


The following commit(s) were added to refs/heads/master by this push:
     new 78d68d5  Simplify JobRegistry (#1545)
78d68d5 is described below

commit 78d68d5b71b1b71046b23f30c8d9de1e1d87ddb7
Author: 吴伟杰 <ro...@me.com>
AuthorDate: Fri Oct 9 23:58:04 2020 +0800

    Simplify JobRegistry (#1545)
---
 .../elasticjob/lite/internal/schedule/JobRegistry.java  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistry.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistry.java
index c9e01f2..07d033d 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistry.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistry.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
 import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -127,8 +128,7 @@ public final class JobRegistry {
      * @return job is running or not
      */
     public boolean isJobRunning(final String jobName) {
-        Boolean result = jobRunningMap.get(jobName);
-        return null == result ? false : result;
+        return jobRunningMap.getOrDefault(jobName, false);
     }
     
     /**
@@ -148,8 +148,7 @@ public final class JobRegistry {
      * @return sharding total count which running on current job server
      */
     public int getCurrentShardingTotalCount(final String jobName) {
-        Integer result = currentShardingTotalCountMap.get(jobName);
-        return null == result ? 0 : result;
+        return currentShardingTotalCountMap.getOrDefault(jobName, 0);
     }
     
     /**
@@ -168,14 +167,8 @@ public final class JobRegistry {
      * @param jobName job name
      */
     public void shutdown(final String jobName) {
-        JobScheduleController scheduleController = schedulerMap.remove(jobName);
-        if (null != scheduleController) {
-            scheduleController.shutdown();
-        }
-        CoordinatorRegistryCenter regCenter = regCenterMap.remove(jobName);
-        if (null != regCenter) {
-            regCenter.evictCacheData("/" + jobName);
-        }
+        Optional.ofNullable(schedulerMap.remove(jobName)).ifPresent(JobScheduleController::shutdown);
+        Optional.ofNullable(regCenterMap.remove(jobName)).ifPresent(regCenter -> regCenter.evictCacheData("/" + jobName));
         jobInstanceMap.remove(jobName);
         jobRunningMap.remove(jobName);
         currentShardingTotalCountMap.remove(jobName);