commit a1d4800f817ab0cfbd49a5fe75fd54ed8c688dda
author 吴伟杰 <wuweijie@apache.org> Sun Jul 11 15:24:42 2021 +0800
committer GitHub <noreply@github.com> Sun Jul 11 15:24:42 2021 +0800
tree f27645963b14044f8d2a45cd5795df4095cfb1c7
parent 2af9c6e003de045bbf4b75881bb5c6f33409d0cf

Update ElasticJob dependencies to 3.0.0 (#120)

pom.xml

diff --git a/pom.xml b/pom.xml
index 3095b1c..95011e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     
     <properties>
         <revision>3.0.0-RC1-SNAPSHOT</revision>
-        <elasticjob.version>3.0.0-RC1</elasticjob.version>
+        <elasticjob.version>3.0.0</elasticjob.version>
         <java.version>1.8</java.version>
         <springframework.version>4.3.24.RELEASE</springframework.version>
         <spring-boot.version>1.5.21.RELEASE</spring-boot.version>

shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/JobAPIServiceImpl.java

diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/JobAPIServiceImpl.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/JobAPIServiceImpl.java
index 5315abe..8e0e8d1 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/JobAPIServiceImpl.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/JobAPIServiceImpl.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.elasticjob.lite.ui.service.impl;
 
+import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceService;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobAPIFactory;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobConfigurationAPI;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobOperateAPI;
@@ -24,9 +25,11 @@
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ServerStatisticsAPI;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ShardingOperateAPI;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ShardingStatisticsAPI;
+import org.apache.shardingsphere.elasticjob.lite.lifecycle.internal.reg.RegistryCenterFactory;
 import org.apache.shardingsphere.elasticjob.lite.ui.domain.RegistryCenterConfiguration;
 import org.apache.shardingsphere.elasticjob.lite.ui.service.JobAPIService;
 import org.apache.shardingsphere.elasticjob.lite.ui.util.SessionRegistryCenterConfiguration;
+import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
 import org.springframework.stereotype.Service;
 
 /**
@@ -44,7 +47,7 @@
     @Override
     public JobOperateAPI getJobOperatorAPI() {
         RegistryCenterConfiguration regCenterConfig = SessionRegistryCenterConfiguration.getRegistryCenterConfiguration();
-        return JobAPIFactory.createJobOperateAPI(regCenterConfig.getZkAddressList(), regCenterConfig.getNamespace(), regCenterConfig.getDigest());
+        return new JobOperateAPIImpl(RegistryCenterFactory.createCoordinatorRegistryCenter(regCenterConfig.getZkAddressList(), regCenterConfig.getNamespace(), regCenterConfig.getDigest()));
     }
     
     @Override
@@ -70,4 +73,41 @@
         RegistryCenterConfiguration regCenterConfig = SessionRegistryCenterConfiguration.getRegistryCenterConfiguration();
         return JobAPIFactory.createShardingStatisticsAPI(regCenterConfig.getZkAddressList(), regCenterConfig.getNamespace(), regCenterConfig.getDigest());
     }
+    
+    private static class JobOperateAPIImpl implements JobOperateAPI {
+        
+        private final CoordinatorRegistryCenter regCenter;
+        
+        private final org.apache.shardingsphere.elasticjob.lite.lifecycle.internal.operate.JobOperateAPIImpl delegated;
+        
+        public JobOperateAPIImpl(final CoordinatorRegistryCenter regCenter) {
+            this.regCenter = regCenter;
+            this.delegated = new org.apache.shardingsphere.elasticjob.lite.lifecycle.internal.operate.JobOperateAPIImpl(regCenter);
+        }
+        
+        @Override
+        public void trigger(final String jobName) {
+            new InstanceService(regCenter, jobName).triggerAllInstances();
+        }
+        
+        @Override
+        public void disable(final String jobName, final String serverIp) {
+            delegated.disable(jobName, serverIp);
+        }
+        
+        @Override
+        public void enable(final String jobName, final String serverIp) {
+            delegated.enable(jobName, serverIp);
+        }
+        
+        @Override
+        public void shutdown(final String jobName, final String serverIp) {
+            delegated.shutdown(jobName, serverIp);
+        }
+        
+        @Override
+        public void remove(final String jobName, final String serverIp) {
+            delegated.remove(jobName, serverIp);
+        }
+    }
 }