You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/01/03 16:13:17 UTC
[shardingsphere-elasticjob] branch master updated: Decoupling ZooKeeper Curator from elasticjob-lite-core (#2033)
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 6ef2a1d Decoupling ZooKeeper Curator from elasticjob-lite-core (#2033)
6ef2a1d is described below
commit 6ef2a1d5ba299730f57c97c15ec1a55da9659542
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Tue Jan 4 00:13:10 2022 +0800
Decoupling ZooKeeper Curator from elasticjob-lite-core (#2033)
* Decoupling ZooKeeper from ElasticJob
* Decouple Curator from JobNodeStorage
* Fix package error
* Refactor DataChangedEvent and fix tests
* Fix JobNodeStorageTest
* Add ZookeeperRegistryCenterExecuteInLeaderTest
* Add ZookeeperRegistryCenterWatchTest
* Add ZookeeperRegistryCenterTransactionTest
* Introduce curator registry center by default
* Adjust poms of Spring modules
* Remove unused tests from ShardingServiceTest
* Update SnapshotService
* Format styles
* Fix test which may fail in occasion
* Optimize imports in ZookeeperCuratorIgnoredExceptionProvider
* Add more tests
---
elasticjob-cloud/elasticjob-cloud-common/pom.xml | 2 +-
.../elasticjob-registry-center-api}/pom.xml | 29 ++---
.../reg/base/CoordinatorRegistryCenter.java | 35 ++++++
.../elasticjob/reg/base/ElectionCandidate.java | 0
.../reg/base}/LeaderExecutionCallback.java | 2 +-
.../elasticjob/reg/base/RegistryCenter.java | 0
.../reg/base/transaction/TransactionOperation.java | 88 +++++++++++++++
.../reg/exception/IgnoredExceptionProvider.java} | 19 ++--
.../elasticjob/reg/exception/RegException.java | 0
.../reg/exception/RegExceptionHandler.java | 15 ++-
.../ConnectionStateChangedEventListener.java | 31 +++---
.../elasticjob/reg/listener/DataChangedEvent.java | 27 +++--
.../reg/listener/DataChangedEventListener.java | 14 ++-
.../base/transaction/TransactionOperationTest.java | 57 ++++++++++
.../reg/exception/RegExceptionHandlerTest.java | 33 ------
.../pom.xml | 25 +++--
.../reg/zookeeper/ZookeeperConfiguration.java | 2 +-
.../reg/zookeeper/ZookeeperElectionService.java | 2 +-
.../reg/zookeeper/ZookeeperRegistryCenter.java | 122 +++++++++++++++++++++
.../ZookeeperCuratorIgnoredExceptionProvider.java | 25 +++--
...sticjob.reg.exception.IgnoredExceptionProvider} | 4 +-
.../reg/zookeeper/ZookeeperConfigurationTest.java | 0
.../zookeeper/ZookeeperElectionServiceTest.java | 4 +-
...ZookeeperRegistryCenterExecuteInLeaderTest.java | 95 ++++++++++++++++
.../ZookeeperRegistryCenterForAuthTest.java | 0
.../ZookeeperRegistryCenterInitFailureTest.java | 0
.../ZookeeperRegistryCenterMiscellaneousTest.java | 0
.../ZookeeperRegistryCenterModifyTest.java | 0
.../ZookeeperRegistryCenterQueryWithCacheTest.java | 0
...okeeperRegistryCenterQueryWithoutCacheTest.java | 0
.../ZookeeperRegistryCenterTransactionTest.java} | 47 +++++---
.../ZookeeperRegistryCenterWatchTest.java} | 36 +++---
...keeperCuratorIgnoredExceptionProviderTest.java} | 22 ++--
.../reg/zookeeper/fixture/EmbedTestingServer.java | 0
.../util/ZookeeperRegistryCenterTestUtil.java | 0
.../src/test/resources/conf/reg/local.properties | 0
.../resources/conf/reg/local_overwrite.properties | 0
.../src/test/resources/logback-test.xml | 0
.../pom.xml} | 43 ++++----
.../elasticjob-registry-center/pom.xml | 57 +---------
elasticjob-lite/elasticjob-lite-core/pom.xml | 7 +-
.../lite/api/registry/JobInstanceRegistry.java | 15 ++-
.../internal/config/RescheduleListenerManager.java | 14 ++-
.../internal/election/ElectionListenerManager.java | 18 +--
.../lite/internal/election/LeaderService.java | 2 +-
.../internal/failover/FailoverListenerManager.java | 18 +--
.../lite/internal/failover/FailoverService.java | 2 +-
.../guarantee/GuaranteeListenerManager.java | 16 +--
.../internal/instance/ShutdownListenerManager.java | 12 +-
.../internal/listener/AbstractJobListener.java | 44 --------
.../internal/listener/AbstractListenerManager.java | 4 +-
.../RegistryCenterConnectionStateListener.java | 12 +-
.../sharding/MonitorExecutionListenerManager.java | 13 ++-
.../internal/sharding/ShardingListenerManager.java | 20 ++--
.../lite/internal/sharding/ShardingService.java | 41 +++----
.../lite/internal/snapshot/SnapshotService.java | 14 ++-
.../lite/internal/storage/JobNodeStorage.java | 61 +++--------
.../internal/trigger/TriggerListenerManager.java | 10 +-
.../lite/api/registry/JobInstanceRegistryTest.java | 11 +-
.../config/RescheduleListenerManagerTest.java | 16 +--
.../election/ElectionListenerManagerTest.java | 23 ++--
.../failover/FailoverListenerManagerTest.java | 29 ++---
.../guarantee/GuaranteeListenerManagerTest.java | 21 ++--
.../instance/ShutdownListenerManagerTest.java | 15 +--
.../lite/internal/listener/JobListenerTest.java | 64 -----------
.../RegistryCenterConnectionStateListenerTest.java | 14 +--
.../MonitorExecutionListenerManagerTest.java | 12 +-
.../sharding/ShardingListenerManagerTest.java | 29 ++---
.../internal/sharding/ShardingServiceTest.java | 41 +------
.../lite/internal/storage/JobNodeStorageTest.java | 99 +++--------------
.../trigger/TriggerListenerManagerTest.java | 12 +-
elasticjob-lite/elasticjob-lite-lifecycle/pom.xml | 6 +
.../elasticjob-lite-spring-boot-starter/pom.xml | 11 --
.../elasticjob-lite-spring-core/pom.xml | 6 +
.../elasticjob-lite-spring-namespace/pom.xml | 5 -
75 files changed, 858 insertions(+), 715 deletions(-)
diff --git a/elasticjob-cloud/elasticjob-cloud-common/pom.xml b/elasticjob-cloud/elasticjob-cloud-common/pom.xml
index ecad252..23736af 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/pom.xml
+++ b/elasticjob-cloud/elasticjob-cloud-common/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-registry-center</artifactId>
+ <artifactId>elasticjob-registry-center-zookeeper-curator</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml
similarity index 73%
copy from elasticjob-lite/elasticjob-lite-lifecycle/pom.xml
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml
index 7e634da..dd854f4 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml
@@ -6,7 +6,7 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
@@ -16,36 +16,28 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
+ <artifactId>elasticjob-registry-center</artifactId>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-lite</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <artifactId>elasticjob-lite-lifecycle</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>elasticjob-registry-center-api</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-lite-core</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -57,7 +49,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
similarity index 67%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
index 502f1ec..20aeb28 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
@@ -17,6 +17,10 @@
package org.apache.shardingsphere.elasticjob.reg.base;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
+
import java.util.List;
/**
@@ -93,4 +97,35 @@ public interface CoordinatorRegistryCenter extends RegistryCenter {
* @return raw cache object of registry center
*/
Object getRawCache(String cachePath);
+
+ /**
+ * Execute in leader.
+ *
+ * @param key key
+ * @param callback callback of leader
+ */
+ void executeInLeader(String key, LeaderExecutionCallback callback);
+
+ /**
+ * Watch changes of a key.
+ *
+ * @param key key to be watched
+ * @param listener data listener
+ */
+ void watch(String key, DataChangedEventListener listener);
+
+ /**
+ * Add connection state changed event listener to registry center.
+ *
+ * @param listener connection state changed event listener
+ */
+ void addConnectionStateChangedEventListener(ConnectionStateChangedEventListener listener);
+
+ /**
+ * Execute oprations in transaction.
+ *
+ * @param transactionOperations operations
+ * @throws Exception exception
+ */
+ void executeInTransaction(List<TransactionOperation> transactionOperations) throws Exception;
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
similarity index 93%
copy from elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
index 3b8ace8..b23a28e 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.internal.storage;
+package org.apache.shardingsphere.elasticjob.reg.base;
/**
* Leader server execution callback.
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java
new file mode 100644
index 0000000..6e16b4b
--- /dev/null
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.elasticjob.reg.base.transaction;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+@ToString
+public final class TransactionOperation {
+
+ public enum Type {
+
+ CHECK_EXISTS,
+
+ ADD,
+
+ UPDATE,
+
+ DELETE
+ }
+
+ private final Type type;
+
+ private final String key;
+
+ private final String value;
+
+ /**
+ * Operation add.
+ *
+ * @param key key
+ * @param value value
+ * @return TransactionOperation
+ */
+ public static TransactionOperation opAdd(final String key, final String value) {
+ return new TransactionOperation(Type.ADD, key, value);
+ }
+
+ /**
+ * Operation update.
+ *
+ * @param key key
+ * @param value value
+ * @return TransactionOperation
+ */
+ public static TransactionOperation opUpdate(final String key, final String value) {
+ return new TransactionOperation(Type.UPDATE, key, value);
+ }
+
+ /**
+ * Operation delete.
+ *
+ * @param key key
+ * @return TransactionOperation
+ */
+ public static TransactionOperation opDelete(final String key) {
+ return new TransactionOperation(Type.DELETE, key, null);
+ }
+
+ /**
+ * Operation check exists.
+ *
+ * @param key key
+ * @return TransactionOperation
+ */
+ public static TransactionOperation opCheckExists(final String key) {
+ return new TransactionOperation(Type.CHECK_EXISTS, key, null);
+ }
+}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
similarity index 76%
copy from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
index 1254f91..1f52a6b 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,14 +17,17 @@
package org.apache.shardingsphere.elasticjob.reg.exception;
+import java.util.Collection;
+
/**
- * Registry center exception.
+ * Ignored exception provider.
*/
-public final class RegException extends RuntimeException {
-
- private static final long serialVersionUID = -6417179023552012152L;
+public interface IgnoredExceptionProvider {
- public RegException(final Exception cause) {
- super(cause);
- }
+ /**
+ * Get ignored exceptions.
+ *
+ * @return ignored exceptions
+ */
+ Collection<Class<? extends Throwable>> getIgnoredExceptions();
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
similarity index 80%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
index 46c7249..20f4f07 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
@@ -20,9 +20,10 @@ package org.apache.shardingsphere.elasticjob.reg.exception;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.zookeeper.KeeperException.ConnectionLossException;
-import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.apache.zookeeper.KeeperException.NodeExistsException;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.ServiceLoader;
/**
* Registry center exception handler.
@@ -31,6 +32,12 @@ import org.apache.zookeeper.KeeperException.NodeExistsException;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class RegExceptionHandler {
+ private static final Collection<Class<? extends Throwable>> IGNORED_EXCEPTIONS = new LinkedList<>();
+
+ static {
+ ServiceLoader.load(IgnoredExceptionProvider.class).forEach(each -> IGNORED_EXCEPTIONS.addAll(each.getIgnoredExceptions()));
+ }
+
/**
* Handle exception.
*
@@ -50,6 +57,6 @@ public final class RegExceptionHandler {
}
private static boolean isIgnoredException(final Throwable cause) {
- return cause instanceof ConnectionLossException || cause instanceof NoNodeException || cause instanceof NodeExistsException;
+ return IGNORED_EXCEPTIONS.stream().anyMatch(each -> each.isInstance(cause));
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/TransactionExecutionCallback.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
similarity index 59%
rename from elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/TransactionExecutionCallback.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
index be0296d..9488c86 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/TransactionExecutionCallback.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
@@ -15,24 +15,29 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.internal.storage;
+package org.apache.shardingsphere.elasticjob.reg.listener;
-import org.apache.curator.framework.api.transaction.CuratorOp;
-import org.apache.curator.framework.api.transaction.TransactionOp;
-
-import java.util.List;
+import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
/**
- * Transaction execution callback.
+ * Connection state changed event listener.
*/
-public interface TransactionExecutionCallback {
+public interface ConnectionStateChangedEventListener {
+
+ enum State {
+
+ CONNECTED,
+
+ RECONNECTED,
+
+ UNAVAILABLE,
+ }
/**
- * Create curator operators.
- *
- * @param transactionOp transaction operation
- * @return curator operations
- * @throws Exception exception
+ * Invoke if connection state of registry center changed.
+ *
+ * @param registryCenter registry center
+ * @param newState new state
*/
- List<CuratorOp> createCuratorOperators(TransactionOp transactionOp) throws Exception;
+ void onStateChanged(CoordinatorRegistryCenter registryCenter, State newState);
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
similarity index 68%
copy from elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
index 7318aab..3655952 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
@@ -15,20 +15,29 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.internal.listener.fixture;
+package org.apache.shardingsphere.elasticjob.reg.listener;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
-
-import java.util.List;
+/**
+ * Data changed event.
+ */
@RequiredArgsConstructor
-public final class FooJobListener extends AbstractJobListener {
+@Getter
+public final class DataChangedEvent {
+
+ private final Type type;
+
+ private final String key;
- private final List list;
+ private final String value;
- @Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- list.clear();
+ /**
+ * Data changed type.
+ */
+ public enum Type {
+
+ ADDED, UPDATED, DELETED, IGNORED
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
similarity index 76%
rename from elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
index 3b8ace8..334f8a6 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/LeaderExecutionCallback.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
@@ -15,15 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.internal.storage;
+package org.apache.shardingsphere.elasticjob.reg.listener;
/**
- * Leader server execution callback.
+ * Data changed listener.
*/
-public interface LeaderExecutionCallback {
-
+public interface DataChangedEventListener {
+
/**
- * Execute after leader elected.
+ * Fire when data changed.
+ *
+ * @param event data changed event
*/
- void execute();
+ void onChange(DataChangedEvent event);
}
diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java
new file mode 100644
index 0000000..d788d99
--- /dev/null
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.elasticjob.reg.base.transaction;
+
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation.Type;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public final class TransactionOperationTest {
+
+ @Test
+ public void assertOpAdd() {
+ TransactionOperation actual = TransactionOperation.opAdd("key", "value");
+ assertThat(actual.getType(), is(Type.ADD));
+ assertThat(actual.getKey(), is("key"));
+ assertThat(actual.getValue(), is("value"));
+ }
+
+ @Test
+ public void assertOpUpdate() {
+ TransactionOperation actual = TransactionOperation.opUpdate("key", "value");
+ assertThat(actual.getType(), is(Type.UPDATE));
+ assertThat(actual.getKey(), is("key"));
+ assertThat(actual.getValue(), is("value"));
+ }
+
+ @Test
+ public void assertOpDelete() {
+ TransactionOperation actual = TransactionOperation.opDelete("key");
+ assertThat(actual.getType(), is(Type.DELETE));
+ assertThat(actual.getKey(), is("key"));
+ }
+
+ @Test
+ public void assertOpCheckExists() {
+ TransactionOperation actual = TransactionOperation.opCheckExists("key");
+ assertThat(actual.getType(), is(Type.CHECK_EXISTS));
+ assertThat(actual.getKey(), is("key"));
+ }
+}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
similarity index 55%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
index 380c499..4f3fde8 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
@@ -17,9 +17,6 @@
package org.apache.shardingsphere.elasticjob.reg.exception;
-import org.apache.zookeeper.KeeperException.ConnectionLossException;
-import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.apache.zookeeper.KeeperException.NodeExistsException;
import org.junit.Ignore;
import org.junit.Test;
@@ -41,34 +38,4 @@ public final class RegExceptionHandlerTest {
public void assertHandleExceptionWithOtherException() {
RegExceptionHandler.handleException(new RuntimeException());
}
-
- @Test
- public void assertHandleExceptionWithConnectionLossException() {
- RegExceptionHandler.handleException(new ConnectionLossException());
- }
-
- @Test
- public void assertHandleExceptionWithNoNodeException() {
- RegExceptionHandler.handleException(new NoNodeException());
- }
-
- @Test
- public void assertHandleExceptionWithNoNodeExistsException() {
- RegExceptionHandler.handleException(new NodeExistsException());
- }
-
- @Test
- public void assertHandleExceptionWithCausedConnectionLossException() {
- RegExceptionHandler.handleException(new RuntimeException(new ConnectionLossException()));
- }
-
- @Test
- public void assertHandleExceptionWithCausedNoNodeException() {
- RegExceptionHandler.handleException(new RuntimeException(new NoNodeException()));
- }
-
- @Test
- public void assertHandleExceptionWithCausedNoNodeExistsException() {
- RegExceptionHandler.handleException(new RuntimeException(new NodeExistsException()));
- }
}
diff --git a/elasticjob-infra/elasticjob-registry-center/pom.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml
similarity index 81%
copy from elasticjob-infra/elasticjob-registry-center/pom.xml
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml
index 92fc8bc..756868e 100644
--- a/elasticjob-infra/elasticjob-registry-center/pom.xml
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml
@@ -6,9 +6,9 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,18 +16,26 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
+ <artifactId>elasticjob-regitry-center-provider</artifactId>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-infra</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <artifactId>elasticjob-registry-center</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>elasticjob-registry-center-zookeeper-curator</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-registry-center-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
@@ -39,7 +47,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -77,4 +85,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
similarity index 99%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
index ad985f9..daad350 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
similarity index 99%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
index 5418188..4fbfcee 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
similarity index 68%
rename from elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
index 072ebfa..a414dab 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
@@ -25,13 +25,24 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.api.ACLProvider;
+import org.apache.curator.framework.api.transaction.CuratorOp;
import org.apache.curator.framework.api.transaction.TransactionOp;
import org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
+import org.apache.curator.framework.recipes.leader.LeaderLatch;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
+import org.apache.shardingsphere.elasticjob.reg.exception.RegException;
import org.apache.shardingsphere.elasticjob.reg.exception.RegExceptionHandler;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener.State;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
@@ -39,6 +50,7 @@ import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -298,6 +310,65 @@ public final class ZookeeperRegistryCenter implements CoordinatorRegistryCenter
}
@Override
+ public void addConnectionStateChangedEventListener(final ConnectionStateChangedEventListener listener) {
+ CoordinatorRegistryCenter coordinatorRegistryCenter = this;
+ client.getConnectionStateListenable().addListener((client, newState) -> {
+ State state;
+ switch (newState) {
+ case CONNECTED:
+ state = State.CONNECTED;
+ break;
+ case LOST:
+ case SUSPENDED:
+ state = State.UNAVAILABLE;
+ break;
+ case RECONNECTED:
+ state = State.RECONNECTED;
+ break;
+ case READ_ONLY:
+ default:
+ throw new IllegalStateException("Illegal registry center connection state: " + newState);
+ }
+ listener.onStateChanged(coordinatorRegistryCenter, state);
+ });
+ }
+
+ @Override
+ public void executeInTransaction(final List<TransactionOperation> transactionOperations) throws Exception {
+ client.transaction().forOperations(toCuratorOps(transactionOperations));
+ }
+
+ private List<CuratorOp> toCuratorOps(final List<TransactionOperation> transactionOperations) {
+ List<CuratorOp> result = new ArrayList<>(transactionOperations.size());
+ TransactionOp transactionOp = client.transactionOp();
+ for (TransactionOperation each : transactionOperations) {
+ result.add(toCuratorOp(each, transactionOp));
+ }
+ return result;
+ }
+
+ private CuratorOp toCuratorOp(final TransactionOperation each, final TransactionOp transactionOp) {
+ try {
+ switch (each.getType()) {
+ case CHECK_EXISTS:
+ return transactionOp.check().forPath(each.getKey());
+ case ADD:
+ return transactionOp.create().forPath(each.getKey(), each.getValue().getBytes(StandardCharsets.UTF_8));
+ case UPDATE:
+ return transactionOp.setData().forPath(each.getKey(), each.getValue().getBytes(StandardCharsets.UTF_8));
+ case DELETE:
+ return transactionOp.delete().forPath(each.getKey());
+ default:
+ throw new UnsupportedOperationException(each.toString());
+ }
+ //CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ //CHECKSTYLE:ON
+ throw new RegException(ex);
+ }
+ }
+
+ @Override
public void addCacheData(final String cachePath) {
CuratorCache cache = CuratorCache.build(client, cachePath);
try {
@@ -322,4 +393,55 @@ public final class ZookeeperRegistryCenter implements CoordinatorRegistryCenter
public Object getRawCache(final String cachePath) {
return caches.get(cachePath + "/");
}
+
+ @Override
+ public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
+ try (LeaderLatch latch = new LeaderLatch(client, key)) {
+ latch.start();
+ latch.await();
+ callback.execute();
+ //CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ //CHECKSTYLE:ON
+ handleException(ex);
+ }
+ }
+
+ @Override
+ public void watch(final String key, final DataChangedEventListener listener) {
+ CuratorCache cache = caches.get(key + "/");
+ cache.listenable().addListener((curatorType, oldData, newData) -> {
+ if (null == newData && null == oldData) {
+ return;
+ }
+ Type type = getTypeFromCuratorType(curatorType);
+ String path = Type.DELETED == type ? oldData.getPath() : newData.getPath();
+ if (path.isEmpty() || Type.IGNORED == type) {
+ return;
+ }
+ byte[] data = Type.DELETED == type ? oldData.getData() : newData.getData();
+ listener.onChange(new DataChangedEvent(type, path, null == data ? "" : new String(data, StandardCharsets.UTF_8)));
+ });
+ }
+
+ private Type getTypeFromCuratorType(final CuratorCacheListener.Type curatorType) {
+ switch (curatorType) {
+ case NODE_CREATED:
+ return Type.ADDED;
+ case NODE_DELETED:
+ return Type.DELETED;
+ case NODE_CHANGED:
+ return Type.UPDATED;
+ default:
+ return Type.IGNORED;
+ }
+ }
+
+ private void handleException(final Exception ex) {
+ if (ex instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ } else {
+ throw new RegException(ex);
+ }
+ }
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
similarity index 52%
rename from elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
index 7318aab..360ca65 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/fixture/FooJobListener.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
@@ -15,20 +15,23 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.internal.listener.fixture;
+package org.apache.shardingsphere.elasticjob.reg.zookeeper.exception;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
+import org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider;
+import org.apache.zookeeper.KeeperException.ConnectionLossException;
+import org.apache.zookeeper.KeeperException.NoNodeException;
+import org.apache.zookeeper.KeeperException.NodeExistsException;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * Zookeeper curator ignored exception provider.
+ */
+public final class ZookeeperCuratorIgnoredExceptionProvider implements IgnoredExceptionProvider {
-@RequiredArgsConstructor
-public final class FooJobListener extends AbstractJobListener {
-
- private final List list;
-
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- list.clear();
+ public Collection<Class<? extends Throwable>> getIgnoredExceptions() {
+ return Arrays.asList(ConnectionLossException.class, NoNodeException.class, NodeExistsException.class);
}
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local.properties b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
similarity index 88%
copy from elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local.properties
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
index 62c3d00..7c20af1 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local.properties
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
@@ -15,6 +15,4 @@
# limitations under the License.
#
-/test=test
-/test/deep/nested=deepNested
-/test/child=child
+org.apache.shardingsphere.elasticjob.reg.zookeeper.exception.ZookeeperCuratorIgnoredExceptionProvider
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
similarity index 100%
copy from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
index 9634575..a288292 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
@@ -23,8 +23,8 @@ import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.recipes.leader.LeaderSelector;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.KillSession;
-import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer;
import org.apache.shardingsphere.elasticjob.reg.base.ElectionCandidate;
+import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,9 +35,9 @@ import java.lang.reflect.Field;
import java.util.concurrent.CountDownLatch;
import java.util.function.Supplier;
+import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.atLeastOnce;
@RunWith(MockitoJUnitRunner.class)
public class ZookeeperElectionServiceTest {
diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
new file mode 100644
index 0000000..7e58bdd
--- /dev/null
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.elasticjob.reg.zookeeper;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback;
+import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public final class ZookeeperRegistryCenterExecuteInLeaderTest {
+
+ private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
+ new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterExecuteInLeaderTest.class.getName());
+
+ private static ZookeeperRegistryCenter zkRegCenter;
+
+ @BeforeClass
+ public static void setUp() {
+ EmbedTestingServer.start();
+ zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
+ ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+ zkRegCenter.init();
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ zkRegCenter.close();
+ }
+
+ @Test(timeout = 10000L)
+ public void assertExecuteInLeader() throws InterruptedException {
+ final int threads = 10;
+ CountDownLatch countDownLatch = new CountDownLatch(threads);
+ SerialOnlyExecutionCallback serialOnlyExecutionCallback = new SerialOnlyExecutionCallback(countDownLatch, Thread.currentThread());
+ ExecutorService executorService = Executors.newFixedThreadPool(threads);
+ for (int i = 0; i < threads; i++) {
+ executorService.execute(() -> zkRegCenter.executeInLeader("/leader", serialOnlyExecutionCallback));
+ }
+ executorService.shutdown();
+ countDownLatch.await();
+ }
+
+ @RequiredArgsConstructor
+ private static class SerialOnlyExecutionCallback implements LeaderExecutionCallback {
+
+ private final AtomicBoolean executing = new AtomicBoolean(false);
+
+ private final CountDownLatch countDownLatch;
+
+ private final Thread waitingThread;
+
+ @Override
+ public void execute() {
+ if (executing.get() || !executing.compareAndSet(false, true)) {
+ handleConcurrentExecution();
+ }
+ try {
+ Thread.sleep(100);
+ } catch (final InterruptedException ex) {
+ waitingThread.interrupt();
+ }
+ countDownLatch.countDown();
+ if (!executing.compareAndSet(true, false)) {
+ handleConcurrentExecution();
+ }
+ }
+
+ private void handleConcurrentExecution() {
+ waitingThread.interrupt();
+ throw new IllegalStateException("Callback is executing concurrently");
+ }
+ }
+}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
similarity index 100%
copy from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
similarity index 53%
copy from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
index 3494ace..072d9a6 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,20 +17,25 @@
package org.apache.shardingsphere.elasticjob.reg.zookeeper;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil;
-import org.junit.AfterClass;
+import org.apache.zookeeper.KeeperException;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
-public final class ZookeeperRegistryCenterQueryWithCacheTest {
+public final class ZookeeperRegistryCenterTransactionTest {
- private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
- new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterQueryWithCacheTest.class.getName());
+ private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
+ new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterTransactionTest.class.getName());
private static ZookeeperRegistryCenter zkRegCenter;
@@ -40,23 +45,33 @@ public final class ZookeeperRegistryCenterQueryWithCacheTest {
zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
zkRegCenter.init();
- ZookeeperRegistryCenterTestUtil.persist(zkRegCenter);
- zkRegCenter.addCacheData("/test");
}
- @AfterClass
- public static void tearDown() {
- zkRegCenter.close();
+ @Before
+ public void setup() {
+ ZookeeperRegistryCenterTestUtil.persist(zkRegCenter);
}
@Test
- public void assertGetWithoutValue() {
- assertNull(zkRegCenter.get("/test/null"));
+ public void assertExecuteInTransactionSucceeded() throws Exception {
+ List<TransactionOperation> operations = new ArrayList<>(3);
+ operations.add(TransactionOperation.opCheckExists("/test"));
+ operations.add(TransactionOperation.opCheckExists("/test/child"));
+ operations.add(TransactionOperation.opCheckExists("/test/deep/nested"));
+ operations.add(TransactionOperation.opAdd("/test/transaction", "transaction"));
+ zkRegCenter.executeInTransaction(operations);
+ assertThat(zkRegCenter.getDirectly("/test/transaction"), is("transaction"));
}
@Test
- public void assertGetFromCache() {
- assertThat(zkRegCenter.get("/test"), is("test"));
- assertThat(zkRegCenter.get("/test/deep/nested"), is("deepNested"));
+ public void assertExecuteInTransactionFailed() throws Exception {
+ List<TransactionOperation> operations = new ArrayList<>(3);
+ operations.add(TransactionOperation.opAdd("/test/shouldnotexists", ""));
+ operations.add(TransactionOperation.opCheckExists("/test/notexists"));
+ try {
+ zkRegCenter.executeInTransaction(operations);
+ } catch (KeeperException ignored) {
+ }
+ assertFalse(zkRegCenter.isExisted("/test/shouldnotexists"));
}
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
similarity index 64%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
index 3494ace..af31c3c 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,20 +17,18 @@
package org.apache.shardingsphere.elasticjob.reg.zookeeper;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import java.util.concurrent.CountDownLatch;
-public final class ZookeeperRegistryCenterQueryWithCacheTest {
+public final class ZookeeperRegistryCenterWatchTest {
- private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
- new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterQueryWithCacheTest.class.getName());
+ private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterWatchTest.class.getName());
private static ZookeeperRegistryCenter zkRegCenter;
@@ -41,7 +39,6 @@ public final class ZookeeperRegistryCenterQueryWithCacheTest {
ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
zkRegCenter.init();
ZookeeperRegistryCenterTestUtil.persist(zkRegCenter);
- zkRegCenter.addCacheData("/test");
}
@AfterClass
@@ -49,14 +46,19 @@ public final class ZookeeperRegistryCenterQueryWithCacheTest {
zkRegCenter.close();
}
- @Test
- public void assertGetWithoutValue() {
- assertNull(zkRegCenter.get("/test/null"));
- }
-
- @Test
- public void assertGetFromCache() {
- assertThat(zkRegCenter.get("/test"), is("test"));
- assertThat(zkRegCenter.get("/test/deep/nested"), is("deepNested"));
+ @Test(timeout = 10000L)
+ public void assertWatch() throws InterruptedException {
+ CountDownLatch waitingForCountDownValue = new CountDownLatch(1);
+ zkRegCenter.addCacheData("/test");
+ CountDownLatch waitingForWatchReady = new CountDownLatch(1);
+ zkRegCenter.watch("/test", event -> {
+ waitingForWatchReady.countDown();
+ if (DataChangedEvent.Type.UPDATED == event.getType() && "countDown".equals(event.getValue())) {
+ waitingForCountDownValue.countDown();
+ }
+ });
+ waitingForWatchReady.await();
+ zkRegCenter.update("/test", "countDown");
+ waitingForCountDownValue.await();
}
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
similarity index 57%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
index 737e040..efb06c8 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,22 +15,24 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.reg.zookeeper;
+package org.apache.shardingsphere.elasticjob.reg.zookeeper.exception;
+import org.apache.zookeeper.KeeperException.ConnectionLossException;
+import org.apache.zookeeper.KeeperException.NoNodeException;
+import org.apache.zookeeper.KeeperException.NodeExistsException;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.List;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class ZookeeperConfigurationTest {
+public final class ZookeeperCuratorIgnoredExceptionProviderTest {
@Test
- public void assertNewZookeeperConfigurationForServerListsAndNamespace() {
- ZookeeperConfiguration zkConfig = new ZookeeperConfiguration("localhost:2181", "myNamespace");
- assertThat(zkConfig.getServerLists(), is("localhost:2181"));
- assertThat(zkConfig.getNamespace(), is("myNamespace"));
- assertThat(zkConfig.getBaseSleepTimeMilliseconds(), is(1000));
- assertThat(zkConfig.getMaxSleepTimeMilliseconds(), is(3000));
- assertThat(zkConfig.getMaxRetries(), is(3));
+ public void assertIgnoredException() {
+ List<Class<? extends Throwable>> expected = Arrays.asList(ConnectionLossException.class, NoNodeException.class, NodeExistsException.class);
+ assertThat(new ZookeeperCuratorIgnoredExceptionProvider().getIgnoredExceptions(), is(expected));
}
}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local.properties b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/conf/reg/local.properties
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local.properties
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/conf/reg/local.properties
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local_overwrite.properties b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties
similarity index 100%
rename from elasticjob-infra/elasticjob-registry-center/src/test/resources/conf/reg/local_overwrite.properties
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/resources/logback-test.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/logback-test.xml
similarity index 100%
copy from elasticjob-infra/elasticjob-registry-center/src/test/resources/logback-test.xml
copy to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/resources/logback-test.xml
diff --git a/elasticjob-infra/elasticjob-registry-center/src/test/resources/logback-test.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/pom.xml
similarity index 52%
rename from elasticjob-infra/elasticjob-registry-center/src/test/resources/logback-test.xml
rename to elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/pom.xml
index f216020..52149e4 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/test/resources/logback-test.xml
+++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/pom.xml
@@ -6,9 +6,9 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,25 +16,20 @@
~ limitations under the License.
-->
-<configuration>
- <property name="log.context.name" value="elasticjob-lite-core-test" />
- <property name="log.charset" value="UTF-8" />
- <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n" />
-
- <contextName>${log.context.name}</contextName>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>ERROR</level>
- </filter>
- <encoder charset="${log.charset}">
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <root>
- <appender-ref ref="STDOUT" />
- </root>
-
- <logger name="org.apache.curator.framework.recipes.leader.LeaderSelector" level="OFF" />
-</configuration>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>elasticjob-registry-center</artifactId>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>elasticjob-regitry-center-provider</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>elasticjob-registry-center-zookeeper-curator</module>
+ </modules>
+</project>
diff --git a/elasticjob-infra/elasticjob-registry-center/pom.xml b/elasticjob-infra/elasticjob-registry-center/pom.xml
index 92fc8bc..11272ee 100644
--- a/elasticjob-infra/elasticjob-registry-center/pom.xml
+++ b/elasticjob-infra/elasticjob-registry-center/pom.xml
@@ -25,56 +25,11 @@
</parent>
<artifactId>elasticjob-registry-center</artifactId>
<name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>elasticjob-registry-center-api</module>
+ <module>elasticjob-regitry-center-provider</module>
+ </modules>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/elasticjob-lite/elasticjob-lite-core/pom.xml b/elasticjob-lite/elasticjob-lite-core/pom.xml
index f6c963e..32ff0c0 100644
--- a/elasticjob-lite/elasticjob-lite-core/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-core/pom.xml
@@ -38,7 +38,12 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-registry-center</artifactId>
+ <artifactId>elasticjob-registry-center-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-registry-center-zookeeper-curator</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistry.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistry.java
index bf7931d..9f76236 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistry.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistry.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.lite.api.registry;
import lombok.RequiredArgsConstructor;
-import org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.shardingsphere.elasticjob.api.ElasticJob;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
@@ -26,9 +25,10 @@ import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap;
import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import java.util.Arrays;
import java.util.regex.Pattern;
@@ -51,18 +51,17 @@ public final class JobInstanceRegistry {
* Register.
*/
public void register() {
- CuratorCache cache = (CuratorCache) regCenter.getRawCache("/");
- cache.listenable().addListener(new JobInstanceRegistryListener());
+ regCenter.watch("/", new JobInstanceRegistryListener());
}
- public class JobInstanceRegistryListener extends AbstractJobListener {
+ public class JobInstanceRegistryListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (eventType != Type.NODE_CREATED || !isJobConfigPath(path)) {
+ public void onChange(final DataChangedEvent event) {
+ if (event.getType() != DataChangedEvent.Type.ADDED || !isJobConfigPath(event.getKey())) {
return;
}
- JobConfiguration jobConfig = YamlEngine.unmarshal(data, JobConfigurationPOJO.class).toJobConfiguration();
+ JobConfiguration jobConfig = YamlEngine.unmarshal(event.getValue(), JobConfigurationPOJO.class).toJobConfiguration();
if (jobConfig.isDisabled() || !isLabelMatch(jobConfig)) {
return;
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManager.java
index 04fe773..7a49da2 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManager.java
@@ -19,12 +19,14 @@ package org.apache.shardingsphere.elasticjob.lite.internal.config;
import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
+import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Reschedule listener manager.
@@ -46,12 +48,12 @@ public final class RescheduleListenerManager extends AbstractListenerManager {
addDataListener(new CronSettingAndJobEventChangedJobListener());
}
- class CronSettingAndJobEventChangedJobListener extends AbstractJobListener {
+ class CronSettingAndJobEventChangedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (configNode.isConfigPath(path) && Type.NODE_CHANGED == eventType && !JobRegistry.getInstance().isShutdown(jobName)) {
- JobConfiguration jobConfiguration = YamlEngine.unmarshal(data, JobConfigurationPOJO.class).toJobConfiguration();
+ public void onChange(final DataChangedEvent event) {
+ if (configNode.isConfigPath(event.getKey()) && Type.UPDATED == event.getType() && !JobRegistry.getInstance().isShutdown(jobName)) {
+ JobConfiguration jobConfiguration = YamlEngine.unmarshal(event.getValue(), JobConfigurationPOJO.class).toJobConfiguration();
if (StringUtils.isEmpty(jobConfiguration.getCron())) {
JobRegistry.getInstance().getJobScheduleController(jobName).rescheduleJob();
} else {
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManager.java
index f06b5bf..09d79d5 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManager.java
@@ -18,13 +18,15 @@
package org.apache.shardingsphere.elasticjob.lite.internal.election;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerNode;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import java.util.Objects;
@@ -58,11 +60,11 @@ public final class ElectionListenerManager extends AbstractListenerManager {
addDataListener(new LeaderAbdicationJobListener());
}
- class LeaderElectionJobListener extends AbstractJobListener {
+ class LeaderElectionJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (!JobRegistry.getInstance().isShutdown(jobName) && (isActiveElection(path, data) || isPassiveElection(path, eventType))) {
+ public void onChange(final DataChangedEvent event) {
+ if (!JobRegistry.getInstance().isShutdown(jobName) && (isActiveElection(event.getKey(), event.getValue()) || isPassiveElection(event.getKey(), event.getType()))) {
leaderService.electLeader();
}
}
@@ -77,7 +79,7 @@ public final class ElectionListenerManager extends AbstractListenerManager {
}
private boolean isLeaderCrashed(final String path, final Type eventType) {
- return leaderNode.isLeaderInstancePath(path) && Type.NODE_DELETED == eventType;
+ return leaderNode.isLeaderInstancePath(path) && Type.DELETED == eventType;
}
private boolean isLocalServerEnabled(final String path, final String data) {
@@ -85,11 +87,11 @@ public final class ElectionListenerManager extends AbstractListenerManager {
}
}
- class LeaderAbdicationJobListener extends AbstractJobListener {
+ class LeaderAbdicationJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (leaderService.isLeader() && isLocalServerDisabled(path, data)) {
+ public void onChange(final DataChangedEvent event) {
+ if (leaderService.isLeader() && isLocalServerDisabled(event.getKey(), event.getValue())) {
leaderService.removeLeader();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderService.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderService.java
index 49bd262..948e278 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderService.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderService.java
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
-import org.apache.shardingsphere.elasticjob.lite.internal.storage.LeaderExecutionCallback;
+import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.infra.concurrent.BlockUtils;
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManager.java
index 6f46161..1281795 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManager.java
@@ -22,11 +22,13 @@ import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationNode;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceNode;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import java.util.List;
@@ -67,12 +69,12 @@ public final class FailoverListenerManager extends AbstractListenerManager {
return configService.load(true).isFailover();
}
- class JobCrashedJobListener extends AbstractJobListener {
+ class JobCrashedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (!JobRegistry.getInstance().isShutdown(jobName) && isFailoverEnabled() && Type.NODE_DELETED == eventType && instanceNode.isInstancePath(path)) {
- String jobInstanceId = path.substring(instanceNode.getInstanceFullPath().length() + 1);
+ public void onChange(final DataChangedEvent event) {
+ if (!JobRegistry.getInstance().isShutdown(jobName) && isFailoverEnabled() && Type.DELETED == event.getType() && instanceNode.isInstancePath(event.getKey())) {
+ String jobInstanceId = event.getKey().substring(instanceNode.getInstanceFullPath().length() + 1);
if (jobInstanceId.equals(JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId())) {
return;
}
@@ -92,11 +94,11 @@ public final class FailoverListenerManager extends AbstractListenerManager {
}
}
- class FailoverSettingsChangedJobListener extends AbstractJobListener {
+ class FailoverSettingsChangedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (configNode.isConfigPath(path) && Type.NODE_CHANGED == eventType && !YamlEngine.unmarshal(data, JobConfigurationPOJO.class).toJobConfiguration().isFailover()) {
+ public void onChange(final DataChangedEvent event) {
+ if (configNode.isConfigPath(event.getKey()) && Type.UPDATED == event.getType() && !YamlEngine.unmarshal(event.getValue(), JobConfigurationPOJO.class).toJobConfiguration().isFailover()) {
failoverService.removeFailoverInfo();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverService.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverService.java
index 56594af..23bc437 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverService.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleCo
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingNode;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
-import org.apache.shardingsphere.elasticjob.lite.internal.storage.LeaderExecutionCallback;
+import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import java.util.ArrayList;
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManager.java
index 7497592..44ede09 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManager.java
@@ -19,9 +19,11 @@ package org.apache.shardingsphere.elasticjob.lite.internal.guarantee;
import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener;
import org.apache.shardingsphere.elasticjob.lite.api.listener.AbstractDistributeOnceElasticJobListener;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import java.util.Collection;
@@ -46,11 +48,11 @@ public final class GuaranteeListenerManager extends AbstractListenerManager {
addDataListener(new CompletedNodeRemovedJobListener());
}
- class StartedNodeRemovedJobListener extends AbstractJobListener {
+ class StartedNodeRemovedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (Type.NODE_DELETED == eventType && guaranteeNode.isStartedRootNode(path)) {
+ public void onChange(final DataChangedEvent event) {
+ if (Type.DELETED == event.getType() && guaranteeNode.isStartedRootNode(event.getKey())) {
for (ElasticJobListener each : elasticJobListeners) {
if (each instanceof AbstractDistributeOnceElasticJobListener) {
((AbstractDistributeOnceElasticJobListener) each).notifyWaitingTaskStart();
@@ -60,11 +62,11 @@ public final class GuaranteeListenerManager extends AbstractListenerManager {
}
}
- class CompletedNodeRemovedJobListener extends AbstractJobListener {
+ class CompletedNodeRemovedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (Type.NODE_DELETED == eventType && guaranteeNode.isCompletedRootNode(path)) {
+ public void onChange(final DataChangedEvent event) {
+ if (Type.DELETED == event.getType() && guaranteeNode.isCompletedRootNode(event.getKey())) {
for (ElasticJobListener each : elasticJobListeners) {
if (each instanceof AbstractDistributeOnceElasticJobListener) {
((AbstractDistributeOnceElasticJobListener) each).notifyWaitingTaskComplete();
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManager.java
index 0d863f0..3534b93 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManager.java
@@ -17,11 +17,13 @@
package org.apache.shardingsphere.elasticjob.lite.internal.instance;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.SchedulerFacade;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Job instance shutdown listener manager.
@@ -49,18 +51,18 @@ public final class ShutdownListenerManager extends AbstractListenerManager {
addDataListener(new InstanceShutdownStatusJobListener());
}
- class InstanceShutdownStatusJobListener extends AbstractJobListener {
+ class InstanceShutdownStatusJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
+ public void onChange(final DataChangedEvent event) {
if (!JobRegistry.getInstance().isShutdown(jobName) && !JobRegistry.getInstance().getJobScheduleController(jobName).isPaused()
- && isRemoveInstance(path, eventType) && !isReconnectedRegistryCenter()) {
+ && isRemoveInstance(event.getKey(), event.getType()) && !isReconnectedRegistryCenter()) {
schedulerFacade.shutdownInstance();
}
}
private boolean isRemoveInstance(final String path, final Type eventType) {
- return instanceNode.isLocalInstancePath(path) && Type.NODE_DELETED == eventType;
+ return instanceNode.isLocalInstancePath(path) && Type.DELETED == eventType;
}
private boolean isReconnectedRegistryCenter() {
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractJobListener.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractJobListener.java
deleted file mode 100644
index 9756fa0..0000000
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractJobListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.elasticjob.lite.internal.listener;
-
-import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * Job Listener.
- */
-public abstract class AbstractJobListener implements CuratorCacheListener {
-
- @Override
- public final void event(final Type type, final ChildData oldData, final ChildData newData) {
- if (null == newData && null == oldData) {
- return;
- }
- String path = Type.NODE_DELETED == type ? oldData.getPath() : newData.getPath();
- byte[] data = Type.NODE_DELETED == type ? oldData.getData() : newData.getData();
- if (path.isEmpty()) {
- return;
- }
- dataChanged(path, type, null == data ? "" : new String(data, StandardCharsets.UTF_8));
- }
-
- protected abstract void dataChanged(String path, Type eventType, String data);
-}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractListenerManager.java
index dde3925..c80740b 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/AbstractListenerManager.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.elasticjob.lite.internal.listener;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Listener manager.
@@ -37,7 +37,7 @@ public abstract class AbstractListenerManager {
*/
public abstract void start();
- protected void addDataListener(final CuratorCacheListener listener) {
+ protected void addDataListener(final DataChangedEventListener listener) {
jobNodeStorage.addDataListener(listener);
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListener.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListener.java
index b939faa..fd2c1ca 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListener.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListener.java
@@ -17,9 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.internal.listener;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.state.ConnectionState;
-import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceService;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
@@ -27,11 +24,12 @@ import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ExecutionService;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener;
/**
* Registry center connection state listener.
*/
-public final class RegistryCenterConnectionStateListener implements ConnectionStateListener {
+public final class RegistryCenterConnectionStateListener implements ConnectionStateChangedEventListener {
private final String jobName;
@@ -52,14 +50,14 @@ public final class RegistryCenterConnectionStateListener implements ConnectionSt
}
@Override
- public void stateChanged(final CuratorFramework client, final ConnectionState newState) {
+ public void onStateChanged(final CoordinatorRegistryCenter registryCenter, final State newState) {
if (JobRegistry.getInstance().isShutdown(jobName)) {
return;
}
JobScheduleController jobScheduleController = JobRegistry.getInstance().getJobScheduleController(jobName);
- if (ConnectionState.SUSPENDED == newState || ConnectionState.LOST == newState) {
+ if (State.UNAVAILABLE == newState) {
jobScheduleController.pauseJob();
- } else if (ConnectionState.RECONNECTED == newState) {
+ } else if (State.RECONNECTED == newState) {
serverService.persistOnline(serverService.isEnableServer(JobRegistry.getInstance().getJobInstance(jobName).getServerIp()));
instanceService.persistOnline();
executionService.clearRunningInfo(shardingService.getLocalShardingItems());
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManager.java
index 0267569..bcf123a 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManager.java
@@ -17,12 +17,14 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
+import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationNode;
-import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Monitor execution listener manager.
@@ -44,11 +46,12 @@ public final class MonitorExecutionListenerManager extends AbstractListenerManag
addDataListener(new MonitorExecutionSettingsChangedJobListener());
}
- class MonitorExecutionSettingsChangedJobListener extends AbstractJobListener {
+ class MonitorExecutionSettingsChangedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (configNode.isConfigPath(path) && Type.NODE_CHANGED == eventType && !YamlEngine.unmarshal(data, JobConfigurationPOJO.class).toJobConfiguration().isMonitorExecution()) {
+ public void onChange(final DataChangedEvent event) {
+ if (configNode.isConfigPath(event.getKey()) && Type.UPDATED == event.getType()
+ && !YamlEngine.unmarshal(event.getValue(), JobConfigurationPOJO.class).toJobConfiguration().isMonitorExecution()) {
executionService.clearAllRunningInfo();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManager.java
index 74b3a44..2fe522c 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManager.java
@@ -22,12 +22,14 @@ import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationNode;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceNode;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerNode;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Sharding listener manager.
@@ -65,12 +67,12 @@ public final class ShardingListenerManager extends AbstractListenerManager {
addDataListener(new ListenServersChangedJobListener());
}
- class ShardingTotalCountChangedJobListener extends AbstractJobListener {
+ class ShardingTotalCountChangedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (configNode.isConfigPath(path) && 0 != JobRegistry.getInstance().getCurrentShardingTotalCount(jobName)) {
- int newShardingTotalCount = YamlEngine.unmarshal(data, JobConfigurationPOJO.class).toJobConfiguration().getShardingTotalCount();
+ public void onChange(final DataChangedEvent event) {
+ if (configNode.isConfigPath(event.getKey()) && 0 != JobRegistry.getInstance().getCurrentShardingTotalCount(jobName)) {
+ int newShardingTotalCount = YamlEngine.unmarshal(event.getValue(), JobConfigurationPOJO.class).toJobConfiguration().getShardingTotalCount();
if (newShardingTotalCount != JobRegistry.getInstance().getCurrentShardingTotalCount(jobName)) {
shardingService.setReshardingFlag();
JobRegistry.getInstance().setCurrentShardingTotalCount(jobName, newShardingTotalCount);
@@ -79,11 +81,11 @@ public final class ShardingListenerManager extends AbstractListenerManager {
}
}
- class ListenServersChangedJobListener extends AbstractJobListener {
+ class ListenServersChangedJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (!JobRegistry.getInstance().isShutdown(jobName) && (isInstanceChange(eventType, path) || isServerChange(path)) && !(isStaticSharding() && hasShardingInfo())) {
+ public void onChange(final DataChangedEvent event) {
+ if (!JobRegistry.getInstance().isShutdown(jobName) && (isInstanceChange(event.getType(), event.getKey()) || isServerChange(event.getKey())) && !(isStaticSharding() && hasShardingInfo())) {
shardingService.setReshardingFlag();
}
}
@@ -97,7 +99,7 @@ public final class ShardingListenerManager extends AbstractListenerManager {
}
private boolean isInstanceChange(final Type eventType, final String path) {
- return instanceNode.isInstancePath(path) && Type.NODE_CHANGED != eventType;
+ return instanceNode.isInstancePath(path) && Type.UPDATED != eventType;
}
private boolean isServerChange(final String path) {
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingService.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingService.java
index 9ac967e..946c481 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingService.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingService.java
@@ -17,10 +17,7 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.curator.framework.api.transaction.CuratorOp;
-import org.apache.curator.framework.api.transaction.TransactionOp;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.concurrent.BlockUtils;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
@@ -35,9 +32,11 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
-import org.apache.shardingsphere.elasticjob.lite.internal.storage.TransactionExecutionCallback;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -123,7 +122,7 @@ public final class ShardingService {
jobNodeStorage.fillEphemeralJobNode(ShardingNode.PROCESSING, "");
resetShardingInfo(shardingTotalCount);
JobShardingStrategy jobShardingStrategy = JobShardingStrategyFactory.getStrategy(jobConfig.getJobShardingStrategyType());
- jobNodeStorage.executeInTransaction(new PersistShardingInfoTransactionExecutionCallback(jobShardingStrategy.sharding(availableJobInstances, jobName, shardingTotalCount)));
+ jobNodeStorage.executeInTransaction(getShardingResultTransactionOperations(jobShardingStrategy.sharding(availableJobInstances, jobName, shardingTotalCount)));
log.debug("Job '{}' sharding complete.", jobName);
}
@@ -154,6 +153,20 @@ public final class ShardingService {
}
}
+ private List<TransactionOperation> getShardingResultTransactionOperations(final Map<JobInstance, List<Integer>> shardingResults) {
+ List<TransactionOperation> result = new ArrayList<>(shardingResults.size() + 2);
+ for (Entry<JobInstance, List<Integer>> entry : shardingResults.entrySet()) {
+ for (int shardingItem : entry.getValue()) {
+ String key = jobNodePath.getFullPath(ShardingNode.getInstanceNode(shardingItem));
+ String value = new String(entry.getKey().getJobInstanceId().getBytes(), StandardCharsets.UTF_8);
+ result.add(TransactionOperation.opAdd(key, value));
+ }
+ }
+ result.add(TransactionOperation.opDelete(jobNodePath.getFullPath(ShardingNode.NECESSARY)));
+ result.add(TransactionOperation.opDelete(jobNodePath.getFullPath(ShardingNode.PROCESSING)));
+ return result;
+ }
+
/**
* Get sharding items.
*
@@ -224,22 +237,4 @@ public final class ShardingService {
return false;
}
- @RequiredArgsConstructor
- class PersistShardingInfoTransactionExecutionCallback implements TransactionExecutionCallback {
-
- private final Map<JobInstance, List<Integer>> shardingResults;
-
- @Override
- public List<CuratorOp> createCuratorOperators(final TransactionOp transactionOp) throws Exception {
- List<CuratorOp> result = new LinkedList<>();
- for (Entry<JobInstance, List<Integer>> entry : shardingResults.entrySet()) {
- for (int shardingItem : entry.getValue()) {
- result.add(transactionOp.create().forPath(jobNodePath.getFullPath(ShardingNode.getInstanceNode(shardingItem)), entry.getKey().getJobInstanceId().getBytes()));
- }
- }
- result.add(transactionOp.delete().forPath(jobNodePath.getFullPath(ShardingNode.NECESSARY)));
- result.add(transactionOp.delete().forPath(jobNodePath.getFullPath(ShardingNode.PROCESSING)));
- return result;
- }
- }
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
index d2a1131..4aa2c84 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
@@ -23,6 +23,7 @@ import org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.shardingsphere.elasticjob.lite.internal.util.SensitiveInfoUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -112,11 +113,14 @@ public final class SnapshotService {
String zkValue = Optional.ofNullable(regCenter.get(zkPath)).orElse("");
String cachePath = zkPath;
String cacheValue = zkValue;
- CuratorCache cache = (CuratorCache) regCenter.getRawCache("/" + jobName);
- if (null != cache) {
- Optional<ChildData> cacheData = cache.get(zkPath);
- cachePath = cacheData.map(ChildData::getPath).orElse("");
- cacheValue = cacheData.map(ChildData::getData).map(String::new).orElse("");
+ // TODO Decoupling ZooKeeper
+ if (regCenter instanceof ZookeeperRegistryCenter) {
+ CuratorCache cache = (CuratorCache) regCenter.getRawCache("/" + jobName);
+ if (null != cache) {
+ Optional<ChildData> cacheData = cache.get(zkPath);
+ cachePath = cacheData.map(ChildData::getPath).orElse("");
+ cacheValue = cacheData.map(ChildData::getData).map(String::new).orElse("");
+ }
}
if (zkValue.equals(cacheValue) && zkPath.equals(cachePath)) {
result.add(String.join(" | ", zkPath, zkValue));
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorage.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorage.java
index 6893322..ffb30a0 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorage.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorage.java
@@ -17,18 +17,14 @@
package org.apache.shardingsphere.elasticjob.lite.internal.storage;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.api.transaction.CuratorOp;
-import org.apache.curator.framework.api.transaction.TransactionOp;
-import org.apache.curator.framework.recipes.cache.CuratorCache;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
-import org.apache.curator.framework.recipes.leader.LeaderLatch;
-import org.apache.curator.framework.state.ConnectionStateListener;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
import org.apache.shardingsphere.elasticjob.reg.exception.RegExceptionHandler;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
-import java.util.LinkedList;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -180,18 +176,16 @@ public final class JobNodeStorage {
}
/**
- * Execute operator in transaction.
+ * Execute operations in transaction.
*
- * @param callback transaction execution callback
+ * @param transactionOperations operations to be executed in transaction
*/
- public void executeInTransaction(final TransactionExecutionCallback callback) {
+ public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
+ List<TransactionOperation> result = new ArrayList<>(transactionOperations.size() + 1);
+ result.add(TransactionOperation.opCheckExists("/"));
+ result.addAll(transactionOperations);
try {
- List<CuratorOp> operations = new LinkedList<>();
- CuratorFramework client = getClient();
- TransactionOp transactionOp = client.transactionOp();
- operations.add(transactionOp.check().forPath("/"));
- operations.addAll(callback.createCuratorOperators(transactionOp));
- client.transaction().forOperations(operations);
+ regCenter.executeInTransaction(result);
//CHECKSTYLE:OFF
} catch (final Exception ex) {
//CHECKSTYLE:ON
@@ -206,23 +200,7 @@ public final class JobNodeStorage {
* @param callback execute callback
*/
public void executeInLeader(final String latchNode, final LeaderExecutionCallback callback) {
- try (LeaderLatch latch = new LeaderLatch(getClient(), jobNodePath.getFullPath(latchNode))) {
- latch.start();
- latch.await();
- callback.execute();
- //CHECKSTYLE:OFF
- } catch (final Exception ex) {
- //CHECKSTYLE:ON
- handleException(ex);
- }
- }
-
- private void handleException(final Exception ex) {
- if (ex instanceof InterruptedException) {
- Thread.currentThread().interrupt();
- } else {
- throw new JobSystemException(ex);
- }
+ regCenter.executeInLeader(jobNodePath.getFullPath(latchNode), callback);
}
/**
@@ -230,12 +208,8 @@ public final class JobNodeStorage {
*
* @param listener connection state listener
*/
- public void addConnectionStateListener(final ConnectionStateListener listener) {
- getClient().getConnectionStateListenable().addListener(listener);
- }
-
- private CuratorFramework getClient() {
- return (CuratorFramework) regCenter.getRawClient();
+ public void addConnectionStateListener(final ConnectionStateChangedEventListener listener) {
+ regCenter.addConnectionStateChangedEventListener(listener);
}
/**
@@ -243,9 +217,8 @@ public final class JobNodeStorage {
*
* @param listener data listener
*/
- public void addDataListener(final CuratorCacheListener listener) {
- CuratorCache cache = (CuratorCache) regCenter.getRawCache("/" + jobName);
- cache.listenable().addListener(listener);
+ public void addDataListener(final DataChangedEventListener listener) {
+ regCenter.watch("/" + jobName, listener);
}
/**
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManager.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManager.java
index b4c8b98..2f0ff73 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManager.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManager.java
@@ -17,10 +17,12 @@
package org.apache.shardingsphere.elasticjob.lite.internal.trigger;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractListenerManager;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
/**
* Job trigger listener manager.
@@ -45,11 +47,11 @@ public final class TriggerListenerManager extends AbstractListenerManager {
addDataListener(new JobTriggerStatusJobListener());
}
- class JobTriggerStatusJobListener extends AbstractJobListener {
+ class JobTriggerStatusJobListener implements DataChangedEventListener {
@Override
- protected void dataChanged(final String path, final Type eventType, final String data) {
- if (!triggerNode.isLocalTriggerPath(path) || Type.NODE_CREATED != eventType) {
+ public void onChange(final DataChangedEvent event) {
+ if (!triggerNode.isLocalTriggerPath(event.getKey()) || Type.ADDED != event.getType()) {
return;
}
triggerService.removeTriggerFlag();
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java
index 66ce25a..7ab88a0 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java
@@ -17,12 +17,13 @@
package org.apache.shardingsphere.elasticjob.lite.api.registry;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -40,7 +41,7 @@ public final class JobInstanceRegistryTest {
@Test
public void assertListenWithoutConfigPath() {
JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id"));
- jobInstanceRegistry.new JobInstanceRegistryListener().dataChanged("/jobName", CuratorCacheListener.Type.NODE_CREATED, "");
+ jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName", ""));
verify(regCenter, times(0)).get("/jobName");
}
@@ -48,7 +49,7 @@ public final class JobInstanceRegistryTest {
public void assertListenLabelNotMatch() {
JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id", "label1,label2"));
String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).label("label").build());
- jobInstanceRegistry.new JobInstanceRegistryListener().dataChanged("/jobName/config", CuratorCacheListener.Type.NODE_CREATED, jobConfig);
+ jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig));
verify(regCenter, times(0)).get("/jobName");
}
@@ -56,14 +57,14 @@ public final class JobInstanceRegistryTest {
public void assertListenScheduleJob() {
JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id"));
String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).cron("0/1 * * * * ?").label("label").build());
- jobInstanceRegistry.new JobInstanceRegistryListener().dataChanged("/jobName/config", CuratorCacheListener.Type.NODE_CREATED, jobConfig);
+ jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig));
}
@Test(expected = RuntimeException.class)
public void assertListenOneOffJob() {
JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id", "label"));
String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).label("label").build());
- jobInstanceRegistry.new JobInstanceRegistryListener().dataChanged("/jobName/config", CuratorCacheListener.Type.NODE_CREATED, jobConfig);
+ jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig));
}
private String toYaml(final JobConfiguration build) {
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
index 68be1f0..51ba639 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.elasticjob.lite.internal.config;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
-import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
+import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
-import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
+import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,9 +32,9 @@ import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.ArgumentMatchers.any;
@RunWith(MockitoJUnitRunner.class)
public final class RescheduleListenerManagerTest {
@@ -63,19 +63,19 @@ public final class RescheduleListenerManagerTest {
@Test
public void assertCronSettingChangedJobListenerWhenIsNotCronPath() {
- rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().dataChanged("/test_job/config/other", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/config/other", LiteYamlConstants.getJobYaml()));
verify(jobScheduleController, times(0)).rescheduleJob(any(), any());
}
@Test
public void assertCronSettingChangedJobListenerWhenIsCronPathButNotUpdate() {
- rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().dataChanged("/test_job/config", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(jobScheduleController, times(0)).rescheduleJob(any(), any());
}
@Test
public void assertCronSettingChangedJobListenerWhenIsCronPathAndUpdateButCannotFindJob() {
- rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYaml());
+ rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(jobScheduleController, times(0)).rescheduleJob(any(), any());
}
@@ -84,7 +84,7 @@ public final class RescheduleListenerManagerTest {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYaml());
+ rescheduleListenerManager.new CronSettingAndJobEventChangedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(jobScheduleController).rescheduleJob("0/1 * * * * ?", null);
JobRegistry.getInstance().shutdown("test_job");
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
index 93995db..692b58f 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.internal.election;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
@@ -26,6 +25,8 @@ import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -73,25 +74,25 @@ public final class ElectionListenerManagerTest {
@Test
public void assertIsNotLeaderInstancePathAndServerPath() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/other", Type.NODE_DELETED, "127.0.0.1");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.DELETED, "/test_job/leader/election/other", "127.0.0.1"));
verify(leaderService, times(0)).electLeader();
}
@Test
public void assertLeaderElectionWhenAddLeaderInstancePath() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/instance", Type.NODE_CREATED, "127.0.0.1");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/leader/election/instance", "127.0.0.1"));
verify(leaderService, times(0)).electLeader();
}
@Test
public void assertLeaderElectionWhenRemoveLeaderInstancePathWithoutAvailableServers() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/instance", Type.NODE_DELETED, "127.0.0.1");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/leader/election/instance", "127.0.0.1"));
verify(leaderService, times(0)).electLeader();
}
@Test
public void assertLeaderElectionWhenRemoveLeaderInstancePathWithAvailableServerButJobInstanceIsShutdown() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/instance", Type.NODE_DELETED, "127.0.0.1");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/leader/election/instance", "127.0.0.1"));
verify(leaderService, times(0)).electLeader();
}
@@ -100,20 +101,20 @@ public final class ElectionListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(serverService.isAvailableServer("127.0.0.1")).thenReturn(true);
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/instance", Type.NODE_DELETED, "127.0.0.1");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/leader/election/instance", "127.0.0.1"));
verify(leaderService).electLeader();
JobRegistry.getInstance().shutdown("test_job");
}
@Test
public void assertLeaderElectionWhenServerDisableWithoutLeader() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_DELETED, ServerStatus.DISABLED.name());
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/servers/127.0.0.1", ServerStatus.DISABLED.name()));
verify(leaderService, times(0)).electLeader();
}
@Test
public void assertLeaderElectionWhenServerEnableWithLeader() {
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, "");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ""));
verify(leaderService, times(0)).electLeader();
}
@@ -121,21 +122,21 @@ public final class ElectionListenerManagerTest {
public void assertLeaderElectionWhenServerEnableWithoutLeader() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, "");
+ electionListenerManager.new LeaderElectionJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ""));
verify(leaderService).electLeader();
JobRegistry.getInstance().shutdown("test_job");
}
@Test
public void assertLeaderAbdicationWhenFollowerDisable() {
- electionListenerManager.new LeaderAbdicationJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, ServerStatus.DISABLED.name());
+ electionListenerManager.new LeaderAbdicationJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ServerStatus.DISABLED.name()));
verify(leaderService, times(0)).removeLeader();
}
@Test
public void assertLeaderAbdicationWhenLeaderDisable() {
when(leaderService.isLeader()).thenReturn(true);
- electionListenerManager.new LeaderAbdicationJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, ServerStatus.DISABLED.name());
+ electionListenerManager.new LeaderAbdicationJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ServerStatus.DISABLED.name()));
verify(leaderService).removeLeader();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
index 8cce3f9..f5d9106 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
@@ -17,17 +17,18 @@
package org.apache.shardingsphere.elasticjob.lite.internal.failover;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
+import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -73,12 +74,12 @@ public final class FailoverListenerManagerTest {
@Test
public void assertStart() {
failoverListenerManager.start();
- verify(jobNodeStorage, times(2)).addDataListener(ArgumentMatchers.<AbstractJobListener>any());
+ verify(jobNodeStorage, times(2)).addDataListener(ArgumentMatchers.any(DataChangedEventListener.class));
}
@Test
public void assertJobCrashedJobListenerWhenFailoverDisabled() {
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(failoverService, times(0)).failoverIfNecessary();
}
@@ -87,7 +88,7 @@ public final class FailoverListenerManagerTest {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").failover(true).build());
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_CREATED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(failoverService, times(0)).failoverIfNecessary();
JobRegistry.getInstance().shutdown("test_job");
}
@@ -97,7 +98,7 @@ public final class FailoverListenerManagerTest {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").failover(true).build());
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/other/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/other/127.0.0.1@-@0", ""));
verify(failoverService, times(0)).failoverIfNecessary();
JobRegistry.getInstance().shutdown("test_job");
}
@@ -107,7 +108,7 @@ public final class FailoverListenerManagerTest {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").failover(true).build());
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(failoverService, times(0)).failoverIfNecessary();
JobRegistry.getInstance().shutdown("test_job");
}
@@ -118,7 +119,7 @@ public final class FailoverListenerManagerTest {
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").failover(true).build());
when(shardingService.getCrashedShardingItems("127.0.0.1@-@1")).thenReturn(Arrays.asList(0, 2));
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@1", Type.NODE_DELETED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@1", ""));
verify(failoverService).setCrashedFailoverFlag(0);
verify(failoverService).setCrashedFailoverFlag(2);
verify(failoverService, times(2)).failoverIfNecessary();
@@ -131,7 +132,7 @@ public final class FailoverListenerManagerTest {
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").failover(true).build());
when(failoverService.getFailoveringItems("127.0.0.1@-@1")).thenReturn(Collections.singletonList(1));
- failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@1", Type.NODE_DELETED, "");
+ failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@1", ""));
verify(failoverService).setCrashedFailoverFlagDirectly(1);
verify(failoverService).failoverIfNecessary();
JobRegistry.getInstance().shutdown("test_job");
@@ -139,25 +140,25 @@ public final class FailoverListenerManagerTest {
@Test
public void assertFailoverSettingsChangedJobListenerWhenIsNotFailoverPath() {
- failoverListenerManager.new FailoverSettingsChangedJobListener().dataChanged("/test_job/other", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ failoverListenerManager.new FailoverSettingsChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/other", LiteYamlConstants.getJobYaml()));
verify(failoverService, times(0)).removeFailoverInfo();
}
@Test
public void assertFailoverSettingsChangedJobListenerWhenIsFailoverPathButNotUpdate() {
- failoverListenerManager.new FailoverSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CREATED, "");
+ failoverListenerManager.new FailoverSettingsChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/config", ""));
verify(failoverService, times(0)).removeFailoverInfo();
}
@Test
public void assertFailoverSettingsChangedJobListenerWhenIsFailoverPathAndUpdateButEnableFailover() {
- failoverListenerManager.new FailoverSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYaml());
+ failoverListenerManager.new FailoverSettingsChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(failoverService, times(0)).removeFailoverInfo();
}
@Test
public void assertFailoverSettingsChangedJobListenerWhenIsFailoverPathAndUpdateButDisableFailover() {
- failoverListenerManager.new FailoverSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYamlWithFailover(false));
+ failoverListenerManager.new FailoverSettingsChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYamlWithFailover(false)));
verify(failoverService).removeFailoverInfo();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
index ca2be42..695f875 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
@@ -17,21 +17,22 @@
package org.apache.shardingsphere.elasticjob.lite.internal.guarantee;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener;
import org.apache.shardingsphere.elasticjob.lite.api.listener.AbstractDistributeOnceElasticJobListener;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -58,42 +59,42 @@ public final class GuaranteeListenerManagerTest {
@Test
public void assertStart() {
guaranteeListenerManager.start();
- verify(jobNodeStorage, times(2)).addDataListener(ArgumentMatchers.<AbstractJobListener>any());
+ verify(jobNodeStorage, times(2)).addDataListener(any(DataChangedEventListener.class));
}
@Test
public void assertStartedNodeRemovedJobListenerWhenIsNotRemoved() {
- guaranteeListenerManager.new StartedNodeRemovedJobListener().dataChanged("/test_job/guarantee/started", Type.NODE_CHANGED, "");
+ guaranteeListenerManager.new StartedNodeRemovedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.UPDATED, "/test_job/guarantee/started", ""));
verify(distributeOnceElasticJobListener, times(0)).notifyWaitingTaskStart();
}
@Test
public void assertStartedNodeRemovedJobListenerWhenIsNotStartedNode() {
- guaranteeListenerManager.new StartedNodeRemovedJobListener().dataChanged("/other_job/guarantee/started", Type.NODE_DELETED, "");
+ guaranteeListenerManager.new StartedNodeRemovedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/other_job/guarantee/started", ""));
verify(distributeOnceElasticJobListener, times(0)).notifyWaitingTaskStart();
}
@Test
public void assertStartedNodeRemovedJobListenerWhenIsRemovedAndStartedNode() {
- guaranteeListenerManager.new StartedNodeRemovedJobListener().dataChanged("/test_job/guarantee/started", Type.NODE_DELETED, "");
+ guaranteeListenerManager.new StartedNodeRemovedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/guarantee/started", ""));
verify(distributeOnceElasticJobListener).notifyWaitingTaskStart();
}
@Test
public void assertCompletedNodeRemovedJobListenerWhenIsNotRemoved() {
- guaranteeListenerManager.new CompletedNodeRemovedJobListener().dataChanged("/test_job/guarantee/completed", Type.NODE_CHANGED, "");
+ guaranteeListenerManager.new CompletedNodeRemovedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/guarantee/completed", ""));
verify(distributeOnceElasticJobListener, times(0)).notifyWaitingTaskStart();
}
@Test
public void assertCompletedNodeRemovedJobListenerWhenIsNotCompletedNode() {
- guaranteeListenerManager.new CompletedNodeRemovedJobListener().dataChanged("/other_job/guarantee/completed", Type.NODE_DELETED, "");
+ guaranteeListenerManager.new CompletedNodeRemovedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/other_job/guarantee/completed", ""));
verify(distributeOnceElasticJobListener, times(0)).notifyWaitingTaskStart();
}
@Test
public void assertCompletedNodeRemovedJobListenerWhenIsRemovedAndCompletedNode() {
- guaranteeListenerManager.new CompletedNodeRemovedJobListener().dataChanged("/test_job/guarantee/completed", Type.NODE_DELETED, "");
+ guaranteeListenerManager.new CompletedNodeRemovedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/guarantee/completed", ""));
verify(distributeOnceElasticJobListener).notifyWaitingTaskComplete();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
index 2023c51..d33aff3 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.internal.instance;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
@@ -25,6 +24,8 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.SchedulerFaca
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -79,7 +80,7 @@ public final class ShutdownListenerManagerTest {
@Test
public void assertIsShutdownAlready() {
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(schedulerFacade, times(0)).shutdownInstance();
}
@@ -87,7 +88,7 @@ public final class ShutdownListenerManagerTest {
public void assertIsNotLocalInstancePath() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.2@-@0", Type.NODE_DELETED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.2@-@0", ""));
verify(schedulerFacade, times(0)).shutdownInstance();
}
@@ -95,7 +96,7 @@ public final class ShutdownListenerManagerTest {
public void assertUpdateLocalInstancePath() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_CHANGED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(schedulerFacade, times(0)).shutdownInstance();
}
@@ -104,7 +105,7 @@ public final class ShutdownListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(jobScheduleController.isPaused()).thenReturn(true);
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(schedulerFacade, times(0)).shutdownInstance();
}
@@ -113,7 +114,7 @@ public final class ShutdownListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(instanceService.isLocalJobInstanceExisted()).thenReturn(true);
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(schedulerFacade, times(0)).shutdownInstance();
}
@@ -121,7 +122,7 @@ public final class ShutdownListenerManagerTest {
public void assertRemoveLocalInstancePath() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- shutdownListenerManager.new InstanceShutdownStatusJobListener().dataChanged("/test_job/instances/127.0.0.1@-@0", Type.NODE_DELETED, "");
+ shutdownListenerManager.new InstanceShutdownStatusJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@0", ""));
verify(schedulerFacade).shutdownInstance();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/JobListenerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/JobListenerTest.java
deleted file mode 100644
index 0f99de0..0000000
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/JobListenerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.elasticjob.lite.internal.listener;
-
-import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.fixture.FooJobListener;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.List;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public final class JobListenerTest {
-
- @Mock
- private ChildData childData;
-
- @Mock
- private List list;
-
- private FooJobListener fooJobListener;
-
- @Before
- public void setUp() {
- fooJobListener = new FooJobListener(list);
- }
-
- @Test
- public void assertChildEventWhenEventDataIsEmpty() {
- when(childData.getPath()).thenReturn("");
- fooJobListener.event(null, null, childData);
- verify(list, times(0)).clear();
- }
-
- @Test
- public void assertChildEventSuccess() {
- when(childData.getPath()).thenReturn("/test");
- when(childData.getData()).thenReturn("test".getBytes());
- fooJobListener.event(null, null, childData);
- verify(list).clear();
- }
-}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
index a3b6171..abb71b2 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.internal.listener;
-import org.apache.curator.framework.state.ConnectionState;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceService;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
@@ -25,8 +24,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleCo
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ExecutionService;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
-import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
+import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener.State;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,14 +76,14 @@ public final class RegistryCenterConnectionStateListenerTest {
public void assertConnectionLostListenerWhenConnectionStateIsLost() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- regCenterConnectionStateListener.stateChanged(null, ConnectionState.LOST);
+ regCenterConnectionStateListener.onStateChanged(null, State.UNAVAILABLE);
verify(jobScheduleController).pauseJob();
JobRegistry.getInstance().shutdown("test_job");
}
@Test
public void assertConnectionLostListenerWhenConnectionStateIsLostButIsShutdown() {
- regCenterConnectionStateListener.stateChanged(null, ConnectionState.LOST);
+ regCenterConnectionStateListener.onStateChanged(null, State.UNAVAILABLE);
verify(jobScheduleController, times(0)).pauseJob();
verify(jobScheduleController, times(0)).resumeJob();
}
@@ -94,7 +94,7 @@ public final class RegistryCenterConnectionStateListenerTest {
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(shardingService.getLocalShardingItems()).thenReturn(Arrays.asList(0, 1));
when(serverService.isEnableServer("127.0.0.1")).thenReturn(true);
- regCenterConnectionStateListener.stateChanged(null, ConnectionState.RECONNECTED);
+ regCenterConnectionStateListener.onStateChanged(null, State.RECONNECTED);
verify(serverService).persistOnline(true);
verify(executionService).clearRunningInfo(Arrays.asList(0, 1));
verify(jobScheduleController).resumeJob();
@@ -103,7 +103,7 @@ public final class RegistryCenterConnectionStateListenerTest {
@Test
public void assertConnectionLostListenerWhenConnectionStateIsReconnectedButIsShutdown() {
- regCenterConnectionStateListener.stateChanged(null, ConnectionState.RECONNECTED);
+ regCenterConnectionStateListener.onStateChanged(null, State.RECONNECTED);
verify(jobScheduleController, times(0)).pauseJob();
verify(jobScheduleController, times(0)).resumeJob();
}
@@ -112,7 +112,7 @@ public final class RegistryCenterConnectionStateListenerTest {
public void assertConnectionLostListenerWhenConnectionStateIsOther() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- regCenterConnectionStateListener.stateChanged(null, ConnectionState.CONNECTED);
+ regCenterConnectionStateListener.onStateChanged(null, State.CONNECTED);
verify(jobScheduleController, times(0)).pauseJob();
verify(jobScheduleController, times(0)).resumeJob();
JobRegistry.getInstance().shutdown("test_job");
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
index 18aa0d4..01ffde9 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
@@ -17,10 +17,11 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,25 +50,26 @@ public final class MonitorExecutionListenerManagerTest {
@Test
public void assertMonitorExecutionSettingsChangedJobListenerWhenIsNotFailoverPath() {
- monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().dataChanged("/test_job/other", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/other", LiteYamlConstants.getJobYaml()));
verify(executionService, times(0)).clearAllRunningInfo();
}
@Test
public void assertMonitorExecutionSettingsChangedJobListenerWhenIsFailoverPathButNotUpdate() {
- monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CREATED, "");
+ monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/config", ""));
verify(executionService, times(0)).clearAllRunningInfo();
}
@Test
public void assertMonitorExecutionSettingsChangedJobListenerWhenIsFailoverPathAndUpdateButEnableFailover() {
- monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYaml());
+ monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(executionService, times(0)).clearAllRunningInfo();
}
@Test
public void assertMonitorExecutionSettingsChangedJobListenerWhenIsFailoverPathAndUpdateButDisableFailover() {
- monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYamlWithMonitorExecution(false));
+ DataChangedEvent event = new DataChangedEvent(Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYamlWithMonitorExecution(false));
+ monitorExecutionListenerManager.new MonitorExecutionSettingsChangedJobListener().onChange(event);
verify(executionService).clearAllRunningInfo();
}
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
index 9043e7e..e7b4e0a 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
@@ -18,24 +18,25 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
import com.google.common.collect.Lists;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
-import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -72,25 +73,25 @@ public final class ShardingListenerManagerTest {
@Test
public void assertStart() {
shardingListenerManager.start();
- verify(jobNodeStorage, times(2)).addDataListener(ArgumentMatchers.<AbstractJobListener>any());
+ verify(jobNodeStorage, times(2)).addDataListener(any(DataChangedEventListener.class));
}
@Test
public void assertShardingTotalCountChangedJobListenerWhenIsNotConfigPath() {
- shardingListenerManager.new ShardingTotalCountChangedJobListener().dataChanged("/test_job/config/other", Type.NODE_CREATED, "");
+ shardingListenerManager.new ShardingTotalCountChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/config/other", ""));
verify(shardingService, times(0)).setReshardingFlag();
}
@Test
public void assertShardingTotalCountChangedJobListenerWhenIsConfigPathButCurrentShardingTotalCountIsZero() {
- shardingListenerManager.new ShardingTotalCountChangedJobListener().dataChanged("/test_job/config", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ shardingListenerManager.new ShardingTotalCountChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(shardingService, times(0)).setReshardingFlag();
}
@Test
public void assertShardingTotalCountChangedJobListenerWhenIsConfigPathAndCurrentShardingTotalCountIsEqualToNewShardingTotalCount() {
JobRegistry.getInstance().setCurrentShardingTotalCount("test_job", 3);
- shardingListenerManager.new ShardingTotalCountChangedJobListener().dataChanged("/test_job/config", Type.NODE_CREATED, LiteYamlConstants.getJobYaml());
+ shardingListenerManager.new ShardingTotalCountChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(shardingService, times(0)).setReshardingFlag();
JobRegistry.getInstance().setCurrentShardingTotalCount("test_job", 0);
}
@@ -98,26 +99,26 @@ public final class ShardingListenerManagerTest {
@Test
public void assertShardingTotalCountChangedJobListenerWhenIsConfigPathAndCurrentShardingTotalCountIsNotEqualToNewShardingTotalCount() {
JobRegistry.getInstance().setCurrentShardingTotalCount("test_job", 5);
- shardingListenerManager.new ShardingTotalCountChangedJobListener().dataChanged("/test_job/config", Type.NODE_CHANGED, LiteYamlConstants.getJobYaml());
+ shardingListenerManager.new ShardingTotalCountChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/config", LiteYamlConstants.getJobYaml()));
verify(shardingService).setReshardingFlag();
JobRegistry.getInstance().setCurrentShardingTotalCount("test_job", 0);
}
@Test
public void assertListenServersChangedJobListenerWhenIsNotServerStatusPath() {
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/servers/127.0.0.1/other", Type.NODE_CREATED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/servers/127.0.0.1/other", ""));
verify(shardingService, times(0)).setReshardingFlag();
}
@Test
public void assertListenServersChangedJobListenerWhenIsServerStatusPathButUpdate() {
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/servers/127.0.0.1/status", Type.NODE_CHANGED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1/status", ""));
verify(shardingService, times(0)).setReshardingFlag();
}
@Test
public void assertListenServersChangedJobListenerWhenIsInstanceChangeButJobInstanceIsShutdown() {
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/instances/xxx", Type.NODE_CREATED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/instances/xxx", ""));
verify(shardingService, times(0)).setReshardingFlag();
}
@@ -126,7 +127,7 @@ public final class ShardingListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 1).build());
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/instances/xxx", Type.NODE_CREATED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.ADDED, "/test_job/instances/xxx", ""));
verify(shardingService).setReshardingFlag();
JobRegistry.getInstance().shutdown("test_job");
}
@@ -136,7 +137,7 @@ public final class ShardingListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 1).build());
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ""));
verify(shardingService).setReshardingFlag();
JobRegistry.getInstance().shutdown("test_job");
}
@@ -147,7 +148,7 @@ public final class ShardingListenerManagerTest {
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job", 1).staticSharding(true).build());
when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Lists.newArrayList("0"));
- shardingListenerManager.new ListenServersChangedJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_CHANGED, "");
+ shardingListenerManager.new ListenServersChangedJobListener().onChange(new DataChangedEvent(Type.UPDATED, "/test_job/servers/127.0.0.1", ""));
verify(shardingService, times(0)).setReshardingFlag();
JobRegistry.getInstance().shutdown("test_job");
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
index 12a433b..98137de 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
-import org.apache.curator.framework.api.transaction.CuratorOp;
-import org.apache.curator.framework.api.transaction.TransactionCreateBuilder;
-import org.apache.curator.framework.api.transaction.TransactionDeleteBuilder;
-import org.apache.curator.framework.api.transaction.TransactionOp;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
@@ -31,7 +27,6 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
-import org.apache.shardingsphere.elasticjob.lite.internal.storage.TransactionExecutionCallback;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
@@ -42,16 +37,13 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -156,7 +148,7 @@ public final class ShardingServiceTest {
verify(jobNodeStorage).removeJobNodeIfExisted("sharding/2/instance");
verify(jobNodeStorage).createJobNodeIfNeeded("sharding/2");
verify(jobNodeStorage).fillEphemeralJobNode("leader/sharding/processing", "");
- verify(jobNodeStorage).executeInTransaction(any(TransactionExecutionCallback.class));
+ verify(jobNodeStorage).executeInTransaction(any(List.class));
}
@Test
@@ -176,7 +168,7 @@ public final class ShardingServiceTest {
verify(jobNodeStorage, times(0)).removeJobNodeIfExisted("execution/2");
verify(jobNodeStorage).removeJobNodeIfExisted("sharding/3");
verify(jobNodeStorage).fillEphemeralJobNode("leader/sharding/processing", "");
- verify(jobNodeStorage).executeInTransaction(any(TransactionExecutionCallback.class));
+ verify(jobNodeStorage).executeInTransaction(any(List.class));
}
@Test
@@ -246,35 +238,6 @@ public final class ShardingServiceTest {
assertFalse(shardingService.hasShardingInfoInOfflineServers());
}
- @SuppressWarnings("unchecked")
- @Test
- public void assertPersistShardingInfoTransactionExecutionCallback() throws Exception {
- TransactionOp transactionOp = mock(TransactionOp.class);
- TransactionCreateBuilder transactionCreateBuilder0 = mock(TransactionCreateBuilder.class);
- TransactionCreateBuilder transactionCreateBuilder1 = mock(TransactionCreateBuilder.class);
- TransactionCreateBuilder transactionCreateBuilder2 = mock(TransactionCreateBuilder.class);
- when(transactionOp.create()).thenReturn(transactionCreateBuilder0, transactionCreateBuilder1, transactionCreateBuilder2);
- CuratorOp createOp0 = mock(CuratorOp.class);
- CuratorOp createOp1 = mock(CuratorOp.class);
- CuratorOp createOp2 = mock(CuratorOp.class);
- when(transactionCreateBuilder0.forPath("/test_job/sharding/0/instance", "host0@-@0".getBytes())).thenReturn(createOp0);
- when(transactionCreateBuilder1.forPath("/test_job/sharding/1/instance", "host0@-@0".getBytes())).thenReturn(createOp1);
- when(transactionCreateBuilder2.forPath("/test_job/sharding/2/instance", "host0@-@0".getBytes())).thenReturn(createOp2);
- TransactionDeleteBuilder transactionNecessaryDeleteBuilder = mock(TransactionDeleteBuilder.class);
- TransactionDeleteBuilder transactionProcessingDeleteBuilder = mock(TransactionDeleteBuilder.class);
- when(transactionOp.delete()).thenReturn(transactionNecessaryDeleteBuilder, transactionProcessingDeleteBuilder);
- CuratorOp necessaryDeleteOp = mock(CuratorOp.class);
- when(transactionNecessaryDeleteBuilder.forPath("/test_job/leader/sharding/necessary")).thenReturn(necessaryDeleteOp);
- CuratorOp processingDeleteOp = mock(CuratorOp.class);
- when(transactionProcessingDeleteBuilder.forPath("/test_job/leader/sharding/processing")).thenReturn(processingDeleteOp);
- Map<JobInstance, List<Integer>> shardingResult = new HashMap<>();
- shardingResult.put(new JobInstance("host0@-@0"), Arrays.asList(0, 1, 2));
- ShardingService.PersistShardingInfoTransactionExecutionCallback actual = shardingService.new PersistShardingInfoTransactionExecutionCallback(shardingResult);
- assertThat(actual.createCuratorOperators(transactionOp), is(Arrays.asList(createOp0, createOp1, createOp2, necessaryDeleteOp, processingDeleteOp)));
- verify(transactionOp, times(3)).create();
- verify(transactionOp, times(2)).delete();
- }
-
@Test
public void assertGetCrashedShardingItemsWithNotEnableServer() {
assertThat(shardingService.getCrashedShardingItems("127.0.0.1@-@0"), is(Collections.<Integer>emptyList()));
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
index f025b03..5b6569e 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
@@ -17,18 +17,12 @@
package org.apache.shardingsphere.elasticjob.lite.internal.storage;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.api.transaction.CuratorMultiTransaction;
-import org.apache.curator.framework.api.transaction.CuratorOp;
-import org.apache.curator.framework.api.transaction.TransactionCheckBuilder;
-import org.apache.curator.framework.api.transaction.TransactionCreateBuilder;
-import org.apache.curator.framework.api.transaction.TransactionOp;
-import org.apache.curator.framework.listen.Listenable;
-import org.apache.curator.framework.recipes.cache.CuratorCache;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
-import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation;
+import org.apache.shardingsphere.elasticjob.reg.exception.RegException;
+import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,10 +31,13 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -159,92 +156,28 @@ public final class JobNodeStorageTest {
@Test
public void assertExecuteInTransactionSuccess() throws Exception {
- CuratorFramework client = mock(CuratorFramework.class);
- when(regCenter.getRawClient()).thenReturn(client);
- TransactionOp transactionOp = mockTransactionOp(client);
- CuratorOp checkOp = mockCheckOp(transactionOp);
- CuratorOp createOp = mockCreateOp(transactionOp);
- CuratorMultiTransaction transaction = mockTransaction(client);
- jobNodeStorage.executeInTransaction(input -> Collections.singletonList(input.create().forPath("/test_transaction")));
- verify(transaction).forOperations(Arrays.asList(checkOp, createOp));
+ jobNodeStorage.executeInTransaction(Collections.singletonList(TransactionOperation.opAdd("/test_transaction", "")));
+ verify(regCenter).executeInTransaction(any(List.class));
}
- private TransactionOp mockTransactionOp(final CuratorFramework client) {
- TransactionOp result = mock(TransactionOp.class);
- when(client.transactionOp()).thenReturn(result);
- return result;
- }
-
- @SuppressWarnings("unchecked")
- private CuratorOp mockCheckOp(final TransactionOp transactionOperation) throws Exception {
- TransactionCheckBuilder transactionCheckBuilder = mock(TransactionCheckBuilder.class);
- when(transactionOperation.check()).thenReturn(transactionCheckBuilder);
- CuratorOp result = mock(CuratorOp.class);
- when(transactionCheckBuilder.forPath("/")).thenReturn(result);
- return result;
- }
-
- @SuppressWarnings("unchecked")
- private CuratorOp mockCreateOp(final TransactionOp transactionOperation) throws Exception {
- TransactionCreateBuilder transactionCreateBuilder = mock(TransactionCreateBuilder.class);
- when(transactionOperation.create()).thenReturn(transactionCreateBuilder);
- CuratorOp result = mock(CuratorOp.class);
- when(transactionCreateBuilder.forPath("/test_transaction")).thenReturn(result);
- return result;
- }
-
- private CuratorMultiTransaction mockTransaction(final CuratorFramework client) {
- CuratorMultiTransaction result = mock(CuratorMultiTransaction.class);
- when(client.transaction()).thenReturn(result);
- return result;
- }
-
- @Test(expected = RuntimeException.class)
+ @Test(expected = RegException.class)
public void assertExecuteInTransactionFailure() throws Exception {
- CuratorFramework client = mock(CuratorFramework.class);
- when(regCenter.getRawClient()).thenReturn(client);
- TransactionOp transactionOp = mockTransactionOp(client);
- CuratorOp checkOp = mockCheckOp(transactionOp);
- CuratorOp createFailedOp = mockCreateFailedOp(transactionOp);
- CuratorMultiTransaction transaction = mockTransaction(client);
- try {
- jobNodeStorage.executeInTransaction(input -> Collections.singletonList(input.create().forPath("/test_transaction")));
- } finally {
- verify(transaction, times(0)).forOperations(Arrays.asList(checkOp, createFailedOp));
- }
- }
-
- @SuppressWarnings("unchecked")
- private CuratorOp mockCreateFailedOp(final TransactionOp transactionOperation) throws Exception {
- TransactionCreateBuilder transactionCreateBuilder = mock(TransactionCreateBuilder.class);
- when(transactionOperation.create()).thenReturn(transactionCreateBuilder);
- CuratorOp result = mock(CuratorOp.class);
- when(transactionCreateBuilder.forPath("/test_transaction")).thenThrow(new RuntimeException());
- return result;
+ doThrow(RuntimeException.class).when(regCenter).executeInTransaction(any(List.class));
+ jobNodeStorage.executeInTransaction(Collections.singletonList(TransactionOperation.opAdd("/test_transaction", "")));
}
@Test
public void assertAddConnectionStateListener() {
- CuratorFramework client = mock(CuratorFramework.class);
- @SuppressWarnings("unchecked")
- Listenable<ConnectionStateListener> listeners = mock(Listenable.class);
- ConnectionStateListener listener = mock(ConnectionStateListener.class);
- when(client.getConnectionStateListenable()).thenReturn(listeners);
- when(regCenter.getRawClient()).thenReturn(client);
+ ConnectionStateChangedEventListener listener = mock(ConnectionStateChangedEventListener.class);
jobNodeStorage.addConnectionStateListener(listener);
- verify(listeners).addListener(listener);
+ verify(regCenter).addConnectionStateChangedEventListener(listener);
}
@Test
public void assertAddDataListener() {
- CuratorCache cache = mock(CuratorCache.class);
- @SuppressWarnings("unchecked")
- Listenable<CuratorCacheListener> listeners = mock(Listenable.class);
- CuratorCacheListener listener = mock(CuratorCacheListener.class);
- when(cache.listenable()).thenReturn(listeners);
- when(regCenter.getRawCache("/test_job")).thenReturn(cache);
+ DataChangedEventListener listener = mock(DataChangedEventListener.class);
jobNodeStorage.addDataListener(listener);
- verify(listeners).addListener(listener);
+ verify(regCenter).watch("/test_job", listener);
}
@Test
diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java
index 4d47eb1..079ab6c 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.elasticjob.lite.internal.trigger;
-import org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type;
import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,19 +67,19 @@ public final class TriggerListenerManagerTest {
@Test
public void assertNotTriggerWhenIsNotLocalInstancePath() {
- triggerListenerManager.new JobTriggerStatusJobListener().dataChanged("/test_job/trigger/127.0.0.2@-@0", Type.NODE_CREATED, "");
+ triggerListenerManager.new JobTriggerStatusJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/trigger/127.0.0.2@-@0", ""));
verify(triggerService, times(0)).removeTriggerFlag();
}
@Test
public void assertNotTriggerWhenIsNotCreate() {
- triggerListenerManager.new JobTriggerStatusJobListener().dataChanged("/test_job/trigger/127.0.0.1@-@0", Type.NODE_CHANGED, "");
+ triggerListenerManager.new JobTriggerStatusJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.UPDATED, "/test_job/trigger/127.0.0.1@-@0", ""));
verify(triggerService, times(0)).removeTriggerFlag();
}
@Test
public void assertTriggerWhenJobScheduleControllerIsNull() {
- triggerListenerManager.new JobTriggerStatusJobListener().dataChanged("/test_job/trigger/127.0.0.1@-@0", Type.NODE_CREATED, "");
+ triggerListenerManager.new JobTriggerStatusJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/trigger/127.0.0.1@-@0", ""));
verify(triggerService).removeTriggerFlag();
verify(jobScheduleController, times(0)).triggerJob();
}
@@ -89,7 +89,7 @@ public final class TriggerListenerManagerTest {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
JobRegistry.getInstance().setJobRunning("test_job", true);
- triggerListenerManager.new JobTriggerStatusJobListener().dataChanged("/test_job/trigger/127.0.0.1@-@0", Type.NODE_CREATED, "");
+ triggerListenerManager.new JobTriggerStatusJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/trigger/127.0.0.1@-@0", ""));
verify(triggerService).removeTriggerFlag();
verify(jobScheduleController, times(0)).triggerJob();
JobRegistry.getInstance().setJobRunning("test_job", false);
@@ -100,7 +100,7 @@ public final class TriggerListenerManagerTest {
public void assertTriggerWhenJobIsNotRunning() {
JobRegistry.getInstance().registerRegistryCenter("test_job", regCenter);
JobRegistry.getInstance().registerJob("test_job", jobScheduleController);
- triggerListenerManager.new JobTriggerStatusJobListener().dataChanged("/test_job/trigger/127.0.0.1@-@0", Type.NODE_CREATED, "");
+ triggerListenerManager.new JobTriggerStatusJobListener().onChange(new DataChangedEvent(DataChangedEvent.Type.ADDED, "/test_job/trigger/127.0.0.1@-@0", ""));
verify(triggerService).removeTriggerFlag();
verify(jobScheduleController).triggerJob();
JobRegistry.getInstance().shutdown("test_job");
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml b/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml
index 7e634da..d736066 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml
@@ -32,6 +32,12 @@
<artifactId>elasticjob-lite-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-registry-center-zookeeper-curator</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
index 6c6ed7b..f84984c 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
@@ -29,17 +29,6 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-lite-core</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP-java7</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-spring-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
index 1d70059..b48d41b 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
@@ -31,6 +31,12 @@
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-core</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
index 9fbfe32..de79e7f 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
@@ -28,11 +28,6 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-lite-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-spring-core</artifactId>
<version>${project.parent.version}</version>
</dependency>